Skip to content

Commit

Permalink
reenabled qrest module
Browse files Browse the repository at this point in the history
  • Loading branch information
ar committed Feb 13, 2024
1 parent 36a4bae commit 6495ffd
Show file tree
Hide file tree
Showing 6 changed files with 29 additions and 24 deletions.
14 changes: 13 additions & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,30 @@ jakartaBind = "4.0.1"
junit = "5.10.2"
junitRuntime = "1.10.2"
logback = '1.4.14'
jacksonDatabind = '2.16.1'
netty = '4.1.106.Final'
freemarker = '2.3.32'
jsonSchemaValidator = '2.2.14'
guava = '33.0.0-jre'
jakartaActivation = '2.0.1'

[libraries]
jpos = { module = "org.jpos:jpos", version.ref = "jpos" }
commonsLang3 = { module = "org.apache.commons:commons-lang3", version.ref = "commonsLang3" }
quartz = { module = "org.quartz-scheduler:quartz", version.ref = "quartz" }
junit = { module = "org.junit.jupiter:junit-jupiter", version.ref = "junit" }
junitRuntime = { module = "org.junit.platform:junit-platform-launcher", version.ref = "junitRuntime" }

slf4j = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }
jakartaBind = { module = "jakarta.xml.bind:jakarta.xml.bind-api", version.ref = "jakartaBind" }
jclOverSlf4j = { module='org.slf4j:jcl-over-slf4j', version.ref = 'slf4j' }
log4jOverSlf4j = { module='org.slf4j:log4j-over-slf4j', version.ref = 'slf4j' }
julToSlf4j = { module='org.slf4j:jul-to-slf4j', version.ref = 'slf4j' }
logback = { module='ch.qos.logback:logback-classic', version.ref = 'logback' }
jacksonDatabind = { module='com.fasterxml.jackson.core:jackson-databind', version.ref = 'jacksonDatabind' }
nettyHandler = { module = 'io.netty:netty-handler', version.ref = 'netty' }
nettyCodecHttp = { module = 'io.netty:netty-codec-http', version.ref = 'netty' }
freemarker = { module = 'org.freemarker:freemarker', version.ref = 'freemarker' }
jsonSchemaValidator = { module = 'com.github.java-json-tools:json-schema-validator', version.ref = 'jsonSchemaValidator' }
guava = { module = 'com.google.guava:guava', version.ref = 'guava' }
jakartaActivation = { module = 'com.sun.activation:jakarta.activation', version.ref = 'jakartaActivation' }

3 changes: 2 additions & 1 deletion gradle/testlibs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
[versions]
junit = "5.10.2"
junitRuntime = "1.10.2"
restAssured = '5.4.0'

[libraries]
junit = { module = "org.junit.jupiter:junit-jupiter", version.ref = "junit" }
junitRuntime = { module = "org.junit.platform:junit-platform-launcher", version.ref = "junitRuntime" }

restAssured = { module = 'io.rest-assured:rest-assured', version.ref='restAssured' }

21 changes: 11 additions & 10 deletions modules/qrest/build.gradle
Original file line number Diff line number Diff line change
@@ -1,18 +1,19 @@
description = 'jPOS-EE :: QRest'

dependencies {
api libraries.jpos
api libraries.jacksonDatabind
api libraries.nettyHandler
api libraries.nettyCodecHttp
api libraries.freemarker
api jsonSchemaValidatorLibs
testImplementation libraries.junit
testImplementation libraries.restAssured
api libs.jpos
api libs.jacksonDatabind
api libs.nettyHandler
api libs.nettyCodecHttp
api libs.freemarker
api libs.jsonSchemaValidator
api libs.guava
api libs.jakartaActivation

testImplementation testlibs.junit
testImplementation testlibs.restAssured
}

apply from: "${rootProject.projectDir}/jpos-app.gradle"

test {
dependsOn('installApp')
workingDir = "build/install/qrest"
Expand Down
11 changes: 1 addition & 10 deletions modules/qrest/src/dist/bin/q2
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,7 @@
cd `dirname $0`/.. || exit 1
rm -f deploy/shutdown.xml
exec java -server \
-XX:+IgnoreUnrecognizedVMOptions \
-Xmx1G \
-Xloggc:log/gc.log \
-XX:+PrintGCDetails \
-XX:+PrintGCDateStamps \
-XX:+UseGCLogFileRotation \
-XX:NumberOfGCLogFiles=5 \
-XX:GCLogFileSize=2M \
-XX:NumberOfGCLogFiles=5 \
-Djava.net.preferIPv4Stack=true \
-Dcom.sun.management.jmxremote \
-jar jposee-@jarname@ --pid-file='jpos.pid' "$@"
-jar @jarname@ --pid-file='jpos.pid' "$@"

Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@
import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
import io.netty.handler.codec.http.*;
import jakarta.activation.MimetypesFileTypeMap;
import org.jpos.core.Configurable;
import org.jpos.core.Configuration;
import org.jpos.core.ConfigurationException;
import org.jpos.transaction.Context;
import org.jpos.transaction.TransactionParticipant;

import javax.activation.MimetypesFileTypeMap;

import static io.netty.handler.codec.http.HttpHeaderNames.*;
import static io.netty.handler.codec.http.HttpResponseStatus.OK;
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ include ':modules:saf'
include ':modules:quartz'
include ':modules:bom'
include ':modules:logback'
include ':modules:qrest'

dependencyResolutionManagement {
versionCatalogs {
Expand Down Expand Up @@ -56,7 +57,6 @@ dependencyResolutionManagement {
// include ':modules:binlog'
// include ':modules:binlog-quartz'
// include ':modules:cryptoservice'
// include ':modules:qrest'
// include ':modules:cryptoserver'
// include ':modules:iso-http-client'
// include ':modules:iso-http-server'
Expand Down

0 comments on commit 6495ffd

Please sign in to comment.