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

WildFly 29 upgrade #157

Merged
merged 4 commits into from
Jul 24, 2023
Merged

WildFly 29 upgrade #157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4bde291
Spaces -> Tabs. Finally.
pferraro Jul 23, 2023
07ca6c3
Update version to 19.0.0.Final-SNAPSHOT
pferraro Jul 23, 2023
f24b690
Upgrade WildFly to 29.0.0.Final.
pferraro Jul 23, 2023
41ea835
Tomcat upgrades
pferraro Jul 23, 2023
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
70 changes: 35 additions & 35 deletions 10.1/catalina/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,40 +22,40 @@
-->

<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.wildfly.clustering</groupId>
<artifactId>wildfly-clustering-tomcat-10.1</artifactId>
<version>18.0.1.Final-SNAPSHOT</version>
</parent>

<artifactId>wildfly-clustering-tomcat-10.1-catalina</artifactId>
<packaging>jar</packaging>

<name>Distributed session management for Tomcat 10.1: Catalina integration</name>

<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>wildfly-clustering-tomcat-common</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-catalina</artifactId>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.wildfly</groupId>
<artifactId>wildfly-clustering-context</artifactId>
</dependency>
<dependency>
<groupId>org.wildfly</groupId>
<artifactId>wildfly-clustering-web-cache</artifactId>
</dependency>
</dependencies>
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.wildfly.clustering</groupId>
<artifactId>wildfly-clustering-tomcat-10.1</artifactId>
<version>19.0.0.Final-SNAPSHOT</version>
</parent>

<artifactId>wildfly-clustering-tomcat-10.1-catalina</artifactId>
<packaging>jar</packaging>

<name>Distributed session management for Tomcat 10.1: Catalina integration</name>

<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>wildfly-clustering-tomcat-common</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-catalina</artifactId>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.wildfly</groupId>
<artifactId>wildfly-clustering-context</artifactId>
</dependency>
<dependency>
<groupId>org.wildfly</groupId>
<artifactId>wildfly-clustering-web-cache</artifactId>
</dependency>
</dependencies>

</project>
28 changes: 14 additions & 14 deletions 10.1/catalina/src/main/java/org/wildfly/clustering/tomcat/catalina/AbstractHttpSession.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,20 +32,20 @@
*/
public abstract class AbstractHttpSession implements HttpSession {

@Override
public int hashCode() {
return this.getId().hashCode();
}
@Override
public int hashCode() {
return this.getId().hashCode();
}

@Override
public boolean equals(Object object) {
if (!(object instanceof HttpSession)) return false;
HttpSession session = (HttpSession) object;
return Objects.equals(this.getId(), session.getId()) && Objects.equals(this.getServletContext().getVirtualServerName(), session.getServletContext().getVirtualServerName()) && Objects.equals(this.getServletContext().getContextPath(), session.getServletContext().getContextPath());
}
@Override
public boolean equals(Object object) {
if (!(object instanceof HttpSession)) return false;
HttpSession session = (HttpSession) object;
return Objects.equals(this.getId(), session.getId()) && Objects.equals(this.getServletContext().getVirtualServerName(), session.getServletContext().getVirtualServerName()) && Objects.equals(this.getServletContext().getContextPath(), session.getServletContext().getContextPath());
}

@Override
public String toString() {
return this.getId();
}
@Override
public String toString() {
return this.getId();
}
}
20 changes: 10 additions & 10 deletions ...alina/src/main/java/org/wildfly/clustering/tomcat/catalina/CatalinaIdentifierFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,16 @@
*/
public class CatalinaIdentifierFactory implements Supplier<String> {

private final SessionIdGenerator generator;
private final SessionIdGenerator generator;

public CatalinaIdentifierFactory(SessionIdGenerator generator) {
this.generator = generator;
// Prevent Tomcat's session id generator from auto-appending the route
this.generator.setJvmRoute(null);
}
public CatalinaIdentifierFactory(SessionIdGenerator generator) {
this.generator = generator;
// Prevent Tomcat's session id generator from auto-appending the route
this.generator.setJvmRoute(null);
}

@Override
public String get() {
return this.generator.generateSessionId();
}
@Override
public String get() {
return this.generator.generateSessionId();
}
}
Loading