Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
27 changes: 8 additions & 19 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,11 @@
<artifactId>jedis</artifactId>
<version>5.2.0</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.17.0</version>
</dependency>
<dependency>
<groupId>com.vladsch.flexmark</groupId>
<artifactId>flexmark-all</artifactId>
Expand Down Expand Up @@ -91,15 +96,11 @@
<artifactId>pebble</artifactId>
<version>4.1.1</version>
</dependency>
<dependency>
<groupId>org.javalite</groupId>
<artifactId>activejdbc</artifactId>
<version>3.5-j11</version>
</dependency>
<!-- ActiveJDBC REMOVED — replaced by Obsidian ORM -->
<dependency>
<groupId>org.xerial</groupId>
<artifactId>sqlite-jdbc</artifactId>
<version>3.50.2.0</version> <!-- was 3.41.2.1 -->
<version>3.50.2.0</version>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
Expand Down Expand Up @@ -131,19 +132,7 @@
<target>${java.version}</target>
</configuration>
</plugin>
<plugin>
<groupId>org.javalite</groupId>
<artifactId>activejdbc-instrumentation</artifactId>
<version>3.5-j11</version>
<executions>
<execution>
<phase>process-classes</phase>
<goals>
<goal>instrument</goal>
</goals>
</execution>
</executions>
</plugin>
<!-- ActiveJDBC instrumentation plugin REMOVED -->
</plugins>
</build>
</project>
10 changes: 10 additions & 0 deletions src/main/java/com/obsidian/core/core/WebServer.java
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,16 @@ public void start()
init();
after((req, res) -> SessionMiddleware.clear());

after((req, res) -> SessionMiddleware.clear());

afterAfter((req, res) -> {
try {
MiddlewareManager.executeAfter(new Class[0], req, res);
} catch (Exception e) {
logger.error("After middleware error: {}", e.getMessage());
}
});

logger.info("Web server started on port {}", Obsidian.getWebPort());
}
}
Loading
Loading