mirror of https://github.com/OpenIdentityPlatform/OpenDJ.git

vharseko
23.33.2023 7b24f6afae8c9aab430373d87d8cec1fa7dd2430
ADD IT test for wars #110 (#306)

3 files modified
96 ■■■■■ changed files
opendj-dsml-servlet/pom.xml 47 ●●●●● patch | view | raw | blame | history
opendj-rest2ldap-servlet/pom.xml 47 ●●●●● patch | view | raw | blame | history
opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Rest2LdapHttpApplication.java 2 ●●● patch | view | raw | blame | history
opendj-dsml-servlet/pom.xml
@@ -310,6 +310,53 @@
                    </webResources>
                </configuration>
            </plugin>
            <plugin>
              <groupId>org.codehaus.cargo</groupId>
              <artifactId>cargo-maven3-plugin</artifactId>
              <version>1.10.9</version>
              <extensions>true</extensions>
              <executions>
                    <execution>
                      <id>start</id>
                      <phase>pre-integration-test</phase>
                      <goals>
                        <goal>start</goal>
                      </goals>
                    </execution>
                    <execution>
                      <id>stop</id>
                      <phase>post-integration-test</phase>
                      <goals>
                        <goal>stop</goal>
                      </goals>
                    </execution>
                </executions>
                <configuration>
                    <container>
                        <containerId>tomcat9x</containerId>
                        <type>embedded</type>
                        <systemProperties>
                            <file.encoding>UTF-8</file.encoding>
                        </systemProperties>
                        <timeout>350000</timeout>
                    </container>
                    <deployables>
                        <deployable>
                            <type>war</type>
                            <properties>
                                <context>dsml</context>
                            </properties>
<!--                            <pingURL>http://localhost:8080/dsml/</pingURL> only POST-->
                        </deployable>
                    </deployables>
                    <configuration>
                        <properties>
                            <cargo.rmi.port>8206</cargo.rmi.port>
                            <cargo.jvmargs>-XX:+UseG1GC -server</cargo.jvmargs>
                        </properties>
                    </configuration>
                </configuration>
            </plugin>
        </plugins>
    </build>
opendj-rest2ldap-servlet/pom.xml
@@ -98,6 +98,53 @@
          </webResources>
        </configuration>
      </plugin>
      <plugin>
          <groupId>org.codehaus.cargo</groupId>
          <artifactId>cargo-maven3-plugin</artifactId>
          <version>1.10.9</version>
          <extensions>true</extensions>
          <executions>
                <execution>
                  <id>start</id>
                  <phase>pre-integration-test</phase>
                  <goals>
                    <goal>start</goal>
                  </goals>
                </execution>
                <execution>
                  <id>stop</id>
                  <phase>post-integration-test</phase>
                  <goals>
                    <goal>stop</goal>
                  </goals>
                </execution>
            </executions>
            <configuration>
                <container>
                    <containerId>tomcat9x</containerId>
                    <type>embedded</type>
                    <systemProperties>
                        <file.encoding>UTF-8</file.encoding>
                    </systemProperties>
                    <timeout>350000</timeout>
                </container>
                <deployables>
                    <deployable>
                        <type>war</type>
                        <properties>
                            <context>rest2ldap</context>
                        </properties>
                        <pingURL>http://localhost:8080/rest2ldap/</pingURL>
                    </deployable>
                </deployables>
                <configuration>
                    <properties>
                        <cargo.rmi.port>8206</cargo.rmi.port>
                        <cargo.jvmargs>-XX:+UseG1GC -server</cargo.jvmargs>
                    </properties>
                </configuration>
            </configuration>
        </plugin>
    </plugins>
  </build>
</project>
opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Rest2LdapHttpApplication.java
@@ -179,7 +179,7 @@
            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();
    }