From 7b24f6afae8c9aab430373d87d8cec1fa7dd2430 Mon Sep 17 00:00:00 2001 From: vharseko Date: Sat, 23 Sep 2023 07:33:40 +0300 Subject: [PATCH] ADD IT test for wars #110 (#306) --- opendj-dsml-servlet/pom.xml | 47 +++++++++++++++++++ opendj-rest2ldap-servlet/pom.xml | 47 +++++++++++++++++++ .../rest2ldap/Rest2LdapHttpApplication.java | 2 +- 3 files changed, 95 insertions(+), 1 deletion(-) diff --git a/opendj-dsml-servlet/pom.xml b/opendj-dsml-servlet/pom.xml index d8d2766f6d..98ad2476b9 100644 --- a/opendj-dsml-servlet/pom.xml +++ b/opendj-dsml-servlet/pom.xml @@ -310,6 +310,53 @@ + + org.codehaus.cargo + cargo-maven3-plugin + 1.10.9 + true + + + start + pre-integration-test + + start + + + + stop + post-integration-test + + stop + + + + + + tomcat9x + embedded + + UTF-8 + + 350000 + + + + war + + dsml + + + + + + + 8206 + -XX:+UseG1GC -server + + + + diff --git a/opendj-rest2ldap-servlet/pom.xml b/opendj-rest2ldap-servlet/pom.xml index 5644811e24..3bc01bc30c 100644 --- a/opendj-rest2ldap-servlet/pom.xml +++ b/opendj-rest2ldap-servlet/pom.xml @@ -98,6 +98,53 @@ + + org.codehaus.cargo + cargo-maven3-plugin + 1.10.9 + true + + + start + pre-integration-test + + start + + + + stop + post-integration-test + + stop + + + + + + tomcat9x + embedded + + UTF-8 + + 350000 + + + + war + + rest2ldap + + http://localhost:8080/rest2ldap/ + + + + + 8206 + -XX:+UseG1GC -server + + + + diff --git a/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Rest2LdapHttpApplication.java b/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Rest2LdapHttpApplication.java index 5efd9569df..c70ec3247e 100644 --- a/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Rest2LdapHttpApplication.java +++ b/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Rest2LdapHttpApplication.java @@ -179,7 +179,7 @@ public Rest2LdapHttpApplication() { final URL configUrl = getClass().getResource("/config.json"); this.configDirectory = configUrl != null ? new File(configUrl.toURI()).getParentFile() : null; } catch (final URISyntaxException e) { - throw new IllegalStateException(e); + throw new IllegalStateException(""+getClass().getResource("/config.json"),e); } this.schema = Schema.getDefaultSchema(); }