Commit 5c93b4bb authored by Marco Descher's avatar Marco Descher 🏔

[15323] Remove es.hapi.fhir, change to ch.elexis.core.hapi.fhir

parent 100db33c
Pipeline #10127 failed with stages
in 2 seconds
......@@ -9,7 +9,7 @@ Require-Bundle: info.elexis.server.fhir.rest.core;bundle-version="1.0.0",
ch.elexis.core.findings,
org.eclipse.osgi.services,
info.elexis.server.core.connector.elexis;bundle-version="1.0.0",
info.elexis.server.hapi.fhir;bundle-version="3.4.0"
ch.elexis.core.hapi.fhir;bundle-version="3.4.0"
Service-Component: OSGI-INF/*.xml
Bundle-ActivationPolicy: lazy
Import-Package: ch.elexis.core.findings.util,
......
......@@ -30,9 +30,9 @@ Require-Bundle: info.elexis.server.core.connector.elexis;bundle-version="1.0.0",
org.thymeleaf;bundle-version="2.1.4",
net.sf.saxon.Saxon-HE;bundle-version="9.6.0",
info.elexis.server.core.common;bundle-version="1.0.0",
info.elexis.server.hapi.fhir;bundle-version="3.4.0",
at.medevit.ch.artikelstamm.model;bundle-version="1.0.0",
ch.elexis.core.findings
ch.elexis.core.findings,
ch.elexis.core.hapi.fhir;bundle-version="3.4.0"
Export-Package: es.fhir.rest.core,
es.fhir.rest.core.coding,
es.fhir.rest.core.resources.util
......@@ -8,10 +8,10 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Require-Bundle: ch.elexis.core.findings;bundle-version="1.0.0",
org.h2,
info.elexis.server.hapi.fhir;bundle-version="3.4.0",
ch.elexis.core.findings.fhir.model;bundle-version="1.0.0",
org.postgresql.jdbc42;bundle-version="42.2.5",
com.mysql.cj;bundle-version="8.0.13"
com.mysql.cj;bundle-version="8.0.13",
ch.elexis.core.hapi.fhir;bundle-version="3.4.0"
Import-Package: ch.elexis.core.findings.util,
ch.elexis.core.findings.util.model,
ch.rgw.tools,
......
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry exported="true" kind="lib" path="lib/hapi-fhir-structures-dstu2-3.4.0.jar" sourcepath="lib-src/hapi-fhir-structures-dstu2-3.4.0-sources.jar"/>
<classpathentry exported="true" kind="lib" path="lib/hapi-fhir-client-3.4.0.jar"/>
<classpathentry exported="true" kind="lib" path="lib/hapi-fhir-server-3.4.0.jar"/>
<classpathentry exported="true" kind="lib" path="lib/hapi-fhir-structures-dstu3-3.4.0.jar" sourcepath="lib-src/hapi-fhir-structures-dstu3-3.4.0-sources.jar"/>
<classpathentry exported="true" kind="lib" path="lib/hapi-fhir-utilities-3.4.0.jar"/>
<classpathentry exported="true" kind="lib" path="lib/hapi-fhir-base-3.4.0.jar" sourcepath="lib-src/hapi-fhir-base-3.4.0-sources.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
</classpath>
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>es.hapi.fhir</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.ManifestBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.SchemaBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.source=1.8
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: HAPI FHIR Lib
Bundle-SymbolicName: info.elexis.server.hapi.fhir
Bundle-Version: 3.4.0.qualifier
Bundle-Vendor: elexis.info
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ClassPath: .,
lib/hapi-fhir-base-3.4.0.jar,
lib/hapi-fhir-utilities-3.4.0.jar,
lib/hapi-fhir-structures-dstu2-3.4.0.jar,
lib/hapi-fhir-structures-dstu3-3.4.0.jar,
lib/hapi-fhir-client-3.4.0.jar,
lib/hapi-fhir-server-3.4.0.jar
Require-Bundle: woodstox-core-asl;bundle-version="4.4.1",
org.apache.commons.lang3;bundle-version="3.1.0",
org.apache.commons.codec;bundle-version="1.9.0",
org.apache.commons.io;bundle-version="2.4.0",
com.google.guava;bundle-version="15.0.0",
org.slf4j.api;bundle-version="1.7.2",
ch.qos.logback.classic;bundle-version="1.0.7",
net.sf.saxon.Saxon-HE;bundle-version="9.6.0",
com.phloc.commons;bundle-version="4.4.6",
com.phloc.schematron;bundle-version="2.7.1",
stax2-api;bundle-version="3.1.4",
javassist;bundle-version="3.10.0",
org.apache.httpcomponents.httpclient;bundle-version="4.5.2",
org.apache.httpcomponents.httpcore;bundle-version="4.4.6",
javax.servlet;bundle-version="3.1.0"
Export-Package: ca.uhn.fhir.context,
ca.uhn.fhir.context.api,
ca.uhn.fhir.context.support,
ca.uhn.fhir.fluentpath,
ca.uhn.fhir.i18n,
ca.uhn.fhir.model.api,
ca.uhn.fhir.model.api.annotation,
ca.uhn.fhir.model.base.composite,
ca.uhn.fhir.model.base.resource,
ca.uhn.fhir.model.dstu2,
ca.uhn.fhir.model.dstu2.composite,
ca.uhn.fhir.model.dstu2.resource,
ca.uhn.fhir.model.dstu2.valueset,
ca.uhn.fhir.model.primitive,
ca.uhn.fhir.model.valueset,
ca.uhn.fhir.model.view,
ca.uhn.fhir.narrative,
ca.uhn.fhir.parser,
ca.uhn.fhir.parser.json,
ca.uhn.fhir.rest.annotation,
ca.uhn.fhir.rest.api,
ca.uhn.fhir.rest.api.server,
ca.uhn.fhir.rest.client.apache,
ca.uhn.fhir.rest.client.api,
ca.uhn.fhir.rest.client.exceptions,
ca.uhn.fhir.rest.client.impl,
ca.uhn.fhir.rest.client.interceptor,
ca.uhn.fhir.rest.client.method,
ca.uhn.fhir.rest.gclient,
ca.uhn.fhir.rest.param,
ca.uhn.fhir.rest.param.binder,
ca.uhn.fhir.rest.server,
ca.uhn.fhir.rest.server.exceptions,
ca.uhn.fhir.rest.server.interceptor,
ca.uhn.fhir.rest.server.interceptor.auth,
ca.uhn.fhir.rest.server.method,
ca.uhn.fhir.rest.server.provider,
ca.uhn.fhir.rest.server.provider.dstu2,
ca.uhn.fhir.rest.server.servlet,
ca.uhn.fhir.rest.server.tenant,
ca.uhn.fhir.rest.server.util,
ca.uhn.fhir.store,
ca.uhn.fhir.util,
ca.uhn.fhir.util.jar,
ca.uhn.fhir.validation,
ca.uhn.fhir.validation.schematron,
info.elexis.server.hapi.fhir,
org.fhir.ucum,
org.fhir.ucum.special,
org.hl7.fhir.dstu3.conformance,
org.hl7.fhir.dstu3.context,
org.hl7.fhir.dstu3.elementmodel,
org.hl7.fhir.dstu3.formats,
org.hl7.fhir.dstu3.hapi.ctx,
org.hl7.fhir.dstu3.hapi.fluentpath,
org.hl7.fhir.dstu3.hapi.rest.server,
org.hl7.fhir.dstu3.model,
org.hl7.fhir.dstu3.model.codesystems,
org.hl7.fhir.dstu3.terminologies,
org.hl7.fhir.dstu3.utils,
org.hl7.fhir.dstu3.utils.formats,
org.hl7.fhir.exceptions,
org.hl7.fhir.instance.model.api,
org.hl7.fhir.utilities,
org.hl7.fhir.utilities.graphql,
org.hl7.fhir.utilities.tests,
org.hl7.fhir.utilities.ucum,
org.hl7.fhir.utilities.ucum.special,
org.hl7.fhir.utilities.ucum.tests,
org.hl7.fhir.utilities.validation,
org.hl7.fhir.utilities.xhtml,
org.hl7.fhir.utilities.xls,
org.hl7.fhir.utilities.xml
Import-Package: com.google.gson;version="2.8.0",
com.google.gson.stream;version="2.8.0"
# Why are the libraries contained in this plugin not in the target?
HAPI Fhir switch to a structure, where there is only a single plugin (base) and all the
other plugins are fragments to this plugin. It is not possible at development time
to include fragments, which in this case contain necessary libraries. In order to solve
this, these bundles where simply downloaded from maven, and packed within a wrapper bundle
which is what you see here.
\ No newline at end of file
source.. = src/
output.. = bin/
bin.includes = META-INF/,\
.,\
lib/hapi-fhir-base-3.4.0.jar,\
lib/hapi-fhir-server-3.4.0.jar,\
lib/hapi-fhir-structures-dstu3-3.4.0.jar,\
lib/hapi-fhir-utilities-3.4.0.jar,\
lib/hapi-fhir-client-3.4.0.jar,\
lib/hapi-fhir-structures-dstu2-3.4.0.jar
package info.elexis.server.hapi.fhir;
import org.hl7.fhir.instance.model.api.IBaseResource;
import ca.uhn.fhir.context.FhirContext;
import ca.uhn.fhir.parser.IParser;
import ca.uhn.fhir.rest.client.api.IGenericClient;
import ca.uhn.fhir.rest.client.interceptor.LoggingInterceptor;
public class FhirUtil {
private static FhirContext context = FhirContext.forDstu3();
private static IParser getJsonParser() {
return context.newJsonParser();
}
public static IBaseResource getAsResource(String jsonResource) {
return getJsonParser().parseResource(jsonResource);
}
public static String serializeToString(IBaseResource baseResource) {
return context.newJsonParser().setPrettyPrint(true).encodeResourceToString(baseResource);
}
public static IGenericClient getGenericClient(String theServerBase) {
// Create a logging interceptor
LoggingInterceptor loggingInterceptor = new LoggingInterceptor();
loggingInterceptor.setLogRequestSummary(true);
loggingInterceptor.setLogRequestBody(true);
IGenericClient client = context.newRestfulGenericClient(theServerBase);
client.registerInterceptor(loggingInterceptor);
return client;
}
}
......@@ -127,14 +127,14 @@
unpack="false"/>
<plugin
id="info.elexis.server.hapi.fhir"
id="com.google.gson"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="com.google.gson"
id="ch.elexis.core.hapi.fhir"
download-size="0"
install-size="0"
version="0.0.0"
......
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
<target name="Elexis-Server" sequenceNumber="1560846558">
<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde?><!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --><target name="Elexis-Server" sequenceNumber="1560931952">
<locations>
<location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="org.osgi.framework.system.packages.extra" version="1.0.0.20190124-1239"/>
<unit id="jaxb-api-impl-import-java9" version="1.0.0.20190124-1239"/>
<unit id="ch.rgw.utility" version="3.8.0.20190425-1427"/>
<unit id="ch.elexis.core" version="3.8.0.20190618-0803"/>
<unit id="ch.elexis.core" version="3.8.0.20190619-0656"/>
<unit id="ch.elexis.core.l10n" version="3.8.0.20190527-1326"/>
<unit id="ch.elexis.core.importer.div" version="3.2.0.20190522-0735"/>
<unit id="ch.elexis.core.hl7.v2x" version="3.2.0.20190416-1216"/>
<unit id="ch.elexis.core.findings" version="1.0.0.20181005-0856"/>
<unit id="ch.elexis.core.findings.util" version="1.0.0.20190521-1332"/>
<unit id="ch.elexis.core.findings.util" version="1.0.0.20190619-0803"/>
<unit id="ch.elexis.core.test" version="1.0.0.20190508-1245"/>
<unit id="ch.elexis.core.jpa" version="1.0.0.20190617-1312"/>
<unit id="ch.elexis.core.jpa" version="1.0.0.20190619-0656"/>
<unit id="ch.elexis.core.jpa.datasource" version="1.0.0.20190511-0953"/>
<unit id="ch.elexis.core.jpa.entities" version="1.0.0.20190617-1312"/>
<unit id="ch.elexis.core.jpa.logging.slf4j" version="1.0.0.20181009-1221"/>
<unit id="ch.elexis.core.model" version="1.0.0.20190613-1656"/>
<unit id="ch.elexis.core.jcifs" version="2.1.2.20190509-1116"/>
<unit id="ch.elexis.core.services" version="1.0.0.20190615-1012"/>
<unit id="ch.elexis.core.findings.fhir.model" version="1.0.0.20190515-1510"/>
<unit id="ch.elexis.core.services" version="1.0.0.20190619-0656"/>
<unit id="ch.elexis.core.hapi.fhir" version="3.4.0.20190619-0803"/>
<unit id="ch.elexis.core.findings.fhir.model" version="1.0.0.20190619-0803"/>
<unit id="ch.elexis.core.tasks" version="1.0.0.20190618-0803"/>
<unit id="org.h2" version="1.3.170"/>
<unit id="org.jdom" version="1.1.1.v201101151400"/>
......@@ -39,7 +37,7 @@
<unit id="org.dom4j" version="1.6.1.v20170815-1500"/>
<repository location="http://download.elexis.info/elexis/f11106/p2/elexis-3-core/"/>
</location>
<location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="ch.elexis.base.ch.ticode" version="3.2.0.20190516-0804"/>
<unit id="at.medevit.ch.artikelstamm" version="3.3.0.20190513-0800"/>
<unit id="at.medevit.ch.artikelstamm.model" version="1.0.0.20190516-0804"/>
......@@ -49,7 +47,7 @@
<unit id="ch.elexis.base.ch.labortarif.model" version="1.0.0.20190516-0804"/>
<repository location="http://download.elexis.info/elexis/f11106/p2/elexis-3-base/"/>
</location>
<location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.equinox.sdk.feature.group" version="3.15.0.v20180904-1442"/>
<unit id="org.eclipse.core.runtime.feature.feature.group" version="1.2.200.v20180903-1343"/>
<unit id="org.eclipse.emf.common.feature.group" version="2.15.0.v20180723-1316"/>
......@@ -78,7 +76,7 @@
<unit id="org.eclipse.core.commands" version="3.9.200.v20180827-1727"/>
<repository location="http://download.eclipse.org/eclipse/updates/4.9/"/>
</location>
<location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="ch.qos.logback.classic" version="1.0.7.v20121108-1250"/>
<unit id="ch.qos.logback.core" version="1.0.7.v20121108-1250"/>
<unit id="ch.qos.logback.slf4j" version="1.0.7.v201505121915"/>
......@@ -90,7 +88,7 @@
<unit id="javax.xml" version="1.3.4.v201005080400"/>
<repository location="http://download.eclipse.org/releases/2018-09/"/>
</location>
<location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.http" version="9.4.14.v20181113"/>
<unit id="org.eclipse.jetty.continuation" version="9.4.14.v20181113"/>
<unit id="org.eclipse.jetty.security" version="9.4.14.v20181113"/>
......@@ -120,7 +118,7 @@
<unit id="org.eclipse.jetty.apache-jsp" version="9.4.14.v20181113"/>
<repository location="http://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.14.v20181113/"/>
</location>
<location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="com.eclipsesource.jaxrs.connector.feature.feature.group" version="5.3.1.201905211243"/>
<unit id="com.eclipsesource.jaxrs.provider.sse.feature.feature.group" version="2.2.0.201905211243"/>
<unit id="com.eclipsesource.jaxrs.provider.gson.feature.feature.group" version="2.3.0.201905211243"/>
......@@ -129,7 +127,7 @@
<unit id="com.eclipsesource.jaxrs.provider.multipart.feature.feature.group" version="2.2.0.201905211243"/>
<repository location="http://medevit.github.io/osgi-jax-rs-connector/5.3.100/"/>
</location>
<location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="org.tukaani.xz" version="1.8.0.v20180207-1613"/>
<unit id="osgi.enterprise" version="4.2.0.v201108120515"/>
<unit id="javax.ejb" version="3.1.1.v201204261316"/>
......@@ -145,7 +143,7 @@
<unit id="javax.servlet.jsp.jstl.impl" version="1.2.0.v201210211230"/>
<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20180905201904/repository/"/>
</location>
<location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.persistence.jpa.feature.group" version="2.7.3.v20180807-4be1041"/>
<unit id="org.eclipse.persistence.moxy.feature.group" version="2.7.3.v20180807-4be1041"/>
<unit id="org.eclipse.persistence.jpars" version="2.6.0.v20150309-bf26070"/>
......@@ -154,11 +152,11 @@
<unit id="javax.activation" version="1.1.0.v201108011116"/>
<repository location="http://download.eclipse.org/rt/eclipselink/updates/"/>
</location>
<location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.gemini.jpa.feature.feature.group" version="1.2.0.201307051903"/>
<repository location="http://download.elexis.info/elexis-server/misc/gemini-jpa/"/>
</location>
<location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="javax.transaction-api" version="1.3.0"/>
<unit id="javax.enterprise.cdi-api" version="2.0.0.SP1"/>
<unit id="javax.interceptor-api" version="1.2.2"/>
......@@ -243,13 +241,13 @@
<unit id="org.objectweb.asm.tree" version="6.1.1"/>
<repository location="http://download.elexis.info/elexis-server/elexis-server-dependencies/"/>
</location>
<location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="com.eclipsesource.restfuse" version="1.10.0.201601141215"/>
<repository location="http://download.elexis.info/elexis-server/p2/restfuse/"/>
</location>
<location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="net.sf.opencsv" version="1.8.0"/>
<repository location="http://download.elexis.info/elexis.3.3rdparty.libraries/snapshot"/>
</location>
</locations>
</target>
</target>
\ No newline at end of file
......@@ -24,6 +24,7 @@ location "http://download.elexis.info/elexis/f11106/p2/elexis-3-core/" {
ch.elexis.core.model
ch.elexis.core.jcifs
ch.elexis.core.services
ch.elexis.core.hapi.fhir
ch.elexis.core.findings.fhir.model
ch.elexis.core.tasks
//
......
......@@ -14,9 +14,9 @@ Require-Bundle: org.junit;bundle-version="4.12.0",
info.elexis.server.findings.fhir.jpa.service;bundle-version="1.0.0",
com.eclipsesource.jaxrs.consumer,
info.elexis.server.core.connector.elexis;bundle-version="1.0.0",
info.elexis.server.hapi.fhir;bundle-version="3.4.0",
ch.elexis.core.test;bundle-version="1.0.0",
ch.elexis.core.jpa.datasource
ch.elexis.core.jpa.datasource,
ch.elexis.core.hapi.fhir;bundle-version="3.4.0"
Bundle-ClassPath: .
Import-Package: ch.elexis.core.common,
com.eclipsesource.jaxrs.provider.gson;version="2.3.0",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment