-
Notifications
You must be signed in to change notification settings - Fork 1.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
a859b21
commit c003047
Showing
8 changed files
with
252 additions
and
46 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,165 @@ | ||
| <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> | ||
|
|
||
| <!-- Note: HAPI projects use the "hapi-fhir" POM as their base to provide easy management. You do not need to use this in your own projects, so the "parent" tag and it's contents below may be removed | ||
| if you are using this file as a basis for your own project. --> | ||
| <parent> | ||
| <groupId>ca.uhn.hapi.fhir</groupId> | ||
| <artifactId>hapi-fhir</artifactId> | ||
| <version>4.1.0-SNAPSHOT</version> | ||
| <relativePath>../pom.xml</relativePath> | ||
| </parent> | ||
|
|
||
| <artifactId>hapi-fhir-base-test-jaxrsserver-kotlin</artifactId> | ||
| <packaging>war</packaging> | ||
|
|
||
| <name>HAPI FHIR JAX-RS Server Kotlin test</name> | ||
|
|
||
| <repositories> | ||
| <repository> | ||
| <id>oss-snapshots</id> | ||
| <snapshots> | ||
| <enabled>true</enabled> | ||
| </snapshots> | ||
| <url>https://oss.sonatype.org/content/repositories/snapshots/</url> | ||
| </repository> | ||
| </repositories> | ||
|
|
||
| <dependencies> | ||
|
|
||
| <!-- This dependency includes the core HAPI-FHIR classes --> | ||
| <dependency> | ||
| <groupId>ca.uhn.hapi.fhir</groupId> | ||
| <artifactId>hapi-fhir-jaxrsserver-base</artifactId> | ||
| <version>${project.version}</version> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>ca.uhn.hapi.fhir</groupId> | ||
| <artifactId>hapi-fhir-structures-dstu2</artifactId> | ||
| <version>${project.version}</version> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>ca.uhn.hapi.fhir</groupId> | ||
| <artifactId>hapi-fhir-structures-dstu3</artifactId> | ||
| <version>${project.version}</version> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>ca.uhn.hapi.fhir</groupId> | ||
| <artifactId>hapi-fhir-structures-r4</artifactId> | ||
| <version>${project.version}</version> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>javax.ws.rs</groupId> | ||
| <artifactId>javax.ws.rs-api</artifactId> | ||
| <version>2.0.1</version> | ||
| <scope>provided</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>javax.ejb</groupId> | ||
| <artifactId>ejb-api</artifactId> | ||
| <version>3.0</version> | ||
| <scope>provided</scope> | ||
| </dependency> | ||
|
|
||
| <dependency> | ||
| <groupId>org.eclipse.jetty</groupId> | ||
| <artifactId>jetty-server</artifactId> | ||
| <version>${jetty_version}</version> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.eclipse.jetty</groupId> | ||
| <artifactId>jetty-servlet</artifactId> | ||
| <version>${jetty_version}</version> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.jboss.resteasy</groupId> | ||
| <artifactId>resteasy-jaxrs</artifactId> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.jboss.resteasy</groupId> | ||
| <artifactId>resteasy-client</artifactId> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>ch.qos.logback</groupId> | ||
| <artifactId>logback-classic</artifactId> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>ca.uhn.hapi.fhir</groupId> | ||
| <artifactId>hapi-fhir-test-utilities</artifactId> | ||
| <version>${project.version}</version> | ||
| <scope>test</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.jetbrains.kotlin</groupId> | ||
| <artifactId>kotlin-maven-allopen</artifactId> | ||
| <version>${kotlin.version}</version> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.jetbrains.kotlin</groupId> | ||
| <artifactId>kotlin-maven-noarg</artifactId> | ||
| <version>${kotlin.version}</version> | ||
| </dependency> | ||
| </dependencies> | ||
|
|
||
|
|
||
| <build> | ||
| <finalName>hapi-fhir-jaxrsserver-example</finalName> | ||
| <!-- This is to run the integration tests --> | ||
| <plugins> | ||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-failsafe-plugin</artifactId> | ||
| <configuration> | ||
| <redirectTestOutputToFile>true</redirectTestOutputToFile> | ||
| </configuration> | ||
| <executions> | ||
| <execution> | ||
| <goals> | ||
| <goal>integration-test</goal> | ||
| <goal>verify</goal> | ||
| </goals> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-deploy-plugin</artifactId> | ||
| <configuration> | ||
| <skip>true</skip> | ||
| </configuration> | ||
| </plugin> | ||
| <plugin> | ||
| <groupId>org.jetbrains.kotlin</groupId> | ||
| <artifactId>kotlin-maven-plugin</artifactId> | ||
| <version>${kotlin.version}</version> | ||
| <executions> | ||
| <execution> | ||
| <id>compile</id> | ||
| <goals> <goal>compile</goal> </goals> | ||
| <configuration> | ||
| <sourceDirs> | ||
| <sourceDir>${project.basedir}/src/main/kotlin</sourceDir> | ||
| <sourceDir>${project.basedir}/src/main/java</sourceDir> | ||
| </sourceDirs> | ||
| </configuration> | ||
| </execution> | ||
| <execution> | ||
| <id>test-compile</id> | ||
| <goals> <goal>test-compile</goal> </goals> | ||
| <configuration> | ||
| <sourceDirs> | ||
| <sourceDir>${project.basedir}/src/test/kotlin</sourceDir> | ||
| <sourceDir>${project.basedir}/src/test/java</sourceDir> | ||
| </sourceDirs> | ||
| </configuration> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
|
|
||
| <properties> | ||
| <kotlin.compiler.incremental>true</kotlin.compiler.incremental> | ||
| <kotlin.version>1.3.50</kotlin.version> | ||
| </properties> | ||
| </project> |
File renamed without changes.
File renamed without changes.
52 changes: 52 additions & 0 deletions
52
tests/hapi-fhir-base-test-jaxrsserver-kotlin/src/main/webapp/WEB-INF/web.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| <web-app xmlns="http://java.sun.com/xml/ns/javaee" | ||
| xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| version="3.0" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee ./xsd/web-app_3_0.xsd"> | ||
|
|
||
| <!-- This filters provide support for Cross Origin Resource Sharing (CORS) --> | ||
| <!-- | ||
| <filter> | ||
| <filter-name>CORS Filter</filter-name> | ||
| <filter-class>org.ebaysf.web.cors.CORSFilter</filter-class> | ||
| <init-param> | ||
| <description>A comma separated list of allowed origins. Note: An '*' cannot be used for an allowed origin when using credentials.</description> | ||
| <param-name>cors.allowed.origins</param-name> | ||
| <param-value>*</param-value> | ||
| </init-param> | ||
| <init-param> | ||
| <description>A comma separated list of HTTP verbs, using which a CORS request can be made.</description> | ||
| <param-name>cors.allowed.methods</param-name> | ||
| <param-value>GET,POST,PUT,DELETE,OPTIONS</param-value> | ||
| </init-param> | ||
| <init-param> | ||
| <description>A comma separated list of allowed headers when making a non simple CORS request.</description> | ||
| <param-name>cors.allowed.headers</param-name> | ||
| <param-value>X-FHIR-Starter,Origin,Accept,X-Requested-With,Content-Type,Access-Control-Request-Method,Access-Control-Request-Headers</param-value> | ||
| </init-param> | ||
| <init-param> | ||
| <description>A comma separated list non-standard response headers that will be exposed to XHR2 object.</description> | ||
| <param-name>cors.exposed.headers</param-name> | ||
| <param-value>Location,Content-Location</param-value> | ||
| </init-param> | ||
| <init-param> | ||
| <description>A flag that suggests if CORS is supported with cookies</description> | ||
| <param-name>cors.support.credentials</param-name> | ||
| <param-value>true</param-value> | ||
| </init-param> | ||
| <init-param> | ||
| <description>A flag to control logging</description> | ||
| <param-name>cors.logging.enabled</param-name> | ||
| <param-value>true</param-value> | ||
| </init-param> | ||
| <init-param> | ||
| <description>Indicates how long (in seconds) the results of a preflight request can be cached in a preflight result cache.</description> | ||
| <param-name>cors.preflight.maxage</param-name> | ||
| <param-value>300</param-value> | ||
| </init-param> | ||
| </filter> | ||
| <filter-mapping> | ||
| <filter-name>CORS Filter</filter-name> | ||
| <url-pattern>/*</url-pattern> | ||
| </filter-mapping> | ||
| --> | ||
|
|
||
| </web-app> |
File renamed without changes.
30 changes: 30 additions & 0 deletions
30
tests/hapi-fhir-base-test-jaxrsserver-kotlin/src/test/resources/logback-test.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| <configuration> | ||
|
|
||
| <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> | ||
| <encoder> | ||
| <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} [%file:%line] - %msg%n | ||
| </pattern> | ||
| </encoder> | ||
| </appender> | ||
|
|
||
| <logger name="org.eclipse" additivity="false" level="info"> | ||
| <appender-ref ref="STDOUT" /> | ||
| </logger> | ||
| <logger name="org.apache" additivity="false" level="info"> | ||
| <appender-ref ref="STDOUT" /> | ||
| </logger> | ||
| <logger name="org.thymeleaf" additivity="false" level="warn"> | ||
| <appender-ref ref="STDOUT" /> | ||
| </logger> | ||
|
|
||
| <!-- | ||
| <logger name="ca.uhn.fhir.rest.client" additivity="false" level="trace"> | ||
| <appender-ref ref="STDOUT" /> | ||
| </logger> | ||
| --> | ||
|
|
||
| <root level="info"> | ||
| <appender-ref ref="STDOUT" /> | ||
| </root> | ||
|
|
||
| </configuration> |