From 0a93db572eb76b097dca8ed235d869fbee616536 Mon Sep 17 00:00:00 2001 From: Jens Kristian Villadsen Date: Wed, 9 Nov 2016 11:37:00 +0100 Subject: [PATCH 01/31] Added new example --- .../java/filters/CharsetResponseFilter.java | 24 -------------- .../main/java/filters/CorsResponseFilter.java | 33 ------------------- 2 files changed, 57 deletions(-) delete mode 100644 hapi-fhir-base-example-embedded-ws/src/main/java/filters/CharsetResponseFilter.java delete mode 100644 hapi-fhir-base-example-embedded-ws/src/main/java/filters/CorsResponseFilter.java diff --git a/hapi-fhir-base-example-embedded-ws/src/main/java/filters/CharsetResponseFilter.java b/hapi-fhir-base-example-embedded-ws/src/main/java/filters/CharsetResponseFilter.java deleted file mode 100644 index 656f7535578..00000000000 --- a/hapi-fhir-base-example-embedded-ws/src/main/java/filters/CharsetResponseFilter.java +++ /dev/null @@ -1,24 +0,0 @@ -package filters; - - -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; - -import com.sun.jersey.spi.container.ContainerRequest; -import com.sun.jersey.spi.container.ContainerResponse; -import com.sun.jersey.spi.container.ContainerResponseFilter; - -public class CharsetResponseFilter implements ContainerResponseFilter { - - @Override - public ContainerResponse filter(final ContainerRequest request, - final ContainerResponse response) { - - final MediaType contentType = response.getMediaType(); - if (contentType != null) { - response.getHttpHeaders().putSingle(HttpHeaders.CONTENT_TYPE, - contentType.toString() + ";charset=UTF-8"); - } - return response; - } -} \ No newline at end of file diff --git a/hapi-fhir-base-example-embedded-ws/src/main/java/filters/CorsResponseFilter.java b/hapi-fhir-base-example-embedded-ws/src/main/java/filters/CorsResponseFilter.java deleted file mode 100644 index cab06c28419..00000000000 --- a/hapi-fhir-base-example-embedded-ws/src/main/java/filters/CorsResponseFilter.java +++ /dev/null @@ -1,33 +0,0 @@ -package filters; - - -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.ResponseBuilder; - -import com.sun.jersey.spi.container.ContainerRequest; -import com.sun.jersey.spi.container.ContainerResponse; -import com.sun.jersey.spi.container.ContainerResponseFilter; - -public class CorsResponseFilter implements ContainerResponseFilter { - - @Override - public ContainerResponse filter(final ContainerRequest req, - final ContainerResponse contResp) { - - final ResponseBuilder resp = Response.fromResponse(contResp - .getResponse()); - resp.header("Access-Control-Allow-Origin", "*").header( - "Access-Control-Allow-Methods", "GET, POST, OPTIONS"); - - final String reqHead = req - .getHeaderValue("Access-Control-Request-Headers"); - - if (null != reqHead && !reqHead.equals("")) { - resp.header("Access-Control-Allow-Headers", reqHead); - } - - contResp.setResponse(resp.build()); - return contResp; - } - -} \ No newline at end of file From fab75f1add0bb64a39892af676079ecc8d0bd204 Mon Sep 17 00:00:00 2001 From: Jens Kristian Villadsen Date: Wed, 9 Nov 2016 11:38:18 +0100 Subject: [PATCH 02/31] Added new example --- hapi-fhir-base-example-embedded-ws/.classpath | 21 +++++ hapi-fhir-base-example-embedded-ws/.project | 16 +++- hapi-fhir-base-example-embedded-ws/pom.xml | 17 ++-- .../main/java/embedded/ContextListener.java | 24 ++---- .../java/embedded/FhirRestfulServlet.java | 21 ----- .../src/main/java/embedded/ServerStartup.java | 9 ++- .../.classpath | 21 +++++ hapi-fhir-standalone-overlay-example/.project | 31 ++++++++ .../org.eclipse.core.resources.prefs | 2 + .../.settings/org.eclipse.m2e.core.prefs | 4 + hapi-fhir-standalone-overlay-example/pom.xml | 79 +++++++++++++++++++ .../embedded/example/ContextListener.java | 51 ++++++++++++ .../embedded/example/FhirTesterConfig.java | 73 +++++++++++++++++ .../src/main/webapp/WEB-INF/web.xml | 22 ++++++ .../src/test/java/test/WarTester.java | 14 ++++ 15 files changed, 357 insertions(+), 48 deletions(-) create mode 100644 hapi-fhir-base-example-embedded-ws/.classpath create mode 100644 hapi-fhir-standalone-overlay-example/.classpath create mode 100644 hapi-fhir-standalone-overlay-example/.project create mode 100644 hapi-fhir-standalone-overlay-example/.settings/org.eclipse.core.resources.prefs create mode 100644 hapi-fhir-standalone-overlay-example/.settings/org.eclipse.m2e.core.prefs create mode 100644 hapi-fhir-standalone-overlay-example/pom.xml create mode 100644 hapi-fhir-standalone-overlay-example/src/main/java/embedded/example/ContextListener.java create mode 100644 hapi-fhir-standalone-overlay-example/src/main/java/embedded/example/FhirTesterConfig.java create mode 100644 hapi-fhir-standalone-overlay-example/src/main/webapp/WEB-INF/web.xml create mode 100644 hapi-fhir-standalone-overlay-example/src/test/java/test/WarTester.java diff --git a/hapi-fhir-base-example-embedded-ws/.classpath b/hapi-fhir-base-example-embedded-ws/.classpath new file mode 100644 index 00000000000..9cbcd519d58 --- /dev/null +++ b/hapi-fhir-base-example-embedded-ws/.classpath @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/hapi-fhir-base-example-embedded-ws/.project b/hapi-fhir-base-example-embedded-ws/.project index dfe12454643..350f75695ef 100644 --- a/hapi-fhir-base-example-embedded-ws/.project +++ b/hapi-fhir-base-example-embedded-ws/.project @@ -1,10 +1,20 @@ hapi-fhir-base-example-embedded-ws - + NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse. + + org.eclipse.wst.common.project.facet.core.builder + + + + + org.eclipse.jdt.core.javabuilder + + + org.eclipse.m2e.core.maven2Builder @@ -12,6 +22,10 @@ + org.eclipse.jem.workbench.JavaEMFNature + org.eclipse.wst.common.modulecore.ModuleCoreNature org.eclipse.m2e.core.maven2Nature + org.eclipse.jdt.core.javanature + org.eclipse.wst.common.project.facet.core.nature diff --git a/hapi-fhir-base-example-embedded-ws/pom.xml b/hapi-fhir-base-example-embedded-ws/pom.xml index 189c558de0e..a9c68c05d86 100644 --- a/hapi-fhir-base-example-embedded-ws/pom.xml +++ b/hapi-fhir-base-example-embedded-ws/pom.xml @@ -26,25 +26,30 @@ com.google.inject guice - 3.0 + 4.1.0 com.google.inject.extensions guice-servlet - 3.0 + 4.1.0 com.sun.jersey.contribs jersey-guice - 1.18.1 + 1.19.1 + + + org.ebaysf.web + cors-filter ca.uhn.hapi.fhir hapi-fhir-structures-dstu2 - 1.2 + 2.1-SNAPSHOT + - + @@ -56,5 +61,5 @@ - + \ No newline at end of file diff --git a/hapi-fhir-base-example-embedded-ws/src/main/java/embedded/ContextListener.java b/hapi-fhir-base-example-embedded-ws/src/main/java/embedded/ContextListener.java index 02019b886cb..20cb9c43c7a 100644 --- a/hapi-fhir-base-example-embedded-ws/src/main/java/embedded/ContextListener.java +++ b/hapi-fhir-base-example-embedded-ws/src/main/java/embedded/ContextListener.java @@ -1,18 +1,14 @@ package embedded; -import java.util.Map; -import com.google.common.base.Joiner; -import com.google.common.collect.ImmutableMap; +import javax.inject.Singleton; + +import org.ebaysf.web.cors.CORSFilter; + import com.google.inject.Guice; import com.google.inject.Injector; import com.google.inject.servlet.GuiceServletContextListener; -import com.sun.jersey.api.container.filter.GZIPContentEncodingFilter; -import com.sun.jersey.api.core.ResourceConfig; import com.sun.jersey.guice.JerseyServletModule; -import filters.CharsetResponseFilter; -import filters.CorsResponseFilter; - public class ContextListener extends GuiceServletContextListener { @Override @@ -22,15 +18,9 @@ public class ContextListener extends GuiceServletContextListener { @Override protected void configureServlets() { - final Map params = ImmutableMap - . builder() - .put(ResourceConfig.PROPERTY_CONTAINER_RESPONSE_FILTERS, - Joiner.on(";").join( - CharsetResponseFilter.class.getName(), - CorsResponseFilter.class.getName(), - GZIPContentEncodingFilter.class - .getName())).build(); - serve("/model/*").with(FhirRestfulServlet.class, params); + bind(CORSFilter.class).in(Singleton.class); + filter("/*").through(CORSFilter.class); + serve("/model/*").with(FhirRestfulServlet.class); } }); } diff --git a/hapi-fhir-base-example-embedded-ws/src/main/java/embedded/FhirRestfulServlet.java b/hapi-fhir-base-example-embedded-ws/src/main/java/embedded/FhirRestfulServlet.java index a7e082015b9..e197c62edda 100644 --- a/hapi-fhir-base-example-embedded-ws/src/main/java/embedded/FhirRestfulServlet.java +++ b/hapi-fhir-base-example-embedded-ws/src/main/java/embedded/FhirRestfulServlet.java @@ -6,8 +6,6 @@ import java.util.List; import javax.inject.Singleton; import ca.uhn.fhir.context.FhirContext; -import ca.uhn.fhir.narrative.DefaultThymeleafNarrativeGenerator; -import ca.uhn.fhir.narrative.INarrativeGenerator; import ca.uhn.fhir.rest.server.IResourceProvider; import ca.uhn.fhir.rest.server.RestfulServer; import ca.uhn.fhir.rest.server.interceptor.ResponseHighlighterInterceptor; @@ -29,29 +27,10 @@ public class FhirRestfulServlet extends RestfulServer { */ @Override public void initialize() { - /* - * Two resource providers are defined. Each one handles a specific type - * of resource. - */ final List providers = new ArrayList(); providers.add(new SomeResourceProvider()); setResourceProviders(providers); - /* - * Use a narrative generator. This is a completely optional step, but - * can be useful as it causes HAPI to generate narratives for resources - * which don't otherwise have one. - */ - final INarrativeGenerator narrativeGen = new DefaultThymeleafNarrativeGenerator(); - getFhirContext().setNarrativeGenerator(narrativeGen); - - /* - * Tells HAPI to use content types which are not technically FHIR - * compliant when a browser is detected as the requesting client. This - * prevents browsers from trying to download resource responses instead - * of displaying them inline which can be handy for troubleshooting. - */ - setUseBrowserFriendlyContentTypes(true); registerInterceptor(new ResponseHighlighterInterceptor()); diff --git a/hapi-fhir-base-example-embedded-ws/src/main/java/embedded/ServerStartup.java b/hapi-fhir-base-example-embedded-ws/src/main/java/embedded/ServerStartup.java index fb8dde91365..5cf844aad02 100644 --- a/hapi-fhir-base-example-embedded-ws/src/main/java/embedded/ServerStartup.java +++ b/hapi-fhir-base-example-embedded-ws/src/main/java/embedded/ServerStartup.java @@ -1,4 +1,5 @@ package embedded; + import java.util.EnumSet; import javax.servlet.DispatcherType; @@ -16,10 +17,12 @@ public class ServerStartup { final Server server = new Server(9090); final ServletContextHandler sch = new ServletContextHandler(server, "/"); sch.addEventListener(new ContextListener()); - sch.addFilter(GuiceFilter.class, "/*", - EnumSet.of(DispatcherType.REQUEST)); + sch.addFilter(GuiceFilter.class, "/*", EnumSet.of(DispatcherType.REQUEST)); sch.addServlet(DefaultServlet.class, "/"); - server.start(); + server.start(); + + // Service is now accessible through + // http://localhost:9090/model/Practitioner } } diff --git a/hapi-fhir-standalone-overlay-example/.classpath b/hapi-fhir-standalone-overlay-example/.classpath new file mode 100644 index 00000000000..9cbcd519d58 --- /dev/null +++ b/hapi-fhir-standalone-overlay-example/.classpath @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/hapi-fhir-standalone-overlay-example/.project b/hapi-fhir-standalone-overlay-example/.project new file mode 100644 index 00000000000..b1b0d3d01a3 --- /dev/null +++ b/hapi-fhir-standalone-overlay-example/.project @@ -0,0 +1,31 @@ + + + hapi-fhir-standalone-overlay-example + NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse. + + + + + org.eclipse.wst.common.project.facet.core.builder + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.jem.workbench.JavaEMFNature + org.eclipse.wst.common.modulecore.ModuleCoreNature + org.eclipse.m2e.core.maven2Nature + org.eclipse.jdt.core.javanature + org.eclipse.wst.common.project.facet.core.nature + + diff --git a/hapi-fhir-standalone-overlay-example/.settings/org.eclipse.core.resources.prefs b/hapi-fhir-standalone-overlay-example/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 00000000000..99f26c0203a --- /dev/null +++ b/hapi-fhir-standalone-overlay-example/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/hapi-fhir-standalone-overlay-example/.settings/org.eclipse.m2e.core.prefs b/hapi-fhir-standalone-overlay-example/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 00000000000..f897a7f1cb2 --- /dev/null +++ b/hapi-fhir-standalone-overlay-example/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/hapi-fhir-standalone-overlay-example/pom.xml b/hapi-fhir-standalone-overlay-example/pom.xml new file mode 100644 index 00000000000..05efe37315f --- /dev/null +++ b/hapi-fhir-standalone-overlay-example/pom.xml @@ -0,0 +1,79 @@ + + 4.0.0 + + ca.uhn.hapi.fhir + hapi-fhir + 2.1-SNAPSHOT + + hapi-fhir-standalone-overlay-example + + + + maven-compiler-plugin + + 1.8 + 1.8 + + + + org.apache.maven.plugins + maven-war-plugin + + + + ca.uhn.hapi.fhir + hapi-fhir-testpage-overlay + + + fhirtester + true + + + + + + + ca.uhn.hapi.fhir + hapi-fhir-testpage-overlay + 2.1-SNAPSHOT + war + provided + + + ca.uhn.hapi.fhir + hapi-fhir-testpage-overlay + 2.1-SNAPSHOT + classes + provided + + + org.eclipse.jetty + jetty-servlet + + + org.eclipse.jetty + jetty-webapp + + + com.google.inject + guice + 4.1.0 + + + com.google.inject.extensions + guice-servlet + 4.1.0 + + + com.sun.jersey.contribs + jersey-guice + 1.19.1 + + + org.ebaysf.web + cors-filter + + + + diff --git a/hapi-fhir-standalone-overlay-example/src/main/java/embedded/example/ContextListener.java b/hapi-fhir-standalone-overlay-example/src/main/java/embedded/example/ContextListener.java new file mode 100644 index 00000000000..ce89689f297 --- /dev/null +++ b/hapi-fhir-standalone-overlay-example/src/main/java/embedded/example/ContextListener.java @@ -0,0 +1,51 @@ +package embedded.example; + +import javax.inject.Singleton; +import javax.servlet.ServletContextEvent; + +import org.ebaysf.web.cors.CORSFilter; +import org.springframework.web.context.support.AnnotationConfigWebApplicationContext; +import org.springframework.web.servlet.DispatcherServlet; + +import com.google.inject.Guice; +import com.google.inject.Injector; +import com.google.inject.servlet.GuiceServletContextListener; +import com.sun.jersey.guice.JerseyServletModule; + +public class ContextListener extends GuiceServletContextListener { + + static String username; + static String password; + static String serverAddress; + + @Override + public void contextInitialized(ServletContextEvent servletContextEvent) { + super.contextInitialized(servletContextEvent); + + username = servletContextEvent.getServletContext().getInitParameter("username") != null + ? servletContextEvent.getServletContext().getInitParameter("username") + : null; + password = servletContextEvent.getServletContext().getInitParameter("password") != null + ? servletContextEvent.getServletContext().getInitParameter("password") + : null; + serverAddress = servletContextEvent.getServletContext().getInitParameter("serverAddress") != null + ? servletContextEvent.getServletContext().getInitParameter("serverAddress") + : null; + } + + @Override + protected Injector getInjector() { + return Guice.createInjector(new JerseyServletModule() { + + @Override + protected void configureServlets() { + + AnnotationConfigWebApplicationContext webApp = new AnnotationConfigWebApplicationContext(); + webApp.setConfigLocation(FhirTesterConfig.class.getName()); + serve("/*").with(new DispatcherServlet(webApp)); + bind(CORSFilter.class).in(Singleton.class); + filter("/*").through(CORSFilter.class); + } + }); + } +} \ No newline at end of file diff --git a/hapi-fhir-standalone-overlay-example/src/main/java/embedded/example/FhirTesterConfig.java b/hapi-fhir-standalone-overlay-example/src/main/java/embedded/example/FhirTesterConfig.java new file mode 100644 index 00000000000..91a3e9f6b25 --- /dev/null +++ b/hapi-fhir-standalone-overlay-example/src/main/java/embedded/example/FhirTesterConfig.java @@ -0,0 +1,73 @@ +package embedded.example; + +import javax.servlet.http.HttpServletRequest; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Import; + +import com.google.common.base.Strings; + +import ca.uhn.fhir.context.FhirContext; +import ca.uhn.fhir.context.FhirVersionEnum; +import ca.uhn.fhir.rest.client.IGenericClient; +import ca.uhn.fhir.rest.client.interceptor.BasicAuthInterceptor; +import ca.uhn.fhir.to.FhirTesterMvcConfig; +import ca.uhn.fhir.to.TesterConfig; +import ca.uhn.fhir.util.ITestingUiClientFactory; + +//@formatter:off +/** + * This spring config file configures the web testing module. It serves two + * purposes: 1. It imports FhirTesterMvcConfig, which is the spring config for + * the tester itself 2. It tells the tester which server(s) to talk to, via the + * testerConfig() method below + */ +@Configuration +@Import(FhirTesterMvcConfig.class) +public class FhirTesterConfig { + + /** + * This bean tells the testing webpage which servers it should configure + * itself to communicate with. In this example we configure it to talk to + * the local server, as well as one public server. If you are creating a + * project to deploy somewhere else, you might choose to only put your own + * server's address here. + * + * Note the use of the ${serverBase} variable below. This will be replaced + * with the base URL as reported by the server itself. Often for a simple + * Tomcat (or other container) installation, this will end up being + * something like "http://localhost:8080/hapi-fhir-jpaserver-example". If + * you are deploying your server to a place with a fully qualified domain + * name, you might want to use that instead of using the variable. + */ + @Bean + public TesterConfig testerConfig() { + final TesterConfig retVal = new TesterConfig(); + retVal.addServer().withId("Test-Server").withFhirVersion(FhirVersionEnum.DSTU2) + .withBaseUrl(ContextListener.serverAddress).withName("FHIR Server Test Front End"); + + if (!Strings.isNullOrEmpty(ContextListener.username)) { + ITestingUiClientFactory clientFactory = new ITestingUiClientFactory() { + + @Override + public IGenericClient newClient(FhirContext theFhirContext, HttpServletRequest theRequest, + String theServerBaseUrl) { + // Create a client + IGenericClient client = theFhirContext.newRestfulGenericClient(theServerBaseUrl); + + // Register an interceptor which adds credentials + client.registerInterceptor( + new BasicAuthInterceptor(ContextListener.username, ContextListener.password)); + + return client; + } + + }; + retVal.setClientFactory(clientFactory); + } + return retVal; + } + +} +// @formatter:on \ No newline at end of file diff --git a/hapi-fhir-standalone-overlay-example/src/main/webapp/WEB-INF/web.xml b/hapi-fhir-standalone-overlay-example/src/main/webapp/WEB-INF/web.xml new file mode 100644 index 00000000000..8c985e61d0c --- /dev/null +++ b/hapi-fhir-standalone-overlay-example/src/main/webapp/WEB-INF/web.xml @@ -0,0 +1,22 @@ + + + + Guice Filter + com.google.inject.servlet.GuiceFilter + + + Guice Filter + /* + + + embedded.example.ContextListener + + + + + serverAddress + http://fhirtest.uhn.ca/baseDstu2 + + \ No newline at end of file diff --git a/hapi-fhir-standalone-overlay-example/src/test/java/test/WarTester.java b/hapi-fhir-standalone-overlay-example/src/test/java/test/WarTester.java new file mode 100644 index 00000000000..fffbc626c75 --- /dev/null +++ b/hapi-fhir-standalone-overlay-example/src/test/java/test/WarTester.java @@ -0,0 +1,14 @@ +package test; + +import org.eclipse.jetty.server.Server; +import org.eclipse.jetty.webapp.WebAppContext; + +public class WarTester { + + public static void main(String[] args) throws Exception { + final Server server = new Server(8080); + server.setHandler(new WebAppContext("target/fhirtester.war", "/")); + server.start(); + } + +} From 6aba4610e6666a23326af5e3baa5108cb3051d3f Mon Sep 17 00:00:00 2001 From: Jens Kristian Villadsen Date: Tue, 15 Nov 2016 13:41:13 +0100 Subject: [PATCH 03/31] Added initial lenient handling --- hapi-fhir-base-example-embedded-ws/pom.xml | 11 +++++++++- .../src/main/java/embedded/ServerStartup.java | 4 ++++ .../java/embedded/SomeResourceProvider.java | 7 +++++-- .../fhir/rest/method/SearchMethodBinding.java | 21 +++++++++++++++++-- .../fhir/rest/server/RestfulServerUtils.java | 3 +-- 5 files changed, 39 insertions(+), 7 deletions(-) diff --git a/hapi-fhir-base-example-embedded-ws/pom.xml b/hapi-fhir-base-example-embedded-ws/pom.xml index a9c68c05d86..12797c32c62 100644 --- a/hapi-fhir-base-example-embedded-ws/pom.xml +++ b/hapi-fhir-base-example-embedded-ws/pom.xml @@ -47,7 +47,16 @@ hapi-fhir-structures-dstu2 2.1-SNAPSHOT - + + org.slf4j + slf4j-simple + 1.7.21 + + + org.slf4j + jul-to-slf4j + 1.7.21 + diff --git a/hapi-fhir-base-example-embedded-ws/src/main/java/embedded/ServerStartup.java b/hapi-fhir-base-example-embedded-ws/src/main/java/embedded/ServerStartup.java index 5cf844aad02..984829826a2 100644 --- a/hapi-fhir-base-example-embedded-ws/src/main/java/embedded/ServerStartup.java +++ b/hapi-fhir-base-example-embedded-ws/src/main/java/embedded/ServerStartup.java @@ -7,6 +7,7 @@ import javax.servlet.DispatcherType; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.servlet.DefaultServlet; import org.eclipse.jetty.servlet.ServletContextHandler; +import org.slf4j.bridge.SLF4JBridgeHandler; import com.google.inject.servlet.GuiceFilter; @@ -14,6 +15,9 @@ public class ServerStartup { public static void main(final String[] args) throws Exception { + SLF4JBridgeHandler.removeHandlersForRootLogger(); + SLF4JBridgeHandler.install(); + final Server server = new Server(9090); final ServletContextHandler sch = new ServletContextHandler(server, "/"); sch.addEventListener(new ContextListener()); diff --git a/hapi-fhir-base-example-embedded-ws/src/main/java/embedded/SomeResourceProvider.java b/hapi-fhir-base-example-embedded-ws/src/main/java/embedded/SomeResourceProvider.java index aac9da8adb9..b1d9d80cbe0 100644 --- a/hapi-fhir-base-example-embedded-ws/src/main/java/embedded/SomeResourceProvider.java +++ b/hapi-fhir-base-example-embedded-ws/src/main/java/embedded/SomeResourceProvider.java @@ -4,6 +4,8 @@ import java.util.List; import org.hl7.fhir.instance.model.api.IBaseResource; +import com.google.common.collect.Lists; + import ca.uhn.fhir.model.dstu2.resource.Practitioner; import ca.uhn.fhir.model.primitive.StringDt; import ca.uhn.fhir.rest.annotation.RequiredParam; @@ -21,8 +23,9 @@ public class SomeResourceProvider implements IResourceProvider { @Search() public List findPractitionersByName( @RequiredParam(name = Practitioner.SP_NAME) final StringDt theName) { - throw new UnprocessableEntityException( - "Please provide more than 4 characters for the name"); +// throw new UnprocessableEntityException( +// "Please provide more than 4 characters for the name"); + return Lists.newArrayList(); } } diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/method/SearchMethodBinding.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/method/SearchMethodBinding.java index 984bdd978ab..67a952018c5 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/method/SearchMethodBinding.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/method/SearchMethodBinding.java @@ -37,7 +37,6 @@ import org.hl7.fhir.instance.model.api.IBaseResource; import ca.uhn.fhir.context.ConfigurationException; import ca.uhn.fhir.context.FhirContext; -import ca.uhn.fhir.context.FhirVersionEnum; import ca.uhn.fhir.model.api.annotation.Description; import ca.uhn.fhir.model.primitive.IdDt; import ca.uhn.fhir.model.valueset.BundleTypeEnum; @@ -140,6 +139,21 @@ public class SearchMethodBinding extends BaseResourceReturningMethodBinding { @Override public boolean incomingServerRequestMatchesMethod(RequestDetails theRequest) { + + String clientPreference = theRequest.getHeader(Constants.HEADER_PREFER); + boolean lenientHandling = false; + if(clientPreference != null) + { + String[] preferences = clientPreference.split(";"); + for( String p : preferences){ + if("handling:lenient".equalsIgnoreCase(p)) + { + lenientHandling = true; + break; + } + } + } + if (theRequest.getId() != null && myIdParamIndex == null) { ourLog.trace("Method {} doesn't match because ID is not null: {}", theRequest.getId()); return false; @@ -235,6 +249,9 @@ public class SearchMethodBinding extends BaseResourceReturningMethodBinding { } } Set keySet = theRequest.getParameters().keySet(); + if(lenientHandling == true) + return true; + if (myAllowUnknownParams == false) { for (String next : keySet) { if (!methodParamsTemp.contains(next)) { @@ -271,7 +288,7 @@ public class SearchMethodBinding extends BaseResourceReturningMethodBinding { } @Override - public IBundleProvider invokeServer(IRestfulServer theServer, RequestDetails theRequest, Object[] theMethodParams) throws InvalidRequestException, InternalErrorException { + public IBundleProvider invokeServer(IRestfulServer theServer, RequestDetails theRequest, Object[] theMethodParams) throws InvalidRequestException, InternalErrorException { if (myIdParamIndex != null) { theMethodParams[myIdParamIndex] = theRequest.getId(); } diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/RestfulServerUtils.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/RestfulServerUtils.java index bf3b99d2c03..19e63ef2752 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/RestfulServerUtils.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/RestfulServerUtils.java @@ -61,7 +61,6 @@ import ca.uhn.fhir.model.valueset.BundleTypeEnum; import ca.uhn.fhir.parser.IParser; import ca.uhn.fhir.rest.api.PreferReturnEnum; import ca.uhn.fhir.rest.api.SummaryEnum; -import ca.uhn.fhir.rest.client.apache.ApacheHttpRequest; import ca.uhn.fhir.rest.client.api.IHttpRequest; import ca.uhn.fhir.rest.method.ElementsParameter; import ca.uhn.fhir.rest.method.RequestDetails; @@ -378,7 +377,7 @@ public class RestfulServerUtils { break; } } catch (IllegalArgumentException e) { - ourLog.debug("Invalid {} parameger: {}", Constants.PARAM_NARRATIVE, narrative[0]); + ourLog.debug("Invalid {} parameter: {}", Constants.PARAM_NARRATIVE, narrative[0]); } } } From 07525db83fabad8d81b790c8624870fee93f9aaf Mon Sep 17 00:00:00 2001 From: "Waveren, Robbert van" Date: Thu, 29 Dec 2016 12:16:32 +0100 Subject: [PATCH 04/31] correct ordering of codesystem dao types --- .../ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoValueSetDstu3.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoValueSetDstu3.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoValueSetDstu3.java index f2a579ad8a4..4c317e1d007 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoValueSetDstu3.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoValueSetDstu3.java @@ -60,7 +60,7 @@ public class FhirResourceDaoValueSetDstu3 extends FhirResourceDaoDstu3 private IValidationSupport myValidationSupport; @Autowired - private IFhirResourceDaoCodeSystem myCodeSystemDao; + private IFhirResourceDaoCodeSystem myCodeSystemDao; @Override public ValueSet expand(IIdType theId, String theFilter, RequestDetails theRequestDetails) { From a6a1416888514fef0e8d1a5ed3d94c589cf24cd0 Mon Sep 17 00:00:00 2001 From: "michael.i.calderero" Date: Thu, 12 Jan 2017 14:21:30 -0600 Subject: [PATCH 05/31] Place empty values when splitting a parameter with a certain char and here are at least two unescaped and consecutive variants of the given char in the string. This ensures that for example a QuantityParam with a param value of "5.5||mg" the "mg" will not be treated as the 'system' but be treated correctly as the 'unit' of the parameter object. --- .../ca/uhn/fhir/rest/param/ParameterUtil.java | 4 +++- .../fhir/rest/param/QuantityParamTest.java | 24 +++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/ParameterUtil.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/ParameterUtil.java index 259d188cd91..1b63cfc9d2e 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/ParameterUtil.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/ParameterUtil.java @@ -108,8 +108,10 @@ public class ParameterUtil { } else { if (b.length() > 0) { retVal.add(b.toString()); - b.setLength(0); + } else { + retVal.add(null); } + b.setLength(0); } } } else { diff --git a/hapi-fhir-structures-dstu/src/test/java/ca/uhn/fhir/rest/param/QuantityParamTest.java b/hapi-fhir-structures-dstu/src/test/java/ca/uhn/fhir/rest/param/QuantityParamTest.java index bb31b06fcb0..0784dc19a0b 100644 --- a/hapi-fhir-structures-dstu/src/test/java/ca/uhn/fhir/rest/param/QuantityParamTest.java +++ b/hapi-fhir-structures-dstu/src/test/java/ca/uhn/fhir/rest/param/QuantityParamTest.java @@ -59,6 +59,30 @@ public class QuantityParamTest { assertEquals("5.4||", p.getValueAsQueryToken(ourCtx)); } + @Test + public void testNoSystem() { + // http://hl7.org/fhir/2017Jan/search.html#quantity + // sample url: [baseurl]/Observation?value-quantity=5.5||mg + String query = "5.5||mg"; + QuantityParam param = new QuantityParam(); + param.setValueAsQueryToken(null, "value-quantity", null, query); + // Check parts. The 'mg' part should be put in the units not the system + // System.out.println(param); + assertEquals(null, param.getPrefix()); + assertEquals("5.5", param.getValue().toPlainString()); + assertEquals(null, param.getSystem()); + assertEquals("mg", param.getUnits()); + + // Make sure we don't break on this one... + query = "5.5| |mg"; + param = new QuantityParam(); + param.setValueAsQueryToken(null, "value-quantity", null, query); + // System.out.println(param); + assertEquals(null, param.getPrefix()); + assertEquals("5.5", param.getValue().toPlainString()); + assertEquals(null, param.getSystem()); + assertEquals("mg", param.getUnits()); + } @AfterClass public static void afterClassClearContext() { From c1e6f82385056ae433d3157025cf0effeca5ffe7 Mon Sep 17 00:00:00 2001 From: Jenni Syed Date: Fri, 27 Jan 2017 17:43:07 -0600 Subject: [PATCH 06/31] Fix #546 CapturingInterceptor will now buffer response if the entity is not repeatable. --- .../interceptor/CapturingInterceptor.java | 24 ++- .../rest/client/CapturingInterceptorTest.java | 147 ++++++++++++++++++ 2 files changed, 169 insertions(+), 2 deletions(-) create mode 100644 hapi-fhir-structures-dstu/src/test/java/ca/uhn/fhir/rest/client/CapturingInterceptorTest.java diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/interceptor/CapturingInterceptor.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/interceptor/CapturingInterceptor.java index f7e9e949af8..a3e02c64ea2 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/interceptor/CapturingInterceptor.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/interceptor/CapturingInterceptor.java @@ -23,6 +23,11 @@ package ca.uhn.fhir.rest.client.interceptor; import ca.uhn.fhir.rest.client.IClientInterceptor; import ca.uhn.fhir.rest.client.api.IHttpRequest; import ca.uhn.fhir.rest.client.api.IHttpResponse; +import ca.uhn.fhir.rest.server.exceptions.InternalErrorException; +import org.apache.http.HttpEntity; +import org.apache.http.HttpResponse; + +import java.io.IOException; /** * Client interceptor which simply captures request and response objects and stores them so that they can be inspected after a client @@ -55,8 +60,23 @@ public class CapturingInterceptor implements IClientInterceptor { } @Override - public void interceptResponse(IHttpResponse theRequest) { - myLastResponse = theRequest; + public void interceptResponse(IHttpResponse theResponse) { + //Buffer the reponse to avoid errors when content has already been read and the entity is not repeatable + try { + if(theResponse.getResponse() instanceof HttpResponse) { + HttpEntity entity = ((HttpResponse) theResponse.getResponse()).getEntity(); + if( entity != null && !entity.isRepeatable()){ + theResponse.bufferEntity(); + } + } else { + theResponse.bufferEntity(); + } + } catch (IOException e) { + throw new InternalErrorException("Unable to buffer the entity for capturing", e); + } + + + myLastResponse = theResponse; } } diff --git a/hapi-fhir-structures-dstu/src/test/java/ca/uhn/fhir/rest/client/CapturingInterceptorTest.java b/hapi-fhir-structures-dstu/src/test/java/ca/uhn/fhir/rest/client/CapturingInterceptorTest.java new file mode 100644 index 00000000000..7e297f7962a --- /dev/null +++ b/hapi-fhir-structures-dstu/src/test/java/ca/uhn/fhir/rest/client/CapturingInterceptorTest.java @@ -0,0 +1,147 @@ +package ca.uhn.fhir.rest.client; + +import ca.uhn.fhir.rest.client.apache.ApacheHttpResponse; +import ca.uhn.fhir.rest.client.api.IHttpRequest; +import ca.uhn.fhir.rest.client.api.IHttpResponse; +import ca.uhn.fhir.rest.client.interceptor.CapturingInterceptor; +import ca.uhn.fhir.rest.server.exceptions.InternalErrorException; +import org.apache.commons.io.IOUtils; +import org.apache.http.HttpRequest; +import org.apache.http.HttpResponse; +import org.apache.http.HttpStatus; +import org.apache.http.HttpVersion; +import org.apache.http.entity.BasicHttpEntity; +import org.apache.http.entity.InputStreamEntity; +import org.apache.http.entity.StringEntity; +import org.apache.http.message.BasicHttpRequest; +import org.apache.http.message.BasicHttpResponse; +import org.junit.After; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.ExpectedException; +import org.mockito.Spy; + +import java.io.IOException; +import java.nio.charset.Charset; + +import static org.hamcrest.CoreMatchers.equalTo; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertThat; +import static org.mockito.Mockito.*; + + +public class CapturingInterceptorTest { + + @Rule + public ExpectedException thrown = ExpectedException.none(); + + + @Test + public void testRequest() { + IHttpRequest expectedRequest = mock(IHttpRequest.class); + + CapturingInterceptor interceptor = new CapturingInterceptor(); + interceptor.interceptRequest(expectedRequest); + + assertEquals(expectedRequest, interceptor.getLastRequest()); + } + + @Test + public void testResponse() throws Exception { + IHttpResponse expectedResponse = mock(IHttpResponse.class); + doNothing().when(expectedResponse).bufferEntity(); + + CapturingInterceptor interceptor = new CapturingInterceptor(); + interceptor.interceptResponse(expectedResponse); + + assertEquals(expectedResponse, interceptor.getLastResponse()); + verify(expectedResponse).bufferEntity(); + } + + @Test + public void testResponseException() throws Exception { + IHttpResponse response = mock(IHttpResponse.class); + IOException expectedCause = new IOException(); + doThrow(expectedCause).when(response).bufferEntity(); + + thrown.expect(InternalErrorException.class); + thrown.expectMessage("Unable to buffer the entity for capturing"); + thrown.expectCause(equalTo(expectedCause)); + + CapturingInterceptor interceptor = new CapturingInterceptor(); + interceptor.interceptResponse(response); + } + + @Test + public void testResponseBufferApache() throws Exception{ + HttpResponse response = new BasicHttpResponse(HttpVersion.HTTP_1_1, HttpStatus.SC_OK, "OK"); + response.setEntity(new InputStreamEntity(IOUtils.toInputStream("Some content", Charset.defaultCharset()))); + IHttpResponse expectedResponse = spy(new ApacheHttpResponse(response)); + + CapturingInterceptor interceptor = new CapturingInterceptor(); + interceptor.interceptResponse(expectedResponse); + IHttpResponse actualResponse = interceptor.getLastResponse(); + + assertEquals(expectedResponse, actualResponse); + assertThat("Some content", equalTo(IOUtils.toString(actualResponse.createReader()))); + verify(expectedResponse).bufferEntity(); + + //A second call should not throw an exception (InpuStreamEntity is not repeatable) + IOUtils.toString(actualResponse.createReader()); + } + + @Test + public void testResponseRepeatable() throws Exception{ + HttpResponse response = new BasicHttpResponse(HttpVersion.HTTP_1_1, HttpStatus.SC_OK, "OK"); + response.setEntity(new StringEntity("Some content")); + IHttpResponse expectedResponse = spy(new ApacheHttpResponse(response)); + + CapturingInterceptor interceptor = new CapturingInterceptor(); + interceptor.interceptResponse(expectedResponse); + IHttpResponse actualResponse = interceptor.getLastResponse(); + + assertEquals(expectedResponse, actualResponse); + assertThat("Some content", equalTo(IOUtils.toString(actualResponse.createReader()))); + verify(expectedResponse, times(0)).bufferEntity(); + + //A second call should not throw an exception (StringEntity is repeatable) + IOUtils.toString(actualResponse.createReader()); + } + + @Test + public void testResponseBufferOther() throws Exception { + Object response = mock(Object.class); + IHttpResponse expectedResponse = mock(IHttpResponse.class); + when(expectedResponse.getResponse()).thenReturn(response); + doNothing().when(expectedResponse).bufferEntity(); + + CapturingInterceptor interceptor = new CapturingInterceptor(); + interceptor.interceptResponse(expectedResponse); + IHttpResponse actualResponse = interceptor.getLastResponse(); + + assertEquals(expectedResponse, actualResponse); + verify(expectedResponse).bufferEntity(); + } + + @Test + public void testClear(){ + IHttpRequest expectedRequest = mock(IHttpRequest.class); + IHttpResponse expectedResponse = mock(IHttpResponse.class); + Object response = mock(Object.class); + when(expectedResponse.getResponse()).thenReturn(response); + + CapturingInterceptor interceptor = new CapturingInterceptor(); + interceptor.interceptResponse(expectedResponse); + interceptor.interceptRequest(expectedRequest); + + assertEquals(expectedRequest, interceptor.getLastRequest()); + assertEquals(expectedResponse, interceptor.getLastResponse()); + + interceptor.clear(); + + assertNull(interceptor.getLastRequest()); + assertNull(interceptor.getLastResponse()); + } + +} From 5550a07ec112ee875c9cdb30616cce142ab01911 Mon Sep 17 00:00:00 2001 From: sekaijin Date: Sat, 28 Jan 2017 16:03:53 +0100 Subject: [PATCH 07/31] Update .gitignore ignore eclipse hidden files and folders --- .gitignore | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 7c4ffb73ca9..09734b19d32 100644 --- a/.gitignore +++ b/.gitignore @@ -137,9 +137,11 @@ local.properties .cproject # JDT-specific (Eclipse Java Development Tools) -#.project -#.settings/ -#.classpath +**/.settings +**/.target +**/.project +**/.classpath + # PDT-specific .buildpath From 23784c1619dedf59aa590e1e94cbb5996936f4c9 Mon Sep 17 00:00:00 2001 From: sekaijin Date: Sat, 28 Jan 2017 17:13:47 +0100 Subject: [PATCH 08/31] remove .settings .project .classpath file of eclipse --- .classpath | 5 - .project | 28 -- examples/.classpath | 27 -- examples/.project | 23 - .../org.eclipse.core.resources.prefs | 3 - examples/.settings/org.eclipse.jdt.core.prefs | 376 ---------------- examples/.settings/org.eclipse.jdt.ui.prefs | 3 - examples/.settings/org.eclipse.m2e.core.prefs | 4 - hapi-deployable-pom/.project | 17 - .../org.eclipse.core.resources.prefs | 2 - .../.settings/org.eclipse.m2e.core.prefs | 4 - hapi-fhir-android/.classpath | 28 -- hapi-fhir-android/.project | 23 - .../org.eclipse.core.resources.prefs | 2 - .../.settings/org.eclipse.jdt.core.prefs | 5 - .../.settings/org.eclipse.m2e.core.prefs | 4 - hapi-fhir-base-example-embedded-ws/.project | 17 - .../org.eclipse.core.resources.prefs | 2 - .../.settings/org.eclipse.m2e.core.prefs | 4 - hapi-fhir-base-test-mindeps-client/.classpath | 16 - hapi-fhir-base-test-mindeps-client/.project | 23 - .../org.eclipse.core.resources.prefs | 2 - .../.settings/org.eclipse.jdt.core.prefs | 7 - .../.settings/org.eclipse.m2e.core.prefs | 4 - ....eclipse.wst.common.project.facet.core.xml | 4 - hapi-fhir-base-test-mindeps-server/.classpath | 21 - hapi-fhir-base-test-mindeps-server/.project | 29 -- .../org.eclipse.core.resources.prefs | 2 - .../.settings/org.eclipse.jdt.core.prefs | 7 - .../.settings/org.eclipse.m2e.core.prefs | 4 - ....eclipse.wst.common.project.facet.core.xml | 4 - hapi-fhir-base/.classpath | 37 -- hapi-fhir-base/.project | 31 -- .../org.eclipse.core.resources.prefs | 6 - .../.settings/org.eclipse.jdt.core.prefs | 412 ------------------ .../.settings/org.eclipse.jdt.ui.prefs | 3 - .../.settings/org.eclipse.m2e.core.prefs | 4 - .../org.eclipse.wst.common.component | 7 - ....eclipse.wst.common.project.facet.core.xml | 5 - .../org.eclipse.wst.validation.prefs | 2 - hapi-fhir-cli/.classpath | 9 - hapi-fhir-cli/.project | 34 -- .../org.eclipse.core.resources.prefs | 2 - .../.settings/org.eclipse.jdt.core.prefs | 309 ------------- .../.settings/org.eclipse.jdt.ui.prefs | 3 - .../.settings/org.eclipse.m2e.core.prefs | 4 - ....eclipse.wst.common.project.facet.core.xml | 4 - .../org.eclipse.wst.validation.prefs | 2 - hapi-fhir-cli/hapi-fhir-cli-app/.classpath | 37 -- hapi-fhir-cli/hapi-fhir-cli-app/.project | 29 -- .../org.eclipse.core.resources.prefs | 2 - .../.settings/org.eclipse.jdt.core.prefs | 7 - .../.settings/org.eclipse.m2e.core.prefs | 4 - ....eclipse.wst.common.project.facet.core.xml | 4 - .../hapi-fhir-cli-jpaserver/.project | 29 -- hapi-fhir-client-okhttp/.classpath | 32 -- hapi-fhir-client-okhttp/.project | 31 -- .../org.eclipse.core.resources.prefs | 2 - .../.settings/org.eclipse.m2e.core.prefs | 4 - hapi-fhir-dist/.project | 17 - .../org.eclipse.core.resources.prefs | 2 - .../.settings/org.eclipse.m2e.core.prefs | 4 - hapi-fhir-examples-uploader/.classpath | 22 - hapi-fhir-examples-uploader/.project | 36 -- .../org.eclipse.core.resources.prefs | 2 - .../.settings/org.eclipse.jdt.core.prefs | 7 - .../.settings/org.eclipse.m2e.core.prefs | 4 - ....eclipse.wst.common.project.facet.core.xml | 4 - hapi-fhir-fhirpath/.classpath | 28 -- hapi-fhir-fhirpath/.project | 36 -- .../org.eclipse.core.resources.prefs | 2 - .../.settings/org.eclipse.jdt.core.prefs | 7 - .../.settings/org.eclipse.m2e.core.prefs | 4 - ....eclipse.wst.common.project.facet.core.xml | 4 - hapi-fhir-jacoco/.project | 17 - .../org.eclipse.core.resources.prefs | 2 - .../.settings/org.eclipse.m2e.core.prefs | 4 - hapi-fhir-jaxrsserver-base/.classpath | 28 -- hapi-fhir-jaxrsserver-base/.project | 31 -- .../org.eclipse.core.resources.prefs | 2 - .../.settings/org.eclipse.m2e.core.prefs | 4 - hapi-fhir-jaxrsserver-example/.classpath | 28 -- hapi-fhir-jaxrsserver-example/.project | 31 -- .../org.eclipse.core.resources.prefs | 2 - .../.settings/org.eclipse.m2e.core.prefs | 4 - hapi-fhir-jpaserver-base/.classpath | 35 -- hapi-fhir-jpaserver-base/.project | 32 -- .../org.eclipse.core.resources.prefs | 6 - .../.settings/org.eclipse.core.runtime.prefs | 2 - .../.settings/org.eclipse.jdt.core.prefs | 101 ----- .../.settings/org.eclipse.m2e.core.prefs | 4 - .../org.eclipse.wst.common.component | 10 - ....eclipse.wst.common.project.facet.core.xml | 5 - .../org.eclipse.wst.validation.prefs | 2 - hapi-fhir-jpaserver-example/.classpath | 29 -- hapi-fhir-jpaserver-example/.project | 42 -- .../.settings/.jsdtscope | 13 - .../org.eclipse.core.resources.prefs | 4 - .../.settings/org.eclipse.jdt.core.prefs | 8 - .../.settings/org.eclipse.m2e.core.prefs | 4 - .../org.eclipse.wst.common.component | 34 -- ....eclipse.wst.common.project.facet.core.xml | 4 - ...rg.eclipse.wst.jsdt.ui.superType.container | 1 - .../org.eclipse.wst.jsdt.ui.superType.name | 1 - .../org.eclipse.wst.validation.prefs | 2 - .../.classpath | 36 -- .../.gitignore | 128 ------ .../org.eclipse.core.resources.prefs | 2 - .../.settings/org.eclipse.jdt.core.prefs | 5 - .../.settings/org.eclipse.m2e.core.prefs | 4 - hapi-fhir-jpaserver-uhnfhirtest/.classpath | 41 -- hapi-fhir-jpaserver-uhnfhirtest/.project | 42 -- .../.settings/.jsdtscope | 13 - .../org.eclipse.core.resources.prefs | 6 - .../.settings/org.eclipse.jdt.core.prefs | 13 - .../.settings/org.eclipse.m2e.core.prefs | 4 - .../org.eclipse.wst.common.component | 35 -- ....eclipse.wst.common.project.facet.core.xml | 7 - ...rg.eclipse.wst.jsdt.ui.superType.container | 1 - .../org.eclipse.wst.jsdt.ui.superType.name | 1 - .../org.eclipse.wst.validation.prefs | 2 - .../auth-server/.classpath | 26 -- .../.settings/org.eclipse.jdt.core.prefs | 5 - .../.settings/org.eclipse.m2e.core.prefs | 4 - hapi-fhir-narrativegenerator/.classpath | 33 -- hapi-fhir-narrativegenerator/.project | 31 -- .../org.eclipse.core.resources.prefs | 2 - .../.settings/org.eclipse.m2e.core.prefs | 4 - hapi-fhir-oauth2/.classpath | 27 -- hapi-fhir-oauth2/.project | 23 - .../org.eclipse.core.resources.prefs | 5 - .../.settings/org.eclipse.jdt.core.prefs | 5 - .../.settings/org.eclipse.m2e.core.prefs | 4 - hapi-fhir-osgi-core/.classpath | 33 -- hapi-fhir-osgi-core/.project | 39 -- .../org.eclipse.core.resources.prefs | 2 - .../.settings/org.eclipse.jdt.core.prefs | 7 - .../.settings/org.eclipse.m2e.core.prefs | 4 - ....eclipse.wst.common.project.facet.core.xml | 4 - hapi-fhir-structures-dstu/.classpath | 40 -- hapi-fhir-structures-dstu/.project | 31 -- .../org.eclipse.core.resources.prefs | 7 - .../.settings/org.eclipse.jdt.core.prefs | 8 - .../.settings/org.eclipse.m2e.core.prefs | 4 - .../org.eclipse.wst.common.component | 10 - ....eclipse.wst.common.project.facet.core.xml | 5 - .../org.eclipse.wst.validation.prefs | 2 - hapi-fhir-structures-dstu2.1/.classpath | 30 -- hapi-fhir-structures-dstu2.1/.project | 29 -- .../org.eclipse.core.resources.prefs | 2 - .../.settings/org.eclipse.jdt.core.prefs | 7 - .../.settings/org.eclipse.m2e.core.prefs | 4 - ....eclipse.wst.common.project.facet.core.xml | 4 - hapi-fhir-structures-dstu2/.classpath | 40 -- hapi-fhir-structures-dstu2/.project | 36 -- .../org.eclipse.core.resources.prefs | 6 - .../.settings/org.eclipse.jdt.core.prefs | 8 - .../.settings/org.eclipse.m2e.core.prefs | 4 - .../org.eclipse.wst.common.component | 9 - ....eclipse.wst.common.project.facet.core.xml | 5 - .../org.eclipse.wst.validation.prefs | 2 - hapi-fhir-structures-dstu3/.classpath | 30 -- hapi-fhir-structures-dstu3/.project | 31 -- .../org.eclipse.core.resources.prefs | 2 - .../.settings/org.eclipse.jdt.core.prefs | 95 ---- .../.settings/org.eclipse.m2e.core.prefs | 4 - hapi-fhir-structures-hl7org-dstu2/.classpath | 30 -- hapi-fhir-structures-hl7org-dstu2/.project | 31 -- .../org.eclipse.core.resources.prefs | 2 - .../.settings/org.eclipse.jdt.core.prefs | 386 ---------------- .../.settings/org.eclipse.jdt.ui.prefs | 3 - .../.settings/org.eclipse.m2e.core.prefs | 4 - .../org.eclipse.wst.common.component | 6 - ....eclipse.wst.common.project.facet.core.xml | 5 - .../org.eclipse.wst.validation.prefs | 10 - hapi-fhir-testpage-interceptor/.classpath | 26 -- hapi-fhir-testpage-interceptor/.project | 23 - .../org.eclipse.core.resources.prefs | 2 - .../.settings/org.eclipse.jdt.core.prefs | 5 - .../.settings/org.eclipse.m2e.core.prefs | 4 - hapi-fhir-testpage-overlay/.classpath | 38 -- hapi-fhir-testpage-overlay/.project | 42 -- .../.settings/.jsdtscope | 13 - .../org.eclipse.core.resources.prefs | 6 - .../.settings/org.eclipse.jdt.core.prefs | 8 - .../.settings/org.eclipse.m2e.core.prefs | 4 - .../org.eclipse.wst.common.component | 30 -- ....eclipse.wst.common.project.facet.core.xml | 7 - .../.settings/org.eclipse.wst.jsdt.core.prefs | 50 --- ...rg.eclipse.wst.jsdt.ui.superType.container | 1 - .../org.eclipse.wst.jsdt.ui.superType.name | 1 - .../org.eclipse.wst.validation.prefs | 2 - .../jpaserver-example-with-custom/.classpath | 36 -- .../jpaserver-example-with-custom/.project | 23 - .../.settings/org.eclipse.jdt.core.prefs | 5 - .../.settings/org.eclipse.m2e.core.prefs | 4 - .../simple-server/.settings/.jsdtscope | 13 - .../org.eclipse.core.resources.prefs | 3 - .../.settings/org.eclipse.jdt.core.prefs | 8 - .../.settings/org.eclipse.m2e.core.prefs | 4 - .../org.eclipse.wst.common.component | 9 - ....eclipse.wst.common.project.facet.core.xml | 7 - ...rg.eclipse.wst.jsdt.ui.superType.container | 1 - .../org.eclipse.wst.jsdt.ui.superType.name | 1 - .../org.eclipse.wst.validation.prefs | 2 - .../org.eclipse.core.resources.prefs | 3 - .../.settings/org.eclipse.jdt.core.prefs | 5 - .../.settings/org.eclipse.m2e.core.prefs | 4 - .../.classpath | 10 - .../.project | 31 -- .../org.eclipse.core.resources.prefs | 2 - .../.settings/org.eclipse.m2e.core.prefs | 4 - .../.classpath | 10 - hapi-fhir-validation-resources-dstu2/.project | 31 -- .../org.eclipse.core.resources.prefs | 2 - .../.settings/org.eclipse.jdt.core.prefs | 7 - .../.settings/org.eclipse.m2e.core.prefs | 4 - .../org.eclipse.wst.common.component | 5 - ....eclipse.wst.common.project.facet.core.xml | 5 - .../.classpath | 33 -- hapi-fhir-validation-resources-dstu3/.project | 29 -- .../org.eclipse.core.resources.prefs | 2 - .../.settings/org.eclipse.jdt.core.prefs | 7 - .../.settings/org.eclipse.m2e.core.prefs | 4 - ....eclipse.wst.common.project.facet.core.xml | 4 - hapi-tinder-plugin/.classpath | 40 -- hapi-tinder-plugin/.project | 36 -- .../org.eclipse.core.resources.prefs | 6 - .../.settings/org.eclipse.jdt.core.prefs | 402 ----------------- .../.settings/org.eclipse.jdt.ui.prefs | 3 - .../.settings/org.eclipse.m2e.core.prefs | 4 - hapi-tinder-test/.classpath | 29 -- hapi-tinder-test/.project | 23 - .../org.eclipse.core.resources.prefs | 5 - .../.settings/org.eclipse.jdt.core.prefs | 13 - .../.settings/org.eclipse.m2e.core.prefs | 4 - restful-server-example-test/.classpath | 27 -- restful-server-example-test/.project | 23 - .../org.eclipse.core.resources.prefs | 3 - .../.settings/org.eclipse.jdt.core.prefs | 5 - .../.settings/org.eclipse.m2e.core.prefs | 4 - restful-server-example/.classpath | 41 -- restful-server-example/.settings/.jsdtscope | 13 - .../org.eclipse.core.resources.prefs | 3 - .../.settings/org.eclipse.jdt.core.prefs | 8 - .../.settings/org.eclipse.m2e.core.prefs | 4 - .../org.eclipse.wst.common.component | 21 - ....eclipse.wst.common.project.facet.core.xml | 7 - ...rg.eclipse.wst.jsdt.ui.superType.container | 1 - .../org.eclipse.wst.jsdt.ui.superType.name | 1 - .../org.eclipse.wst.validation.prefs | 2 - 251 files changed, 5264 deletions(-) delete mode 100644 .classpath delete mode 100644 .project delete mode 100644 examples/.classpath delete mode 100644 examples/.project delete mode 100644 examples/.settings/org.eclipse.core.resources.prefs delete mode 100644 examples/.settings/org.eclipse.jdt.core.prefs delete mode 100644 examples/.settings/org.eclipse.jdt.ui.prefs delete mode 100644 examples/.settings/org.eclipse.m2e.core.prefs delete mode 100644 hapi-deployable-pom/.project delete mode 100644 hapi-deployable-pom/.settings/org.eclipse.core.resources.prefs delete mode 100644 hapi-deployable-pom/.settings/org.eclipse.m2e.core.prefs delete mode 100644 hapi-fhir-android/.classpath delete mode 100644 hapi-fhir-android/.project delete mode 100644 hapi-fhir-android/.settings/org.eclipse.core.resources.prefs delete mode 100644 hapi-fhir-android/.settings/org.eclipse.jdt.core.prefs delete mode 100644 hapi-fhir-android/.settings/org.eclipse.m2e.core.prefs delete mode 100644 hapi-fhir-base-example-embedded-ws/.project delete mode 100644 hapi-fhir-base-example-embedded-ws/.settings/org.eclipse.core.resources.prefs delete mode 100644 hapi-fhir-base-example-embedded-ws/.settings/org.eclipse.m2e.core.prefs delete mode 100644 hapi-fhir-base-test-mindeps-client/.classpath delete mode 100644 hapi-fhir-base-test-mindeps-client/.project delete mode 100644 hapi-fhir-base-test-mindeps-client/.settings/org.eclipse.core.resources.prefs delete mode 100644 hapi-fhir-base-test-mindeps-client/.settings/org.eclipse.jdt.core.prefs delete mode 100644 hapi-fhir-base-test-mindeps-client/.settings/org.eclipse.m2e.core.prefs delete mode 100644 hapi-fhir-base-test-mindeps-client/.settings/org.eclipse.wst.common.project.facet.core.xml delete mode 100644 hapi-fhir-base-test-mindeps-server/.classpath delete mode 100644 hapi-fhir-base-test-mindeps-server/.project delete mode 100644 hapi-fhir-base-test-mindeps-server/.settings/org.eclipse.core.resources.prefs delete mode 100644 hapi-fhir-base-test-mindeps-server/.settings/org.eclipse.jdt.core.prefs delete mode 100644 hapi-fhir-base-test-mindeps-server/.settings/org.eclipse.m2e.core.prefs delete mode 100644 hapi-fhir-base-test-mindeps-server/.settings/org.eclipse.wst.common.project.facet.core.xml delete mode 100644 hapi-fhir-base/.classpath delete mode 100644 hapi-fhir-base/.project delete mode 100644 hapi-fhir-base/.settings/org.eclipse.core.resources.prefs delete mode 100644 hapi-fhir-base/.settings/org.eclipse.jdt.core.prefs delete mode 100644 hapi-fhir-base/.settings/org.eclipse.jdt.ui.prefs delete mode 100644 hapi-fhir-base/.settings/org.eclipse.m2e.core.prefs delete mode 100644 hapi-fhir-base/.settings/org.eclipse.wst.common.component delete mode 100644 hapi-fhir-base/.settings/org.eclipse.wst.common.project.facet.core.xml delete mode 100644 hapi-fhir-base/.settings/org.eclipse.wst.validation.prefs delete mode 100644 hapi-fhir-cli/.classpath delete mode 100644 hapi-fhir-cli/.project delete mode 100644 hapi-fhir-cli/.settings/org.eclipse.core.resources.prefs delete mode 100644 hapi-fhir-cli/.settings/org.eclipse.jdt.core.prefs delete mode 100644 hapi-fhir-cli/.settings/org.eclipse.jdt.ui.prefs delete mode 100644 hapi-fhir-cli/.settings/org.eclipse.m2e.core.prefs delete mode 100644 hapi-fhir-cli/.settings/org.eclipse.wst.common.project.facet.core.xml delete mode 100644 hapi-fhir-cli/.settings/org.eclipse.wst.validation.prefs delete mode 100644 hapi-fhir-cli/hapi-fhir-cli-app/.classpath delete mode 100644 hapi-fhir-cli/hapi-fhir-cli-app/.project delete mode 100644 hapi-fhir-cli/hapi-fhir-cli-app/.settings/org.eclipse.core.resources.prefs delete mode 100644 hapi-fhir-cli/hapi-fhir-cli-app/.settings/org.eclipse.jdt.core.prefs delete mode 100644 hapi-fhir-cli/hapi-fhir-cli-app/.settings/org.eclipse.m2e.core.prefs delete mode 100644 hapi-fhir-cli/hapi-fhir-cli-app/.settings/org.eclipse.wst.common.project.facet.core.xml delete mode 100644 hapi-fhir-cli/hapi-fhir-cli-jpaserver/.project delete mode 100644 hapi-fhir-client-okhttp/.classpath delete mode 100644 hapi-fhir-client-okhttp/.project delete mode 100644 hapi-fhir-client-okhttp/.settings/org.eclipse.core.resources.prefs delete mode 100644 hapi-fhir-client-okhttp/.settings/org.eclipse.m2e.core.prefs delete mode 100644 hapi-fhir-dist/.project delete mode 100644 hapi-fhir-dist/.settings/org.eclipse.core.resources.prefs delete mode 100644 hapi-fhir-dist/.settings/org.eclipse.m2e.core.prefs delete mode 100644 hapi-fhir-examples-uploader/.classpath delete mode 100644 hapi-fhir-examples-uploader/.project delete mode 100644 hapi-fhir-examples-uploader/.settings/org.eclipse.core.resources.prefs delete mode 100644 hapi-fhir-examples-uploader/.settings/org.eclipse.jdt.core.prefs delete mode 100644 hapi-fhir-examples-uploader/.settings/org.eclipse.m2e.core.prefs delete mode 100644 hapi-fhir-examples-uploader/.settings/org.eclipse.wst.common.project.facet.core.xml delete mode 100644 hapi-fhir-fhirpath/.classpath delete mode 100644 hapi-fhir-fhirpath/.project delete mode 100644 hapi-fhir-fhirpath/.settings/org.eclipse.core.resources.prefs delete mode 100644 hapi-fhir-fhirpath/.settings/org.eclipse.jdt.core.prefs delete mode 100644 hapi-fhir-fhirpath/.settings/org.eclipse.m2e.core.prefs delete mode 100644 hapi-fhir-fhirpath/.settings/org.eclipse.wst.common.project.facet.core.xml delete mode 100644 hapi-fhir-jacoco/.project delete mode 100644 hapi-fhir-jacoco/.settings/org.eclipse.core.resources.prefs delete mode 100644 hapi-fhir-jacoco/.settings/org.eclipse.m2e.core.prefs delete mode 100644 hapi-fhir-jaxrsserver-base/.classpath delete mode 100644 hapi-fhir-jaxrsserver-base/.project delete mode 100644 hapi-fhir-jaxrsserver-base/.settings/org.eclipse.core.resources.prefs delete mode 100644 hapi-fhir-jaxrsserver-base/.settings/org.eclipse.m2e.core.prefs delete mode 100644 hapi-fhir-jaxrsserver-example/.classpath delete mode 100644 hapi-fhir-jaxrsserver-example/.project delete mode 100644 hapi-fhir-jaxrsserver-example/.settings/org.eclipse.core.resources.prefs delete mode 100644 hapi-fhir-jaxrsserver-example/.settings/org.eclipse.m2e.core.prefs delete mode 100644 hapi-fhir-jpaserver-base/.classpath delete mode 100644 hapi-fhir-jpaserver-base/.project delete mode 100644 hapi-fhir-jpaserver-base/.settings/org.eclipse.core.resources.prefs delete mode 100644 hapi-fhir-jpaserver-base/.settings/org.eclipse.core.runtime.prefs delete mode 100644 hapi-fhir-jpaserver-base/.settings/org.eclipse.jdt.core.prefs delete mode 100644 hapi-fhir-jpaserver-base/.settings/org.eclipse.m2e.core.prefs delete mode 100644 hapi-fhir-jpaserver-base/.settings/org.eclipse.wst.common.component delete mode 100644 hapi-fhir-jpaserver-base/.settings/org.eclipse.wst.common.project.facet.core.xml delete mode 100644 hapi-fhir-jpaserver-base/.settings/org.eclipse.wst.validation.prefs delete mode 100644 hapi-fhir-jpaserver-example/.classpath delete mode 100644 hapi-fhir-jpaserver-example/.project delete mode 100644 hapi-fhir-jpaserver-example/.settings/.jsdtscope delete mode 100644 hapi-fhir-jpaserver-example/.settings/org.eclipse.core.resources.prefs delete mode 100644 hapi-fhir-jpaserver-example/.settings/org.eclipse.jdt.core.prefs delete mode 100644 hapi-fhir-jpaserver-example/.settings/org.eclipse.m2e.core.prefs delete mode 100644 hapi-fhir-jpaserver-example/.settings/org.eclipse.wst.common.component delete mode 100644 hapi-fhir-jpaserver-example/.settings/org.eclipse.wst.common.project.facet.core.xml delete mode 100644 hapi-fhir-jpaserver-example/.settings/org.eclipse.wst.jsdt.ui.superType.container delete mode 100644 hapi-fhir-jpaserver-example/.settings/org.eclipse.wst.jsdt.ui.superType.name delete mode 100644 hapi-fhir-jpaserver-example/.settings/org.eclipse.wst.validation.prefs delete mode 100644 hapi-fhir-jpaserver-examples/hapi-fhir-jpaserver-example-postgres/.classpath delete mode 100644 hapi-fhir-jpaserver-examples/hapi-fhir-jpaserver-example-postgres/.gitignore delete mode 100644 hapi-fhir-jpaserver-examples/hapi-fhir-jpaserver-example-postgres/.settings/org.eclipse.core.resources.prefs delete mode 100644 hapi-fhir-jpaserver-examples/hapi-fhir-jpaserver-example-postgres/.settings/org.eclipse.jdt.core.prefs delete mode 100644 hapi-fhir-jpaserver-examples/hapi-fhir-jpaserver-example-postgres/.settings/org.eclipse.m2e.core.prefs delete mode 100644 hapi-fhir-jpaserver-uhnfhirtest/.classpath delete mode 100644 hapi-fhir-jpaserver-uhnfhirtest/.project delete mode 100644 hapi-fhir-jpaserver-uhnfhirtest/.settings/.jsdtscope delete mode 100644 hapi-fhir-jpaserver-uhnfhirtest/.settings/org.eclipse.core.resources.prefs delete mode 100644 hapi-fhir-jpaserver-uhnfhirtest/.settings/org.eclipse.jdt.core.prefs delete mode 100644 hapi-fhir-jpaserver-uhnfhirtest/.settings/org.eclipse.m2e.core.prefs delete mode 100644 hapi-fhir-jpaserver-uhnfhirtest/.settings/org.eclipse.wst.common.component delete mode 100644 hapi-fhir-jpaserver-uhnfhirtest/.settings/org.eclipse.wst.common.project.facet.core.xml delete mode 100644 hapi-fhir-jpaserver-uhnfhirtest/.settings/org.eclipse.wst.jsdt.ui.superType.container delete mode 100644 hapi-fhir-jpaserver-uhnfhirtest/.settings/org.eclipse.wst.jsdt.ui.superType.name delete mode 100644 hapi-fhir-jpaserver-uhnfhirtest/.settings/org.eclipse.wst.validation.prefs delete mode 100644 hapi-fhir-jpaserver-uhnfhirtest/auth-server/.classpath delete mode 100644 hapi-fhir-jpaserver-uhnfhirtest/auth-server/.settings/org.eclipse.jdt.core.prefs delete mode 100644 hapi-fhir-jpaserver-uhnfhirtest/auth-server/.settings/org.eclipse.m2e.core.prefs delete mode 100644 hapi-fhir-narrativegenerator/.classpath delete mode 100644 hapi-fhir-narrativegenerator/.project delete mode 100644 hapi-fhir-narrativegenerator/.settings/org.eclipse.core.resources.prefs delete mode 100644 hapi-fhir-narrativegenerator/.settings/org.eclipse.m2e.core.prefs delete mode 100644 hapi-fhir-oauth2/.classpath delete mode 100644 hapi-fhir-oauth2/.project delete mode 100644 hapi-fhir-oauth2/.settings/org.eclipse.core.resources.prefs delete mode 100644 hapi-fhir-oauth2/.settings/org.eclipse.jdt.core.prefs delete mode 100644 hapi-fhir-oauth2/.settings/org.eclipse.m2e.core.prefs delete mode 100644 hapi-fhir-osgi-core/.classpath delete mode 100644 hapi-fhir-osgi-core/.project delete mode 100644 hapi-fhir-osgi-core/.settings/org.eclipse.core.resources.prefs delete mode 100644 hapi-fhir-osgi-core/.settings/org.eclipse.jdt.core.prefs delete mode 100644 hapi-fhir-osgi-core/.settings/org.eclipse.m2e.core.prefs delete mode 100644 hapi-fhir-osgi-core/.settings/org.eclipse.wst.common.project.facet.core.xml delete mode 100644 hapi-fhir-structures-dstu/.classpath delete mode 100644 hapi-fhir-structures-dstu/.project delete mode 100644 hapi-fhir-structures-dstu/.settings/org.eclipse.core.resources.prefs delete mode 100644 hapi-fhir-structures-dstu/.settings/org.eclipse.jdt.core.prefs delete mode 100644 hapi-fhir-structures-dstu/.settings/org.eclipse.m2e.core.prefs delete mode 100644 hapi-fhir-structures-dstu/.settings/org.eclipse.wst.common.component delete mode 100644 hapi-fhir-structures-dstu/.settings/org.eclipse.wst.common.project.facet.core.xml delete mode 100644 hapi-fhir-structures-dstu/.settings/org.eclipse.wst.validation.prefs delete mode 100644 hapi-fhir-structures-dstu2.1/.classpath delete mode 100644 hapi-fhir-structures-dstu2.1/.project delete mode 100644 hapi-fhir-structures-dstu2.1/.settings/org.eclipse.core.resources.prefs delete mode 100644 hapi-fhir-structures-dstu2.1/.settings/org.eclipse.jdt.core.prefs delete mode 100644 hapi-fhir-structures-dstu2.1/.settings/org.eclipse.m2e.core.prefs delete mode 100644 hapi-fhir-structures-dstu2.1/.settings/org.eclipse.wst.common.project.facet.core.xml delete mode 100644 hapi-fhir-structures-dstu2/.classpath delete mode 100644 hapi-fhir-structures-dstu2/.project delete mode 100644 hapi-fhir-structures-dstu2/.settings/org.eclipse.core.resources.prefs delete mode 100644 hapi-fhir-structures-dstu2/.settings/org.eclipse.jdt.core.prefs delete mode 100644 hapi-fhir-structures-dstu2/.settings/org.eclipse.m2e.core.prefs delete mode 100644 hapi-fhir-structures-dstu2/.settings/org.eclipse.wst.common.component delete mode 100644 hapi-fhir-structures-dstu2/.settings/org.eclipse.wst.common.project.facet.core.xml delete mode 100644 hapi-fhir-structures-dstu2/.settings/org.eclipse.wst.validation.prefs delete mode 100644 hapi-fhir-structures-dstu3/.classpath delete mode 100644 hapi-fhir-structures-dstu3/.project delete mode 100644 hapi-fhir-structures-dstu3/.settings/org.eclipse.core.resources.prefs delete mode 100644 hapi-fhir-structures-dstu3/.settings/org.eclipse.jdt.core.prefs delete mode 100644 hapi-fhir-structures-dstu3/.settings/org.eclipse.m2e.core.prefs delete mode 100644 hapi-fhir-structures-hl7org-dstu2/.classpath delete mode 100644 hapi-fhir-structures-hl7org-dstu2/.project delete mode 100644 hapi-fhir-structures-hl7org-dstu2/.settings/org.eclipse.core.resources.prefs delete mode 100644 hapi-fhir-structures-hl7org-dstu2/.settings/org.eclipse.jdt.core.prefs delete mode 100644 hapi-fhir-structures-hl7org-dstu2/.settings/org.eclipse.jdt.ui.prefs delete mode 100644 hapi-fhir-structures-hl7org-dstu2/.settings/org.eclipse.m2e.core.prefs delete mode 100644 hapi-fhir-structures-hl7org-dstu2/.settings/org.eclipse.wst.common.component delete mode 100644 hapi-fhir-structures-hl7org-dstu2/.settings/org.eclipse.wst.common.project.facet.core.xml delete mode 100644 hapi-fhir-structures-hl7org-dstu2/.settings/org.eclipse.wst.validation.prefs delete mode 100644 hapi-fhir-testpage-interceptor/.classpath delete mode 100644 hapi-fhir-testpage-interceptor/.project delete mode 100644 hapi-fhir-testpage-interceptor/.settings/org.eclipse.core.resources.prefs delete mode 100644 hapi-fhir-testpage-interceptor/.settings/org.eclipse.jdt.core.prefs delete mode 100644 hapi-fhir-testpage-interceptor/.settings/org.eclipse.m2e.core.prefs delete mode 100644 hapi-fhir-testpage-overlay/.classpath delete mode 100644 hapi-fhir-testpage-overlay/.project delete mode 100644 hapi-fhir-testpage-overlay/.settings/.jsdtscope delete mode 100644 hapi-fhir-testpage-overlay/.settings/org.eclipse.core.resources.prefs delete mode 100644 hapi-fhir-testpage-overlay/.settings/org.eclipse.jdt.core.prefs delete mode 100644 hapi-fhir-testpage-overlay/.settings/org.eclipse.m2e.core.prefs delete mode 100644 hapi-fhir-testpage-overlay/.settings/org.eclipse.wst.common.component delete mode 100644 hapi-fhir-testpage-overlay/.settings/org.eclipse.wst.common.project.facet.core.xml delete mode 100644 hapi-fhir-testpage-overlay/.settings/org.eclipse.wst.jsdt.core.prefs delete mode 100644 hapi-fhir-testpage-overlay/.settings/org.eclipse.wst.jsdt.ui.superType.container delete mode 100644 hapi-fhir-testpage-overlay/.settings/org.eclipse.wst.jsdt.ui.superType.name delete mode 100644 hapi-fhir-testpage-overlay/.settings/org.eclipse.wst.validation.prefs delete mode 100644 hapi-fhir-tutorial/jpaserver-example-with-custom/.classpath delete mode 100644 hapi-fhir-tutorial/jpaserver-example-with-custom/.project delete mode 100644 hapi-fhir-tutorial/jpaserver-example-with-custom/.settings/org.eclipse.jdt.core.prefs delete mode 100644 hapi-fhir-tutorial/jpaserver-example-with-custom/.settings/org.eclipse.m2e.core.prefs delete mode 100644 hapi-fhir-tutorial/simple-server/.settings/.jsdtscope delete mode 100644 hapi-fhir-tutorial/simple-server/.settings/org.eclipse.core.resources.prefs delete mode 100644 hapi-fhir-tutorial/simple-server/.settings/org.eclipse.jdt.core.prefs delete mode 100644 hapi-fhir-tutorial/simple-server/.settings/org.eclipse.m2e.core.prefs delete mode 100644 hapi-fhir-tutorial/simple-server/.settings/org.eclipse.wst.common.component delete mode 100644 hapi-fhir-tutorial/simple-server/.settings/org.eclipse.wst.common.project.facet.core.xml delete mode 100644 hapi-fhir-tutorial/simple-server/.settings/org.eclipse.wst.jsdt.ui.superType.container delete mode 100644 hapi-fhir-tutorial/simple-server/.settings/org.eclipse.wst.jsdt.ui.superType.name delete mode 100644 hapi-fhir-tutorial/simple-server/.settings/org.eclipse.wst.validation.prefs delete mode 100644 hapi-fhir-tutorial/skeleton-project/.settings/org.eclipse.core.resources.prefs delete mode 100644 hapi-fhir-tutorial/skeleton-project/.settings/org.eclipse.jdt.core.prefs delete mode 100644 hapi-fhir-tutorial/skeleton-project/.settings/org.eclipse.m2e.core.prefs delete mode 100644 hapi-fhir-validation-resources-dstu2.1/.classpath delete mode 100644 hapi-fhir-validation-resources-dstu2.1/.project delete mode 100644 hapi-fhir-validation-resources-dstu2.1/.settings/org.eclipse.core.resources.prefs delete mode 100644 hapi-fhir-validation-resources-dstu2.1/.settings/org.eclipse.m2e.core.prefs delete mode 100644 hapi-fhir-validation-resources-dstu2/.classpath delete mode 100644 hapi-fhir-validation-resources-dstu2/.project delete mode 100644 hapi-fhir-validation-resources-dstu2/.settings/org.eclipse.core.resources.prefs delete mode 100644 hapi-fhir-validation-resources-dstu2/.settings/org.eclipse.jdt.core.prefs delete mode 100644 hapi-fhir-validation-resources-dstu2/.settings/org.eclipse.m2e.core.prefs delete mode 100644 hapi-fhir-validation-resources-dstu2/.settings/org.eclipse.wst.common.component delete mode 100644 hapi-fhir-validation-resources-dstu2/.settings/org.eclipse.wst.common.project.facet.core.xml delete mode 100644 hapi-fhir-validation-resources-dstu3/.classpath delete mode 100644 hapi-fhir-validation-resources-dstu3/.project delete mode 100644 hapi-fhir-validation-resources-dstu3/.settings/org.eclipse.core.resources.prefs delete mode 100644 hapi-fhir-validation-resources-dstu3/.settings/org.eclipse.jdt.core.prefs delete mode 100644 hapi-fhir-validation-resources-dstu3/.settings/org.eclipse.m2e.core.prefs delete mode 100644 hapi-fhir-validation-resources-dstu3/.settings/org.eclipse.wst.common.project.facet.core.xml delete mode 100644 hapi-tinder-plugin/.classpath delete mode 100644 hapi-tinder-plugin/.project delete mode 100644 hapi-tinder-plugin/.settings/org.eclipse.core.resources.prefs delete mode 100644 hapi-tinder-plugin/.settings/org.eclipse.jdt.core.prefs delete mode 100644 hapi-tinder-plugin/.settings/org.eclipse.jdt.ui.prefs delete mode 100644 hapi-tinder-plugin/.settings/org.eclipse.m2e.core.prefs delete mode 100644 hapi-tinder-test/.classpath delete mode 100644 hapi-tinder-test/.project delete mode 100644 hapi-tinder-test/.settings/org.eclipse.core.resources.prefs delete mode 100644 hapi-tinder-test/.settings/org.eclipse.jdt.core.prefs delete mode 100644 hapi-tinder-test/.settings/org.eclipse.m2e.core.prefs delete mode 100644 restful-server-example-test/.classpath delete mode 100644 restful-server-example-test/.project delete mode 100644 restful-server-example-test/.settings/org.eclipse.core.resources.prefs delete mode 100644 restful-server-example-test/.settings/org.eclipse.jdt.core.prefs delete mode 100644 restful-server-example-test/.settings/org.eclipse.m2e.core.prefs delete mode 100644 restful-server-example/.classpath delete mode 100644 restful-server-example/.settings/.jsdtscope delete mode 100644 restful-server-example/.settings/org.eclipse.core.resources.prefs delete mode 100644 restful-server-example/.settings/org.eclipse.jdt.core.prefs delete mode 100644 restful-server-example/.settings/org.eclipse.m2e.core.prefs delete mode 100644 restful-server-example/.settings/org.eclipse.wst.common.component delete mode 100644 restful-server-example/.settings/org.eclipse.wst.common.project.facet.core.xml delete mode 100644 restful-server-example/.settings/org.eclipse.wst.jsdt.ui.superType.container delete mode 100644 restful-server-example/.settings/org.eclipse.wst.jsdt.ui.superType.name delete mode 100644 restful-server-example/.settings/org.eclipse.wst.validation.prefs diff --git a/.classpath b/.classpath deleted file mode 100644 index 8778ddd58a3..00000000000 --- a/.classpath +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/.project b/.project deleted file mode 100644 index e65da4447c0..00000000000 --- a/.project +++ /dev/null @@ -1,28 +0,0 @@ - - - hapi-fhir - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.ui.externaltools.ExternalToolBuilder - full,incremental, - - - LaunchConfigHandle - <project>/.externalToolBuilders/org.eclipse.m2e.core.maven2Builder.launch - - - - - - org.eclipse.m2e.core.maven2Nature - org.eclipse.jdt.core.javanature - - diff --git a/examples/.classpath b/examples/.classpath deleted file mode 100644 index ce99802b301..00000000000 --- a/examples/.classpath +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/examples/.project b/examples/.project deleted file mode 100644 index a0b8364c52b..00000000000 --- a/examples/.project +++ /dev/null @@ -1,23 +0,0 @@ - - - hapi-fhir-base-examples - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.jdt.core.javanature - org.eclipse.m2e.core.maven2Nature - - diff --git a/examples/.settings/org.eclipse.core.resources.prefs b/examples/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index e9441bb123e..00000000000 --- a/examples/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,3 +0,0 @@ -eclipse.preferences.version=1 -encoding//src/main/java=UTF-8 -encoding/=UTF-8 diff --git a/examples/.settings/org.eclipse.jdt.core.prefs b/examples/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 1d5aa99261d..00000000000 --- a/examples/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,376 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled -org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore -org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull -org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault -org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable -org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning -org.eclipse.jdt.core.compiler.problem.autoboxing=ignore -org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning -org.eclipse.jdt.core.compiler.problem.deadCode=warning -org.eclipse.jdt.core.compiler.problem.deprecation=warning -org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled -org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled -org.eclipse.jdt.core.compiler.problem.discouragedReference=warning -org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore -org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore -org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore -org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled -org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore -org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning -org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning -org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled -org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning -org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning -org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore -org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore -org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning -org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore -org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore -org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled -org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled -org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning -org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore -org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning -org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning -org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore -org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning -org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error -org.eclipse.jdt.core.compiler.problem.nullReference=warning -org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error -org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning -org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning -org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore -org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore -org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore -org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore -org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning -org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning -org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore -org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore -org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore -org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore -org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore -org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled -org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning -org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled -org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled -org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled -org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore -org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning -org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled -org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning -org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning -org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore -org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning -org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore -org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore -org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled -org.eclipse.jdt.core.compiler.problem.unusedImport=warning -org.eclipse.jdt.core.compiler.problem.unusedLabel=warning -org.eclipse.jdt.core.compiler.problem.unusedLocal=warning -org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore -org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore -org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled -org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning -org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore -org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning -org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.6 -org.eclipse.jdt.core.formatter.align_type_members_on_columns=false -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_assignment=0 -org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 -org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 -org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 -org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 -org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 -org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80 -org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 -org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16 -org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_after_package=1 -org.eclipse.jdt.core.formatter.blank_lines_before_field=0 -org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0 -org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 -org.eclipse.jdt.core.formatter.blank_lines_before_method=1 -org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 -org.eclipse.jdt.core.formatter.blank_lines_before_package=0 -org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 -org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 -org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false -org.eclipse.jdt.core.formatter.comment.format_block_comments=true -org.eclipse.jdt.core.formatter.comment.format_header=false -org.eclipse.jdt.core.formatter.comment.format_html=true -org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true -org.eclipse.jdt.core.formatter.comment.format_line_comments=true -org.eclipse.jdt.core.formatter.comment.format_source_code=true -org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true -org.eclipse.jdt.core.formatter.comment.indent_root_tags=true -org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert -org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert -org.eclipse.jdt.core.formatter.comment.line_length=80 -org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true -org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true -org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false -org.eclipse.jdt.core.formatter.compact_else_if=true -org.eclipse.jdt.core.formatter.continuation_indentation=2 -org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 -org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off -org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on -org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false -org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true -org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_empty_lines=false -org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true -org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false -org.eclipse.jdt.core.formatter.indentation.size=3 -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert -org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert -org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert -org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.join_lines_in_comments=true -org.eclipse.jdt.core.formatter.join_wrapped_lines=true -org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false -org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false -org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false -org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false -org.eclipse.jdt.core.formatter.lineSplit=200 -org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false -org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false -org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 -org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1 -org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true -org.eclipse.jdt.core.formatter.tabulation.char=space -org.eclipse.jdt.core.formatter.tabulation.size=3 -org.eclipse.jdt.core.formatter.use_on_off_tags=false -org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=true -org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true -org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true -org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true diff --git a/examples/.settings/org.eclipse.jdt.ui.prefs b/examples/.settings/org.eclipse.jdt.ui.prefs deleted file mode 100644 index 2c0c25e8a13..00000000000 --- a/examples/.settings/org.eclipse.jdt.ui.prefs +++ /dev/null @@ -1,3 +0,0 @@ -eclipse.preferences.version=1 -formatter_profile=_hapi-examples -formatter_settings_version=12 diff --git a/examples/.settings/org.eclipse.m2e.core.prefs b/examples/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f1cb2..00000000000 --- a/examples/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/hapi-deployable-pom/.project b/hapi-deployable-pom/.project deleted file mode 100644 index 4b06e2a7715..00000000000 --- a/hapi-deployable-pom/.project +++ /dev/null @@ -1,17 +0,0 @@ - - - hapi-deployable-pom - - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.m2e.core.maven2Nature - - diff --git a/hapi-deployable-pom/.settings/org.eclipse.core.resources.prefs b/hapi-deployable-pom/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c0203a..00000000000 --- a/hapi-deployable-pom/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/hapi-deployable-pom/.settings/org.eclipse.m2e.core.prefs b/hapi-deployable-pom/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f1cb2..00000000000 --- a/hapi-deployable-pom/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/hapi-fhir-android/.classpath b/hapi-fhir-android/.classpath deleted file mode 100644 index 0c4c687478f..00000000000 --- a/hapi-fhir-android/.classpath +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/hapi-fhir-android/.project b/hapi-fhir-android/.project deleted file mode 100644 index 7b7eb9cf3af..00000000000 --- a/hapi-fhir-android/.project +++ /dev/null @@ -1,23 +0,0 @@ - - - hapi-fhir-android - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.jdt.core.javanature - org.eclipse.m2e.core.maven2Nature - - diff --git a/hapi-fhir-android/.settings/org.eclipse.core.resources.prefs b/hapi-fhir-android/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c0203a..00000000000 --- a/hapi-fhir-android/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/hapi-fhir-android/.settings/org.eclipse.jdt.core.prefs b/hapi-fhir-android/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 60105c1b951..00000000000 --- a/hapi-fhir-android/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,5 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.6 diff --git a/hapi-fhir-android/.settings/org.eclipse.m2e.core.prefs b/hapi-fhir-android/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f1cb2..00000000000 --- a/hapi-fhir-android/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/hapi-fhir-base-example-embedded-ws/.project b/hapi-fhir-base-example-embedded-ws/.project deleted file mode 100644 index dfe12454643..00000000000 --- a/hapi-fhir-base-example-embedded-ws/.project +++ /dev/null @@ -1,17 +0,0 @@ - - - hapi-fhir-base-example-embedded-ws - - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.m2e.core.maven2Nature - - diff --git a/hapi-fhir-base-example-embedded-ws/.settings/org.eclipse.core.resources.prefs b/hapi-fhir-base-example-embedded-ws/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c0203a..00000000000 --- a/hapi-fhir-base-example-embedded-ws/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/hapi-fhir-base-example-embedded-ws/.settings/org.eclipse.m2e.core.prefs b/hapi-fhir-base-example-embedded-ws/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f1cb2..00000000000 --- a/hapi-fhir-base-example-embedded-ws/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/hapi-fhir-base-test-mindeps-client/.classpath b/hapi-fhir-base-test-mindeps-client/.classpath deleted file mode 100644 index d1d9fe67b77..00000000000 --- a/hapi-fhir-base-test-mindeps-client/.classpath +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/hapi-fhir-base-test-mindeps-client/.project b/hapi-fhir-base-test-mindeps-client/.project deleted file mode 100644 index 9cf5c48e336..00000000000 --- a/hapi-fhir-base-test-mindeps-client/.project +++ /dev/null @@ -1,23 +0,0 @@ - - - hapi-fhir-base-testmindeps-client - - - - - - org.eclipse.wst.common.project.facet.core.builder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.m2e.core.maven2Nature - org.eclipse.wst.common.project.facet.core.nature - - diff --git a/hapi-fhir-base-test-mindeps-client/.settings/org.eclipse.core.resources.prefs b/hapi-fhir-base-test-mindeps-client/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c0203a..00000000000 --- a/hapi-fhir-base-test-mindeps-client/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/hapi-fhir-base-test-mindeps-client/.settings/org.eclipse.jdt.core.prefs b/hapi-fhir-base-test-mindeps-client/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index f42de363afa..00000000000 --- a/hapi-fhir-base-test-mindeps-client/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,7 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 -org.eclipse.jdt.core.compiler.compliance=1.7 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.7 diff --git a/hapi-fhir-base-test-mindeps-client/.settings/org.eclipse.m2e.core.prefs b/hapi-fhir-base-test-mindeps-client/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f1cb2..00000000000 --- a/hapi-fhir-base-test-mindeps-client/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/hapi-fhir-base-test-mindeps-client/.settings/org.eclipse.wst.common.project.facet.core.xml b/hapi-fhir-base-test-mindeps-client/.settings/org.eclipse.wst.common.project.facet.core.xml deleted file mode 100644 index bc0009a4558..00000000000 --- a/hapi-fhir-base-test-mindeps-client/.settings/org.eclipse.wst.common.project.facet.core.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/hapi-fhir-base-test-mindeps-server/.classpath b/hapi-fhir-base-test-mindeps-server/.classpath deleted file mode 100644 index f8457d21055..00000000000 --- a/hapi-fhir-base-test-mindeps-server/.classpath +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/hapi-fhir-base-test-mindeps-server/.project b/hapi-fhir-base-test-mindeps-server/.project deleted file mode 100644 index 96459364cdd..00000000000 --- a/hapi-fhir-base-test-mindeps-server/.project +++ /dev/null @@ -1,29 +0,0 @@ - - - hapi-fhir-base-testmindeps-server - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.wst.common.project.facet.core.builder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.m2e.core.maven2Nature - org.eclipse.wst.common.project.facet.core.nature - org.eclipse.jdt.core.javanature - - diff --git a/hapi-fhir-base-test-mindeps-server/.settings/org.eclipse.core.resources.prefs b/hapi-fhir-base-test-mindeps-server/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c0203a..00000000000 --- a/hapi-fhir-base-test-mindeps-server/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/hapi-fhir-base-test-mindeps-server/.settings/org.eclipse.jdt.core.prefs b/hapi-fhir-base-test-mindeps-server/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index f42de363afa..00000000000 --- a/hapi-fhir-base-test-mindeps-server/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,7 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 -org.eclipse.jdt.core.compiler.compliance=1.7 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.7 diff --git a/hapi-fhir-base-test-mindeps-server/.settings/org.eclipse.m2e.core.prefs b/hapi-fhir-base-test-mindeps-server/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f1cb2..00000000000 --- a/hapi-fhir-base-test-mindeps-server/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/hapi-fhir-base-test-mindeps-server/.settings/org.eclipse.wst.common.project.facet.core.xml b/hapi-fhir-base-test-mindeps-server/.settings/org.eclipse.wst.common.project.facet.core.xml deleted file mode 100644 index bc0009a4558..00000000000 --- a/hapi-fhir-base-test-mindeps-server/.settings/org.eclipse.wst.common.project.facet.core.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/hapi-fhir-base/.classpath b/hapi-fhir-base/.classpath deleted file mode 100644 index d0b602b45e1..00000000000 --- a/hapi-fhir-base/.classpath +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/hapi-fhir-base/.project b/hapi-fhir-base/.project deleted file mode 100644 index 7afe06363c3..00000000000 --- a/hapi-fhir-base/.project +++ /dev/null @@ -1,31 +0,0 @@ - - - hapi-fhir-base - NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse. - - - - - org.eclipse.wst.common.project.facet.core.builder - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.jem.workbench.JavaEMFNature - org.eclipse.wst.common.modulecore.ModuleCoreNature - org.eclipse.m2e.core.maven2Nature - org.eclipse.jdt.core.javanature - org.eclipse.wst.common.project.facet.core.nature - - diff --git a/hapi-fhir-base/.settings/org.eclipse.core.resources.prefs b/hapi-fhir-base/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 29abf999564..00000000000 --- a/hapi-fhir-base/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,6 +0,0 @@ -eclipse.preferences.version=1 -encoding//src/main/java=UTF-8 -encoding//src/main/resources=UTF-8 -encoding//src/test/java=UTF-8 -encoding//src/test/resources=UTF-8 -encoding/=UTF-8 diff --git a/hapi-fhir-base/.settings/org.eclipse.jdt.core.prefs b/hapi-fhir-base/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 671be987f05..00000000000 --- a/hapi-fhir-base/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,412 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled -org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore -org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull -org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault -org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable -org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.doc.comment.support=enabled -org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.autoboxing=ignore -org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning -org.eclipse.jdt.core.compiler.problem.deadCode=warning -org.eclipse.jdt.core.compiler.problem.deprecation=warning -org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled -org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled -org.eclipse.jdt.core.compiler.problem.discouragedReference=warning -org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore -org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning -org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled -org.eclipse.jdt.core.compiler.problem.fieldHiding=warning -org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning -org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning -org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled -org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning -org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning -org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore -org.eclipse.jdt.core.compiler.problem.invalidJavadoc=error -org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public -org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning -org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning -org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore -org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore -org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled -org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning -org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore -org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled -org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public -org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag -org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore -org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=disabled -org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled -org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled -org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning -org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore -org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning -org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning -org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore -org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning -org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error -org.eclipse.jdt.core.compiler.problem.nullReference=warning -org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error -org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning -org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning -org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore -org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore -org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore -org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore -org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning -org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning -org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore -org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore -org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore -org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore -org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore -org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled -org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning -org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled -org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled -org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled -org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore -org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning -org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled -org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning -org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning -org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore -org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning -org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore -org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning -org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled -org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore -org.eclipse.jdt.core.compiler.problem.unusedImport=warning -org.eclipse.jdt.core.compiler.problem.unusedLabel=warning -org.eclipse.jdt.core.compiler.problem.unusedLocal=warning -org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=warning -org.eclipse.jdt.core.compiler.problem.unusedParameter=warning -org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled -org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning -org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning -org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning -org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.6 -org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 -org.eclipse.jdt.core.formatter.align_type_members_on_columns=false -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_assignment=0 -org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 -org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 -org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 -org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 -org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header=0 -org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 -org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 -org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references=0 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80 -org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 -org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_type_arguments=0 -org.eclipse.jdt.core.formatter.alignment_for_type_parameters=0 -org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16 -org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_after_package=1 -org.eclipse.jdt.core.formatter.blank_lines_before_field=0 -org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0 -org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 -org.eclipse.jdt.core.formatter.blank_lines_before_method=1 -org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 -org.eclipse.jdt.core.formatter.blank_lines_before_package=0 -org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 -org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 -org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false -org.eclipse.jdt.core.formatter.comment.format_block_comments=true -org.eclipse.jdt.core.formatter.comment.format_header=true -org.eclipse.jdt.core.formatter.comment.format_html=true -org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true -org.eclipse.jdt.core.formatter.comment.format_line_comments=true -org.eclipse.jdt.core.formatter.comment.format_source_code=true -org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true -org.eclipse.jdt.core.formatter.comment.indent_root_tags=true -org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert -org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert -org.eclipse.jdt.core.formatter.comment.line_length=200 -org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true -org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true -org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false -org.eclipse.jdt.core.formatter.compact_else_if=true -org.eclipse.jdt.core.formatter.continuation_indentation=2 -org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 -org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off -org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on -org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false -org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true -org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_empty_lines=false -org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true -org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false -org.eclipse.jdt.core.formatter.indentation.size=3 -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert -org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert -org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert -org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.join_lines_in_comments=false -org.eclipse.jdt.core.formatter.join_wrapped_lines=false -org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false -org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false -org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false -org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false -org.eclipse.jdt.core.formatter.lineSplit=200 -org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false -org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false -org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 -org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1 -org.eclipse.jdt.core.formatter.parentheses_positions_in_annotation=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_catch_clause=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_enum_constant_declaration=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_for_statment=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_if_while_statement=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_lambda_declaration=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_method_delcaration=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_method_invocation=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause=common_lines -org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true -org.eclipse.jdt.core.formatter.tabulation.char=tab -org.eclipse.jdt.core.formatter.tabulation.size=3 -org.eclipse.jdt.core.formatter.use_on_off_tags=true -org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false -org.eclipse.jdt.core.formatter.wrap_before_assignment_operator=false -org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true -org.eclipse.jdt.core.formatter.wrap_before_conditional_operator=true -org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true -org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true diff --git a/hapi-fhir-base/.settings/org.eclipse.jdt.ui.prefs b/hapi-fhir-base/.settings/org.eclipse.jdt.ui.prefs deleted file mode 100644 index 5382e703e79..00000000000 --- a/hapi-fhir-base/.settings/org.eclipse.jdt.ui.prefs +++ /dev/null @@ -1,3 +0,0 @@ -eclipse.preferences.version=1 -formatter_profile=_James -formatter_settings_version=12 diff --git a/hapi-fhir-base/.settings/org.eclipse.m2e.core.prefs b/hapi-fhir-base/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f1cb2..00000000000 --- a/hapi-fhir-base/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/hapi-fhir-base/.settings/org.eclipse.wst.common.component b/hapi-fhir-base/.settings/org.eclipse.wst.common.component deleted file mode 100644 index eaef2e5526f..00000000000 --- a/hapi-fhir-base/.settings/org.eclipse.wst.common.component +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/hapi-fhir-base/.settings/org.eclipse.wst.common.project.facet.core.xml b/hapi-fhir-base/.settings/org.eclipse.wst.common.project.facet.core.xml deleted file mode 100644 index 5c9bd7532ab..00000000000 --- a/hapi-fhir-base/.settings/org.eclipse.wst.common.project.facet.core.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/hapi-fhir-base/.settings/org.eclipse.wst.validation.prefs b/hapi-fhir-base/.settings/org.eclipse.wst.validation.prefs deleted file mode 100644 index 04cad8cb752..00000000000 --- a/hapi-fhir-base/.settings/org.eclipse.wst.validation.prefs +++ /dev/null @@ -1,2 +0,0 @@ -disabled=06target -eclipse.preferences.version=1 diff --git a/hapi-fhir-cli/.classpath b/hapi-fhir-cli/.classpath deleted file mode 100644 index 59a866bb4a2..00000000000 --- a/hapi-fhir-cli/.classpath +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/hapi-fhir-cli/.project b/hapi-fhir-cli/.project deleted file mode 100644 index 477112cbcd2..00000000000 --- a/hapi-fhir-cli/.project +++ /dev/null @@ -1,34 +0,0 @@ - - - hapi-fhir-cli - NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse. - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.wst.common.project.facet.core.builder - - - - - org.eclipse.wst.validation.validationbuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.m2e.core.maven2Nature - org.eclipse.wst.common.project.facet.core.nature - org.eclipse.jdt.core.javanature - - diff --git a/hapi-fhir-cli/.settings/org.eclipse.core.resources.prefs b/hapi-fhir-cli/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c0203a..00000000000 --- a/hapi-fhir-cli/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/hapi-fhir-cli/.settings/org.eclipse.jdt.core.prefs b/hapi-fhir-cli/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index c33a86fe558..00000000000 --- a/hapi-fhir-cli/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,309 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.6 -org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 -org.eclipse.jdt.core.formatter.align_type_members_on_columns=false -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_assignment=0 -org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 -org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 -org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 -org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 -org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header=0 -org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 -org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 -org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references=0 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80 -org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 -org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_type_arguments=0 -org.eclipse.jdt.core.formatter.alignment_for_type_parameters=0 -org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16 -org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_after_package=1 -org.eclipse.jdt.core.formatter.blank_lines_before_field=0 -org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0 -org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 -org.eclipse.jdt.core.formatter.blank_lines_before_method=1 -org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 -org.eclipse.jdt.core.formatter.blank_lines_before_package=0 -org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 -org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 -org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false -org.eclipse.jdt.core.formatter.comment.format_block_comments=true -org.eclipse.jdt.core.formatter.comment.format_header=true -org.eclipse.jdt.core.formatter.comment.format_html=true -org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true -org.eclipse.jdt.core.formatter.comment.format_line_comments=true -org.eclipse.jdt.core.formatter.comment.format_source_code=true -org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true -org.eclipse.jdt.core.formatter.comment.indent_root_tags=true -org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert -org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert -org.eclipse.jdt.core.formatter.comment.line_length=200 -org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true -org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true -org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false -org.eclipse.jdt.core.formatter.compact_else_if=true -org.eclipse.jdt.core.formatter.continuation_indentation=2 -org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 -org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off -org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on -org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false -org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true -org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_empty_lines=false -org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true -org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false -org.eclipse.jdt.core.formatter.indentation.size=3 -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert -org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert -org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert -org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.join_lines_in_comments=false -org.eclipse.jdt.core.formatter.join_wrapped_lines=false -org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false -org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false -org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false -org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false -org.eclipse.jdt.core.formatter.lineSplit=250 -org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false -org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false -org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 -org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1 -org.eclipse.jdt.core.formatter.parentheses_positions_in_annotation=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_catch_clause=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_enum_constant_declaration=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_for_statment=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_if_while_statement=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_lambda_declaration=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_method_delcaration=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_method_invocation=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause=common_lines -org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true -org.eclipse.jdt.core.formatter.tabulation.char=tab -org.eclipse.jdt.core.formatter.tabulation.size=3 -org.eclipse.jdt.core.formatter.use_on_off_tags=true -org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false -org.eclipse.jdt.core.formatter.wrap_before_assignment_operator=false -org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true -org.eclipse.jdt.core.formatter.wrap_before_conditional_operator=true -org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true -org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true diff --git a/hapi-fhir-cli/.settings/org.eclipse.jdt.ui.prefs b/hapi-fhir-cli/.settings/org.eclipse.jdt.ui.prefs deleted file mode 100644 index 5382e703e79..00000000000 --- a/hapi-fhir-cli/.settings/org.eclipse.jdt.ui.prefs +++ /dev/null @@ -1,3 +0,0 @@ -eclipse.preferences.version=1 -formatter_profile=_James -formatter_settings_version=12 diff --git a/hapi-fhir-cli/.settings/org.eclipse.m2e.core.prefs b/hapi-fhir-cli/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f1cb2..00000000000 --- a/hapi-fhir-cli/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/hapi-fhir-cli/.settings/org.eclipse.wst.common.project.facet.core.xml b/hapi-fhir-cli/.settings/org.eclipse.wst.common.project.facet.core.xml deleted file mode 100644 index bcfc3250338..00000000000 --- a/hapi-fhir-cli/.settings/org.eclipse.wst.common.project.facet.core.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/hapi-fhir-cli/.settings/org.eclipse.wst.validation.prefs b/hapi-fhir-cli/.settings/org.eclipse.wst.validation.prefs deleted file mode 100644 index 04cad8cb752..00000000000 --- a/hapi-fhir-cli/.settings/org.eclipse.wst.validation.prefs +++ /dev/null @@ -1,2 +0,0 @@ -disabled=06target -eclipse.preferences.version=1 diff --git a/hapi-fhir-cli/hapi-fhir-cli-app/.classpath b/hapi-fhir-cli/hapi-fhir-cli-app/.classpath deleted file mode 100644 index 3e3200180cf..00000000000 --- a/hapi-fhir-cli/hapi-fhir-cli-app/.classpath +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/hapi-fhir-cli/hapi-fhir-cli-app/.project b/hapi-fhir-cli/hapi-fhir-cli-app/.project deleted file mode 100644 index b149474ada9..00000000000 --- a/hapi-fhir-cli/hapi-fhir-cli-app/.project +++ /dev/null @@ -1,29 +0,0 @@ - - - hapi-fhir-cli-app - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.wst.common.project.facet.core.builder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.m2e.core.maven2Nature - org.eclipse.wst.common.project.facet.core.nature - org.eclipse.jdt.core.javanature - - diff --git a/hapi-fhir-cli/hapi-fhir-cli-app/.settings/org.eclipse.core.resources.prefs b/hapi-fhir-cli/hapi-fhir-cli-app/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c0203a..00000000000 --- a/hapi-fhir-cli/hapi-fhir-cli-app/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/hapi-fhir-cli/hapi-fhir-cli-app/.settings/org.eclipse.jdt.core.prefs b/hapi-fhir-cli/hapi-fhir-cli-app/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index f42de363afa..00000000000 --- a/hapi-fhir-cli/hapi-fhir-cli-app/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,7 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 -org.eclipse.jdt.core.compiler.compliance=1.7 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.7 diff --git a/hapi-fhir-cli/hapi-fhir-cli-app/.settings/org.eclipse.m2e.core.prefs b/hapi-fhir-cli/hapi-fhir-cli-app/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f1cb2..00000000000 --- a/hapi-fhir-cli/hapi-fhir-cli-app/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/hapi-fhir-cli/hapi-fhir-cli-app/.settings/org.eclipse.wst.common.project.facet.core.xml b/hapi-fhir-cli/hapi-fhir-cli-app/.settings/org.eclipse.wst.common.project.facet.core.xml deleted file mode 100644 index bc0009a4558..00000000000 --- a/hapi-fhir-cli/hapi-fhir-cli-app/.settings/org.eclipse.wst.common.project.facet.core.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/hapi-fhir-cli/hapi-fhir-cli-jpaserver/.project b/hapi-fhir-cli/hapi-fhir-cli-jpaserver/.project deleted file mode 100644 index a977994279a..00000000000 --- a/hapi-fhir-cli/hapi-fhir-cli-jpaserver/.project +++ /dev/null @@ -1,29 +0,0 @@ - - - hapi-fhir-cli-jpaserver - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.wst.common.project.facet.core.builder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.m2e.core.maven2Nature - org.eclipse.wst.common.project.facet.core.nature - org.eclipse.jdt.core.javanature - - diff --git a/hapi-fhir-client-okhttp/.classpath b/hapi-fhir-client-okhttp/.classpath deleted file mode 100644 index a5f3e22af20..00000000000 --- a/hapi-fhir-client-okhttp/.classpath +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/hapi-fhir-client-okhttp/.project b/hapi-fhir-client-okhttp/.project deleted file mode 100644 index 43baea7b073..00000000000 --- a/hapi-fhir-client-okhttp/.project +++ /dev/null @@ -1,31 +0,0 @@ - - - hapi-fhir-client-okhttp - NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse. - - - - - org.eclipse.wst.common.project.facet.core.builder - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.jem.workbench.JavaEMFNature - org.eclipse.wst.common.modulecore.ModuleCoreNature - org.eclipse.m2e.core.maven2Nature - org.eclipse.jdt.core.javanature - org.eclipse.wst.common.project.facet.core.nature - - diff --git a/hapi-fhir-client-okhttp/.settings/org.eclipse.core.resources.prefs b/hapi-fhir-client-okhttp/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c0203a..00000000000 --- a/hapi-fhir-client-okhttp/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/hapi-fhir-client-okhttp/.settings/org.eclipse.m2e.core.prefs b/hapi-fhir-client-okhttp/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f1cb2..00000000000 --- a/hapi-fhir-client-okhttp/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/hapi-fhir-dist/.project b/hapi-fhir-dist/.project deleted file mode 100644 index 9caf49ad67a..00000000000 --- a/hapi-fhir-dist/.project +++ /dev/null @@ -1,17 +0,0 @@ - - - hapi-fhir-dist - - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.m2e.core.maven2Nature - - diff --git a/hapi-fhir-dist/.settings/org.eclipse.core.resources.prefs b/hapi-fhir-dist/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c0203a..00000000000 --- a/hapi-fhir-dist/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/hapi-fhir-dist/.settings/org.eclipse.m2e.core.prefs b/hapi-fhir-dist/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f1cb2..00000000000 --- a/hapi-fhir-dist/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/hapi-fhir-examples-uploader/.classpath b/hapi-fhir-examples-uploader/.classpath deleted file mode 100644 index 575513f8d94..00000000000 --- a/hapi-fhir-examples-uploader/.classpath +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/hapi-fhir-examples-uploader/.project b/hapi-fhir-examples-uploader/.project deleted file mode 100644 index 0e84f507392..00000000000 --- a/hapi-fhir-examples-uploader/.project +++ /dev/null @@ -1,36 +0,0 @@ - - - hapi-fhir-examples-uploader - NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse. - - - - - org.eclipse.wst.common.project.facet.core.builder - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.wst.validation.validationbuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.jem.workbench.JavaEMFNature - org.eclipse.wst.common.modulecore.ModuleCoreNature - org.eclipse.m2e.core.maven2Nature - org.eclipse.jdt.core.javanature - org.eclipse.wst.common.project.facet.core.nature - - diff --git a/hapi-fhir-examples-uploader/.settings/org.eclipse.core.resources.prefs b/hapi-fhir-examples-uploader/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c0203a..00000000000 --- a/hapi-fhir-examples-uploader/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/hapi-fhir-examples-uploader/.settings/org.eclipse.jdt.core.prefs b/hapi-fhir-examples-uploader/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index f42de363afa..00000000000 --- a/hapi-fhir-examples-uploader/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,7 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 -org.eclipse.jdt.core.compiler.compliance=1.7 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.7 diff --git a/hapi-fhir-examples-uploader/.settings/org.eclipse.m2e.core.prefs b/hapi-fhir-examples-uploader/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f1cb2..00000000000 --- a/hapi-fhir-examples-uploader/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/hapi-fhir-examples-uploader/.settings/org.eclipse.wst.common.project.facet.core.xml b/hapi-fhir-examples-uploader/.settings/org.eclipse.wst.common.project.facet.core.xml deleted file mode 100644 index bc0009a4558..00000000000 --- a/hapi-fhir-examples-uploader/.settings/org.eclipse.wst.common.project.facet.core.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/hapi-fhir-fhirpath/.classpath b/hapi-fhir-fhirpath/.classpath deleted file mode 100644 index f62d54b7299..00000000000 --- a/hapi-fhir-fhirpath/.classpath +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/hapi-fhir-fhirpath/.project b/hapi-fhir-fhirpath/.project deleted file mode 100644 index c4ab918a5d8..00000000000 --- a/hapi-fhir-fhirpath/.project +++ /dev/null @@ -1,36 +0,0 @@ - - - hapi-fhir-fhirpath - - - - - - org.eclipse.wst.common.project.facet.core.builder - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.wst.validation.validationbuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.jem.workbench.JavaEMFNature - org.eclipse.wst.common.modulecore.ModuleCoreNature - org.eclipse.jdt.core.javanature - org.eclipse.m2e.core.maven2Nature - org.eclipse.wst.common.project.facet.core.nature - - diff --git a/hapi-fhir-fhirpath/.settings/org.eclipse.core.resources.prefs b/hapi-fhir-fhirpath/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c0203a..00000000000 --- a/hapi-fhir-fhirpath/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/hapi-fhir-fhirpath/.settings/org.eclipse.jdt.core.prefs b/hapi-fhir-fhirpath/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index f42de363afa..00000000000 --- a/hapi-fhir-fhirpath/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,7 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 -org.eclipse.jdt.core.compiler.compliance=1.7 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.7 diff --git a/hapi-fhir-fhirpath/.settings/org.eclipse.m2e.core.prefs b/hapi-fhir-fhirpath/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f1cb2..00000000000 --- a/hapi-fhir-fhirpath/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/hapi-fhir-fhirpath/.settings/org.eclipse.wst.common.project.facet.core.xml b/hapi-fhir-fhirpath/.settings/org.eclipse.wst.common.project.facet.core.xml deleted file mode 100644 index bc0009a4558..00000000000 --- a/hapi-fhir-fhirpath/.settings/org.eclipse.wst.common.project.facet.core.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/hapi-fhir-jacoco/.project b/hapi-fhir-jacoco/.project deleted file mode 100644 index cd50b7a2591..00000000000 --- a/hapi-fhir-jacoco/.project +++ /dev/null @@ -1,17 +0,0 @@ - - - hapi-fhir-jacoco - - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.m2e.core.maven2Nature - - diff --git a/hapi-fhir-jacoco/.settings/org.eclipse.core.resources.prefs b/hapi-fhir-jacoco/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c0203a..00000000000 --- a/hapi-fhir-jacoco/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/hapi-fhir-jacoco/.settings/org.eclipse.m2e.core.prefs b/hapi-fhir-jacoco/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f1cb2..00000000000 --- a/hapi-fhir-jacoco/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/hapi-fhir-jaxrsserver-base/.classpath b/hapi-fhir-jaxrsserver-base/.classpath deleted file mode 100644 index 1f90b7b1373..00000000000 --- a/hapi-fhir-jaxrsserver-base/.classpath +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/hapi-fhir-jaxrsserver-base/.project b/hapi-fhir-jaxrsserver-base/.project deleted file mode 100644 index 6f1154c4ab3..00000000000 --- a/hapi-fhir-jaxrsserver-base/.project +++ /dev/null @@ -1,31 +0,0 @@ - - - hapi-fhir-jaxrsserver-base - NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse. - - - - - org.eclipse.wst.common.project.facet.core.builder - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.jem.workbench.JavaEMFNature - org.eclipse.wst.common.modulecore.ModuleCoreNature - org.eclipse.m2e.core.maven2Nature - org.eclipse.jdt.core.javanature - org.eclipse.wst.common.project.facet.core.nature - - diff --git a/hapi-fhir-jaxrsserver-base/.settings/org.eclipse.core.resources.prefs b/hapi-fhir-jaxrsserver-base/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c0203a..00000000000 --- a/hapi-fhir-jaxrsserver-base/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/hapi-fhir-jaxrsserver-base/.settings/org.eclipse.m2e.core.prefs b/hapi-fhir-jaxrsserver-base/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f1cb2..00000000000 --- a/hapi-fhir-jaxrsserver-base/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/hapi-fhir-jaxrsserver-example/.classpath b/hapi-fhir-jaxrsserver-example/.classpath deleted file mode 100644 index 1f90b7b1373..00000000000 --- a/hapi-fhir-jaxrsserver-example/.classpath +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/hapi-fhir-jaxrsserver-example/.project b/hapi-fhir-jaxrsserver-example/.project deleted file mode 100644 index dd69a10a8c9..00000000000 --- a/hapi-fhir-jaxrsserver-example/.project +++ /dev/null @@ -1,31 +0,0 @@ - - - hapi-fhir-jaxrsserver-example - NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse. - - - - - org.eclipse.wst.common.project.facet.core.builder - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.jem.workbench.JavaEMFNature - org.eclipse.wst.common.modulecore.ModuleCoreNature - org.eclipse.m2e.core.maven2Nature - org.eclipse.jdt.core.javanature - org.eclipse.wst.common.project.facet.core.nature - - diff --git a/hapi-fhir-jaxrsserver-example/.settings/org.eclipse.core.resources.prefs b/hapi-fhir-jaxrsserver-example/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c0203a..00000000000 --- a/hapi-fhir-jaxrsserver-example/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/hapi-fhir-jaxrsserver-example/.settings/org.eclipse.m2e.core.prefs b/hapi-fhir-jaxrsserver-example/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f1cb2..00000000000 --- a/hapi-fhir-jaxrsserver-example/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/hapi-fhir-jpaserver-base/.classpath b/hapi-fhir-jpaserver-base/.classpath deleted file mode 100644 index 5bd66fbcc59..00000000000 --- a/hapi-fhir-jpaserver-base/.classpath +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/hapi-fhir-jpaserver-base/.project b/hapi-fhir-jpaserver-base/.project deleted file mode 100644 index d75b8f25423..00000000000 --- a/hapi-fhir-jpaserver-base/.project +++ /dev/null @@ -1,32 +0,0 @@ - - - hapi-fhir-jpaserver-base - NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse. - - hapi-fhir-base - - - - org.eclipse.wst.common.project.facet.core.builder - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.jem.workbench.JavaEMFNature - org.eclipse.wst.common.modulecore.ModuleCoreNature - org.eclipse.m2e.core.maven2Nature - org.eclipse.jdt.core.javanature - org.eclipse.wst.common.project.facet.core.nature - - diff --git a/hapi-fhir-jpaserver-base/.settings/org.eclipse.core.resources.prefs b/hapi-fhir-jpaserver-base/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 29abf999564..00000000000 --- a/hapi-fhir-jpaserver-base/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,6 +0,0 @@ -eclipse.preferences.version=1 -encoding//src/main/java=UTF-8 -encoding//src/main/resources=UTF-8 -encoding//src/test/java=UTF-8 -encoding//src/test/resources=UTF-8 -encoding/=UTF-8 diff --git a/hapi-fhir-jpaserver-base/.settings/org.eclipse.core.runtime.prefs b/hapi-fhir-jpaserver-base/.settings/org.eclipse.core.runtime.prefs deleted file mode 100644 index 5a0ad22d2a7..00000000000 --- a/hapi-fhir-jpaserver-base/.settings/org.eclipse.core.runtime.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -line.separator=\n diff --git a/hapi-fhir-jpaserver-base/.settings/org.eclipse.jdt.core.prefs b/hapi-fhir-jpaserver-base/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 8028fda058d..00000000000 --- a/hapi-fhir-jpaserver-base/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,101 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled -org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore -org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull -org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault -org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable -org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.autoboxing=ignore -org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning -org.eclipse.jdt.core.compiler.problem.deadCode=warning -org.eclipse.jdt.core.compiler.problem.deprecation=warning -org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled -org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled -org.eclipse.jdt.core.compiler.problem.discouragedReference=warning -org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore -org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore -org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled -org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore -org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning -org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning -org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled -org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning -org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning -org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore -org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore -org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning -org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore -org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore -org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled -org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled -org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning -org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore -org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning -org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning -org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore -org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning -org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error -org.eclipse.jdt.core.compiler.problem.nullReference=warning -org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error -org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning -org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning -org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore -org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore -org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore -org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore -org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning -org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning -org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore -org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore -org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore -org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore -org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore -org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled -org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning -org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled -org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled -org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled -org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore -org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning -org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled -org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning -org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning -org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore -org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning -org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore -org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore -org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled -org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore -org.eclipse.jdt.core.compiler.problem.unusedImport=warning -org.eclipse.jdt.core.compiler.problem.unusedLabel=warning -org.eclipse.jdt.core.compiler.problem.unusedLocal=warning -org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore -org.eclipse.jdt.core.compiler.problem.unusedParameter=warning -org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled -org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning -org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore -org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning -org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.6 diff --git a/hapi-fhir-jpaserver-base/.settings/org.eclipse.m2e.core.prefs b/hapi-fhir-jpaserver-base/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f1cb2..00000000000 --- a/hapi-fhir-jpaserver-base/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/hapi-fhir-jpaserver-base/.settings/org.eclipse.wst.common.component b/hapi-fhir-jpaserver-base/.settings/org.eclipse.wst.common.component deleted file mode 100644 index 2b85b7b09b0..00000000000 --- a/hapi-fhir-jpaserver-base/.settings/org.eclipse.wst.common.component +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/hapi-fhir-jpaserver-base/.settings/org.eclipse.wst.common.project.facet.core.xml b/hapi-fhir-jpaserver-base/.settings/org.eclipse.wst.common.project.facet.core.xml deleted file mode 100644 index 5c9bd7532ab..00000000000 --- a/hapi-fhir-jpaserver-base/.settings/org.eclipse.wst.common.project.facet.core.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/hapi-fhir-jpaserver-base/.settings/org.eclipse.wst.validation.prefs b/hapi-fhir-jpaserver-base/.settings/org.eclipse.wst.validation.prefs deleted file mode 100644 index 04cad8cb752..00000000000 --- a/hapi-fhir-jpaserver-base/.settings/org.eclipse.wst.validation.prefs +++ /dev/null @@ -1,2 +0,0 @@ -disabled=06target -eclipse.preferences.version=1 diff --git a/hapi-fhir-jpaserver-example/.classpath b/hapi-fhir-jpaserver-example/.classpath deleted file mode 100644 index 2394f84cc44..00000000000 --- a/hapi-fhir-jpaserver-example/.classpath +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/hapi-fhir-jpaserver-example/.project b/hapi-fhir-jpaserver-example/.project deleted file mode 100644 index 3151455a48d..00000000000 --- a/hapi-fhir-jpaserver-example/.project +++ /dev/null @@ -1,42 +0,0 @@ - - - hapi-fhir-jpaserver-example - - - - - - org.eclipse.wst.jsdt.core.javascriptValidator - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.wst.common.project.facet.core.builder - - - - - org.eclipse.wst.validation.validationbuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.jem.workbench.JavaEMFNature - org.eclipse.wst.common.modulecore.ModuleCoreNature - org.eclipse.jdt.core.javanature - org.eclipse.m2e.core.maven2Nature - org.eclipse.wst.common.project.facet.core.nature - org.eclipse.wst.jsdt.core.jsNature - - diff --git a/hapi-fhir-jpaserver-example/.settings/.jsdtscope b/hapi-fhir-jpaserver-example/.settings/.jsdtscope deleted file mode 100644 index b72a6a47b2e..00000000000 --- a/hapi-fhir-jpaserver-example/.settings/.jsdtscope +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - diff --git a/hapi-fhir-jpaserver-example/.settings/org.eclipse.core.resources.prefs b/hapi-fhir-jpaserver-example/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index abdea9ac032..00000000000 --- a/hapi-fhir-jpaserver-example/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,4 +0,0 @@ -eclipse.preferences.version=1 -encoding//src/main/java=UTF-8 -encoding//src/main/resources=UTF-8 -encoding/=UTF-8 diff --git a/hapi-fhir-jpaserver-example/.settings/org.eclipse.jdt.core.prefs b/hapi-fhir-jpaserver-example/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 69c31cd493c..00000000000 --- a/hapi-fhir-jpaserver-example/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,8 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.6 diff --git a/hapi-fhir-jpaserver-example/.settings/org.eclipse.m2e.core.prefs b/hapi-fhir-jpaserver-example/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f1cb2..00000000000 --- a/hapi-fhir-jpaserver-example/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/hapi-fhir-jpaserver-example/.settings/org.eclipse.wst.common.component b/hapi-fhir-jpaserver-example/.settings/org.eclipse.wst.common.component deleted file mode 100644 index 5505c0715e1..00000000000 --- a/hapi-fhir-jpaserver-example/.settings/org.eclipse.wst.common.component +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - uses - - - uses - - - uses - - - uses - - - uses - - - uses - - - consumes - - - consumes - - - - - diff --git a/hapi-fhir-jpaserver-example/.settings/org.eclipse.wst.common.project.facet.core.xml b/hapi-fhir-jpaserver-example/.settings/org.eclipse.wst.common.project.facet.core.xml deleted file mode 100644 index bcfc3250338..00000000000 --- a/hapi-fhir-jpaserver-example/.settings/org.eclipse.wst.common.project.facet.core.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/hapi-fhir-jpaserver-example/.settings/org.eclipse.wst.jsdt.ui.superType.container b/hapi-fhir-jpaserver-example/.settings/org.eclipse.wst.jsdt.ui.superType.container deleted file mode 100644 index 3bd5d0a4803..00000000000 --- a/hapi-fhir-jpaserver-example/.settings/org.eclipse.wst.jsdt.ui.superType.container +++ /dev/null @@ -1 +0,0 @@ -org.eclipse.wst.jsdt.launching.baseBrowserLibrary \ No newline at end of file diff --git a/hapi-fhir-jpaserver-example/.settings/org.eclipse.wst.jsdt.ui.superType.name b/hapi-fhir-jpaserver-example/.settings/org.eclipse.wst.jsdt.ui.superType.name deleted file mode 100644 index 05bd71b6ec2..00000000000 --- a/hapi-fhir-jpaserver-example/.settings/org.eclipse.wst.jsdt.ui.superType.name +++ /dev/null @@ -1 +0,0 @@ -Window \ No newline at end of file diff --git a/hapi-fhir-jpaserver-example/.settings/org.eclipse.wst.validation.prefs b/hapi-fhir-jpaserver-example/.settings/org.eclipse.wst.validation.prefs deleted file mode 100644 index 04cad8cb752..00000000000 --- a/hapi-fhir-jpaserver-example/.settings/org.eclipse.wst.validation.prefs +++ /dev/null @@ -1,2 +0,0 @@ -disabled=06target -eclipse.preferences.version=1 diff --git a/hapi-fhir-jpaserver-examples/hapi-fhir-jpaserver-example-postgres/.classpath b/hapi-fhir-jpaserver-examples/hapi-fhir-jpaserver-example-postgres/.classpath deleted file mode 100644 index 534b5e52fa5..00000000000 --- a/hapi-fhir-jpaserver-examples/hapi-fhir-jpaserver-example-postgres/.classpath +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/hapi-fhir-jpaserver-examples/hapi-fhir-jpaserver-example-postgres/.gitignore b/hapi-fhir-jpaserver-examples/hapi-fhir-jpaserver-example-postgres/.gitignore deleted file mode 100644 index e52bde55f83..00000000000 --- a/hapi-fhir-jpaserver-examples/hapi-fhir-jpaserver-example-postgres/.gitignore +++ /dev/null @@ -1,128 +0,0 @@ -/target -/jpaserver_derby_files -*.log -ca.uhn.fhir.jpa.entity.ResourceTable/ - -# Created by https://www.gitignore.io - -### Java ### -*.class - -# Mobile Tools for Java (J2ME) -.mtj.tmp/ - -# Package Files # -*.jar -*.war -*.ear - -# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml -hs_err_pid* - - -### Maven ### -target/ -pom.xml.tag -pom.xml.releaseBackup -pom.xml.versionsBackup -pom.xml.next -release.properties -dependency-reduced-pom.xml -buildNumber.properties - - -### Vim ### -[._]*.s[a-w][a-z] -[._]s[a-w][a-z] -*.un~ -Session.vim -.netrwhist -*~ - - -### Intellij ### -# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm - -*.iml - -## Directory-based project format: -.idea/ -# if you remove the above rule, at least ignore the following: - -# User-specific stuff: -# .idea/workspace.xml -# .idea/tasks.xml -# .idea/dictionaries - -# Sensitive or high-churn files: -# .idea/dataSources.ids -# .idea/dataSources.xml -# .idea/sqlDataSources.xml -# .idea/dynamic.xml -# .idea/uiDesigner.xml - -# Gradle: -# .idea/gradle.xml -# .idea/libraries - -# Mongo Explorer plugin: -# .idea/mongoSettings.xml - -## File-based project format: -*.ipr -*.iws - -## Plugin-specific files: - -# IntelliJ -/out/ - -# mpeltonen/sbt-idea plugin -.idea_modules/ - -# JIRA plugin -atlassian-ide-plugin.xml - -# Crashlytics plugin (for Android Studio and IntelliJ) -com_crashlytics_export_strings.xml -crashlytics.properties -crashlytics-build.properties - - - -### Eclipse ### -*.pydevproject -.metadata -.gradle -bin/ -tmp/ -*.tmp -*.bak -*.swp -*~.nib -local.properties -.loadpath - -# Eclipse Core -.project - -# External tool builders -.externalToolBuilders/ - -# Locally stored "Eclipse launch configurations" -*.launch - -# CDT-specific -.cproject - -# JDT-specific (Eclipse Java Development Tools) - -# PDT-specific -.buildpath - -# sbteclipse plugin -.target - -# TeXlipse plugin -.texlipse - diff --git a/hapi-fhir-jpaserver-examples/hapi-fhir-jpaserver-example-postgres/.settings/org.eclipse.core.resources.prefs b/hapi-fhir-jpaserver-examples/hapi-fhir-jpaserver-example-postgres/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c0203a..00000000000 --- a/hapi-fhir-jpaserver-examples/hapi-fhir-jpaserver-example-postgres/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/hapi-fhir-jpaserver-examples/hapi-fhir-jpaserver-example-postgres/.settings/org.eclipse.jdt.core.prefs b/hapi-fhir-jpaserver-examples/hapi-fhir-jpaserver-example-postgres/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 60105c1b951..00000000000 --- a/hapi-fhir-jpaserver-examples/hapi-fhir-jpaserver-example-postgres/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,5 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.6 diff --git a/hapi-fhir-jpaserver-examples/hapi-fhir-jpaserver-example-postgres/.settings/org.eclipse.m2e.core.prefs b/hapi-fhir-jpaserver-examples/hapi-fhir-jpaserver-example-postgres/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f1cb2..00000000000 --- a/hapi-fhir-jpaserver-examples/hapi-fhir-jpaserver-example-postgres/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/hapi-fhir-jpaserver-uhnfhirtest/.classpath b/hapi-fhir-jpaserver-uhnfhirtest/.classpath deleted file mode 100644 index 0b809b9cdb8..00000000000 --- a/hapi-fhir-jpaserver-uhnfhirtest/.classpath +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/hapi-fhir-jpaserver-uhnfhirtest/.project b/hapi-fhir-jpaserver-uhnfhirtest/.project deleted file mode 100644 index ec591debe6f..00000000000 --- a/hapi-fhir-jpaserver-uhnfhirtest/.project +++ /dev/null @@ -1,42 +0,0 @@ - - - hapi-fhir-jpaserver-uhnfhirtest - - - - - - org.eclipse.wst.jsdt.core.javascriptValidator - - - - - org.eclipse.wst.common.project.facet.core.builder - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.wst.validation.validationbuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.jem.workbench.JavaEMFNature - org.eclipse.wst.common.modulecore.ModuleCoreNature - org.eclipse.jdt.core.javanature - org.eclipse.m2e.core.maven2Nature - org.eclipse.wst.common.project.facet.core.nature - org.eclipse.wst.jsdt.core.jsNature - - diff --git a/hapi-fhir-jpaserver-uhnfhirtest/.settings/.jsdtscope b/hapi-fhir-jpaserver-uhnfhirtest/.settings/.jsdtscope deleted file mode 100644 index b72a6a47b2e..00000000000 --- a/hapi-fhir-jpaserver-uhnfhirtest/.settings/.jsdtscope +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - diff --git a/hapi-fhir-jpaserver-uhnfhirtest/.settings/org.eclipse.core.resources.prefs b/hapi-fhir-jpaserver-uhnfhirtest/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 29abf999564..00000000000 --- a/hapi-fhir-jpaserver-uhnfhirtest/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,6 +0,0 @@ -eclipse.preferences.version=1 -encoding//src/main/java=UTF-8 -encoding//src/main/resources=UTF-8 -encoding//src/test/java=UTF-8 -encoding//src/test/resources=UTF-8 -encoding/=UTF-8 diff --git a/hapi-fhir-jpaserver-uhnfhirtest/.settings/org.eclipse.jdt.core.prefs b/hapi-fhir-jpaserver-uhnfhirtest/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 6b5aebc4b56..00000000000 --- a/hapi-fhir-jpaserver-uhnfhirtest/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,13 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.7 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.7 diff --git a/hapi-fhir-jpaserver-uhnfhirtest/.settings/org.eclipse.m2e.core.prefs b/hapi-fhir-jpaserver-uhnfhirtest/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f1cb2..00000000000 --- a/hapi-fhir-jpaserver-uhnfhirtest/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/hapi-fhir-jpaserver-uhnfhirtest/.settings/org.eclipse.wst.common.component b/hapi-fhir-jpaserver-uhnfhirtest/.settings/org.eclipse.wst.common.component deleted file mode 100644 index 94ced150613..00000000000 --- a/hapi-fhir-jpaserver-uhnfhirtest/.settings/org.eclipse.wst.common.component +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - uses - - - uses - - - uses - - - uses - - - uses - - - uses - - - consumes - - - consumes - - - - - diff --git a/hapi-fhir-jpaserver-uhnfhirtest/.settings/org.eclipse.wst.common.project.facet.core.xml b/hapi-fhir-jpaserver-uhnfhirtest/.settings/org.eclipse.wst.common.project.facet.core.xml deleted file mode 100644 index 45fbdef1fd7..00000000000 --- a/hapi-fhir-jpaserver-uhnfhirtest/.settings/org.eclipse.wst.common.project.facet.core.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/hapi-fhir-jpaserver-uhnfhirtest/.settings/org.eclipse.wst.jsdt.ui.superType.container b/hapi-fhir-jpaserver-uhnfhirtest/.settings/org.eclipse.wst.jsdt.ui.superType.container deleted file mode 100644 index 3bd5d0a4803..00000000000 --- a/hapi-fhir-jpaserver-uhnfhirtest/.settings/org.eclipse.wst.jsdt.ui.superType.container +++ /dev/null @@ -1 +0,0 @@ -org.eclipse.wst.jsdt.launching.baseBrowserLibrary \ No newline at end of file diff --git a/hapi-fhir-jpaserver-uhnfhirtest/.settings/org.eclipse.wst.jsdt.ui.superType.name b/hapi-fhir-jpaserver-uhnfhirtest/.settings/org.eclipse.wst.jsdt.ui.superType.name deleted file mode 100644 index 05bd71b6ec2..00000000000 --- a/hapi-fhir-jpaserver-uhnfhirtest/.settings/org.eclipse.wst.jsdt.ui.superType.name +++ /dev/null @@ -1 +0,0 @@ -Window \ No newline at end of file diff --git a/hapi-fhir-jpaserver-uhnfhirtest/.settings/org.eclipse.wst.validation.prefs b/hapi-fhir-jpaserver-uhnfhirtest/.settings/org.eclipse.wst.validation.prefs deleted file mode 100644 index 04cad8cb752..00000000000 --- a/hapi-fhir-jpaserver-uhnfhirtest/.settings/org.eclipse.wst.validation.prefs +++ /dev/null @@ -1,2 +0,0 @@ -disabled=06target -eclipse.preferences.version=1 diff --git a/hapi-fhir-jpaserver-uhnfhirtest/auth-server/.classpath b/hapi-fhir-jpaserver-uhnfhirtest/auth-server/.classpath deleted file mode 100644 index f619a5369d9..00000000000 --- a/hapi-fhir-jpaserver-uhnfhirtest/auth-server/.classpath +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/hapi-fhir-jpaserver-uhnfhirtest/auth-server/.settings/org.eclipse.jdt.core.prefs b/hapi-fhir-jpaserver-uhnfhirtest/auth-server/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index ec4300d5d09..00000000000 --- a/hapi-fhir-jpaserver-uhnfhirtest/auth-server/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,5 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 -org.eclipse.jdt.core.compiler.compliance=1.7 -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.7 diff --git a/hapi-fhir-jpaserver-uhnfhirtest/auth-server/.settings/org.eclipse.m2e.core.prefs b/hapi-fhir-jpaserver-uhnfhirtest/auth-server/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f1cb2..00000000000 --- a/hapi-fhir-jpaserver-uhnfhirtest/auth-server/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/hapi-fhir-narrativegenerator/.classpath b/hapi-fhir-narrativegenerator/.classpath deleted file mode 100644 index 3314705f3ff..00000000000 --- a/hapi-fhir-narrativegenerator/.classpath +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/hapi-fhir-narrativegenerator/.project b/hapi-fhir-narrativegenerator/.project deleted file mode 100644 index 579a2b6f9ac..00000000000 --- a/hapi-fhir-narrativegenerator/.project +++ /dev/null @@ -1,31 +0,0 @@ - - - hapi-fhir-narrativegenerator - NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse. - - - - - org.eclipse.wst.common.project.facet.core.builder - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.jem.workbench.JavaEMFNature - org.eclipse.wst.common.modulecore.ModuleCoreNature - org.eclipse.m2e.core.maven2Nature - org.eclipse.jdt.core.javanature - org.eclipse.wst.common.project.facet.core.nature - - diff --git a/hapi-fhir-narrativegenerator/.settings/org.eclipse.core.resources.prefs b/hapi-fhir-narrativegenerator/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c0203a..00000000000 --- a/hapi-fhir-narrativegenerator/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/hapi-fhir-narrativegenerator/.settings/org.eclipse.m2e.core.prefs b/hapi-fhir-narrativegenerator/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f1cb2..00000000000 --- a/hapi-fhir-narrativegenerator/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/hapi-fhir-oauth2/.classpath b/hapi-fhir-oauth2/.classpath deleted file mode 100644 index d752e4f3e60..00000000000 --- a/hapi-fhir-oauth2/.classpath +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/hapi-fhir-oauth2/.project b/hapi-fhir-oauth2/.project deleted file mode 100644 index 0545006b46a..00000000000 --- a/hapi-fhir-oauth2/.project +++ /dev/null @@ -1,23 +0,0 @@ - - - hapi-fhir-oauth2 - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.jdt.core.javanature - org.eclipse.m2e.core.maven2Nature - - diff --git a/hapi-fhir-oauth2/.settings/org.eclipse.core.resources.prefs b/hapi-fhir-oauth2/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index cdfe4f1b669..00000000000 --- a/hapi-fhir-oauth2/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,5 +0,0 @@ -eclipse.preferences.version=1 -encoding//src/main/java=UTF-8 -encoding//src/test/java=UTF-8 -encoding//src/test/resources=UTF-8 -encoding/=UTF-8 diff --git a/hapi-fhir-oauth2/.settings/org.eclipse.jdt.core.prefs b/hapi-fhir-oauth2/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 60105c1b951..00000000000 --- a/hapi-fhir-oauth2/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,5 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.6 diff --git a/hapi-fhir-oauth2/.settings/org.eclipse.m2e.core.prefs b/hapi-fhir-oauth2/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f1cb2..00000000000 --- a/hapi-fhir-oauth2/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/hapi-fhir-osgi-core/.classpath b/hapi-fhir-osgi-core/.classpath deleted file mode 100644 index f73e45f4e93..00000000000 --- a/hapi-fhir-osgi-core/.classpath +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/hapi-fhir-osgi-core/.project b/hapi-fhir-osgi-core/.project deleted file mode 100644 index 767d2307813..00000000000 --- a/hapi-fhir-osgi-core/.project +++ /dev/null @@ -1,39 +0,0 @@ - - - hapi-fhir-osgi-core - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.wst.common.project.facet.core.builder - - - - - org.eclipse.ui.externaltools.ExternalToolBuilder - full,incremental, - - - LaunchConfigHandle - <project>/.externalToolBuilders/org.eclipse.m2e.core.maven2Builder (3).launch - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.m2e.core.maven2Nature - org.eclipse.wst.common.project.facet.core.nature - org.eclipse.jdt.core.javanature - - diff --git a/hapi-fhir-osgi-core/.settings/org.eclipse.core.resources.prefs b/hapi-fhir-osgi-core/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c0203a..00000000000 --- a/hapi-fhir-osgi-core/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/hapi-fhir-osgi-core/.settings/org.eclipse.jdt.core.prefs b/hapi-fhir-osgi-core/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index c537b63063c..00000000000 --- a/hapi-fhir-osgi-core/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,7 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.6 diff --git a/hapi-fhir-osgi-core/.settings/org.eclipse.m2e.core.prefs b/hapi-fhir-osgi-core/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f1cb2..00000000000 --- a/hapi-fhir-osgi-core/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/hapi-fhir-osgi-core/.settings/org.eclipse.wst.common.project.facet.core.xml b/hapi-fhir-osgi-core/.settings/org.eclipse.wst.common.project.facet.core.xml deleted file mode 100644 index bcfc3250338..00000000000 --- a/hapi-fhir-osgi-core/.settings/org.eclipse.wst.common.project.facet.core.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/hapi-fhir-structures-dstu/.classpath b/hapi-fhir-structures-dstu/.classpath deleted file mode 100644 index 5b517aa32bb..00000000000 --- a/hapi-fhir-structures-dstu/.classpath +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/hapi-fhir-structures-dstu/.project b/hapi-fhir-structures-dstu/.project deleted file mode 100644 index cb64b9f15ff..00000000000 --- a/hapi-fhir-structures-dstu/.project +++ /dev/null @@ -1,31 +0,0 @@ - - - hapi-fhir-structures-dstu - NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse. - - - - - org.eclipse.wst.common.project.facet.core.builder - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.jem.workbench.JavaEMFNature - org.eclipse.wst.common.modulecore.ModuleCoreNature - org.eclipse.m2e.core.maven2Nature - org.eclipse.jdt.core.javanature - org.eclipse.wst.common.project.facet.core.nature - - diff --git a/hapi-fhir-structures-dstu/.settings/org.eclipse.core.resources.prefs b/hapi-fhir-structures-dstu/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 4d0715b8536..00000000000 --- a/hapi-fhir-structures-dstu/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,7 +0,0 @@ -eclipse.preferences.version=1 -encoding//src/main/java=UTF-8 -encoding//src/main/resources=UTF-8 -encoding//src/test/java=UTF-8 -encoding//src/test/java/ca/uhn/fhir/model/primitive/XhtmlDtTest.java=UTF-8 -encoding//src/test/resources=UTF-8 -encoding/=UTF-8 diff --git a/hapi-fhir-structures-dstu/.settings/org.eclipse.jdt.core.prefs b/hapi-fhir-structures-dstu/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 69c31cd493c..00000000000 --- a/hapi-fhir-structures-dstu/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,8 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.6 diff --git a/hapi-fhir-structures-dstu/.settings/org.eclipse.m2e.core.prefs b/hapi-fhir-structures-dstu/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f1cb2..00000000000 --- a/hapi-fhir-structures-dstu/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/hapi-fhir-structures-dstu/.settings/org.eclipse.wst.common.component b/hapi-fhir-structures-dstu/.settings/org.eclipse.wst.common.component deleted file mode 100644 index 8cd83566c21..00000000000 --- a/hapi-fhir-structures-dstu/.settings/org.eclipse.wst.common.component +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/hapi-fhir-structures-dstu/.settings/org.eclipse.wst.common.project.facet.core.xml b/hapi-fhir-structures-dstu/.settings/org.eclipse.wst.common.project.facet.core.xml deleted file mode 100644 index 5c9bd7532ab..00000000000 --- a/hapi-fhir-structures-dstu/.settings/org.eclipse.wst.common.project.facet.core.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/hapi-fhir-structures-dstu/.settings/org.eclipse.wst.validation.prefs b/hapi-fhir-structures-dstu/.settings/org.eclipse.wst.validation.prefs deleted file mode 100644 index 04cad8cb752..00000000000 --- a/hapi-fhir-structures-dstu/.settings/org.eclipse.wst.validation.prefs +++ /dev/null @@ -1,2 +0,0 @@ -disabled=06target -eclipse.preferences.version=1 diff --git a/hapi-fhir-structures-dstu2.1/.classpath b/hapi-fhir-structures-dstu2.1/.classpath deleted file mode 100644 index e55bfdf665c..00000000000 --- a/hapi-fhir-structures-dstu2.1/.classpath +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/hapi-fhir-structures-dstu2.1/.project b/hapi-fhir-structures-dstu2.1/.project deleted file mode 100644 index 702936ef90f..00000000000 --- a/hapi-fhir-structures-dstu2.1/.project +++ /dev/null @@ -1,29 +0,0 @@ - - - hapi-fhir-structures-dstu2.1 - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.wst.common.project.facet.core.builder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.m2e.core.maven2Nature - org.eclipse.wst.common.project.facet.core.nature - org.eclipse.jdt.core.javanature - - diff --git a/hapi-fhir-structures-dstu2.1/.settings/org.eclipse.core.resources.prefs b/hapi-fhir-structures-dstu2.1/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c0203a..00000000000 --- a/hapi-fhir-structures-dstu2.1/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/hapi-fhir-structures-dstu2.1/.settings/org.eclipse.jdt.core.prefs b/hapi-fhir-structures-dstu2.1/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 0c68a61dca8..00000000000 --- a/hapi-fhir-structures-dstu2.1/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,7 +0,0 @@ -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 diff --git a/hapi-fhir-structures-dstu2.1/.settings/org.eclipse.m2e.core.prefs b/hapi-fhir-structures-dstu2.1/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f1cb2..00000000000 --- a/hapi-fhir-structures-dstu2.1/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/hapi-fhir-structures-dstu2.1/.settings/org.eclipse.wst.common.project.facet.core.xml b/hapi-fhir-structures-dstu2.1/.settings/org.eclipse.wst.common.project.facet.core.xml deleted file mode 100644 index f4ef8aa0a5c..00000000000 --- a/hapi-fhir-structures-dstu2.1/.settings/org.eclipse.wst.common.project.facet.core.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/hapi-fhir-structures-dstu2/.classpath b/hapi-fhir-structures-dstu2/.classpath deleted file mode 100644 index 3847ce846d0..00000000000 --- a/hapi-fhir-structures-dstu2/.classpath +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/hapi-fhir-structures-dstu2/.project b/hapi-fhir-structures-dstu2/.project deleted file mode 100644 index e859f7be8bb..00000000000 --- a/hapi-fhir-structures-dstu2/.project +++ /dev/null @@ -1,36 +0,0 @@ - - - hapi-fhir-structures-dstu2 - - - - - - org.eclipse.wst.common.project.facet.core.builder - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.wst.validation.validationbuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.jem.workbench.JavaEMFNature - org.eclipse.wst.common.modulecore.ModuleCoreNature - org.eclipse.jdt.core.javanature - org.eclipse.m2e.core.maven2Nature - org.eclipse.wst.common.project.facet.core.nature - - diff --git a/hapi-fhir-structures-dstu2/.settings/org.eclipse.core.resources.prefs b/hapi-fhir-structures-dstu2/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 29abf999564..00000000000 --- a/hapi-fhir-structures-dstu2/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,6 +0,0 @@ -eclipse.preferences.version=1 -encoding//src/main/java=UTF-8 -encoding//src/main/resources=UTF-8 -encoding//src/test/java=UTF-8 -encoding//src/test/resources=UTF-8 -encoding/=UTF-8 diff --git a/hapi-fhir-structures-dstu2/.settings/org.eclipse.jdt.core.prefs b/hapi-fhir-structures-dstu2/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 69c31cd493c..00000000000 --- a/hapi-fhir-structures-dstu2/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,8 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.6 diff --git a/hapi-fhir-structures-dstu2/.settings/org.eclipse.m2e.core.prefs b/hapi-fhir-structures-dstu2/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f1cb2..00000000000 --- a/hapi-fhir-structures-dstu2/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/hapi-fhir-structures-dstu2/.settings/org.eclipse.wst.common.component b/hapi-fhir-structures-dstu2/.settings/org.eclipse.wst.common.component deleted file mode 100644 index 86f32e09129..00000000000 --- a/hapi-fhir-structures-dstu2/.settings/org.eclipse.wst.common.component +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/hapi-fhir-structures-dstu2/.settings/org.eclipse.wst.common.project.facet.core.xml b/hapi-fhir-structures-dstu2/.settings/org.eclipse.wst.common.project.facet.core.xml deleted file mode 100644 index 5c9bd7532ab..00000000000 --- a/hapi-fhir-structures-dstu2/.settings/org.eclipse.wst.common.project.facet.core.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/hapi-fhir-structures-dstu2/.settings/org.eclipse.wst.validation.prefs b/hapi-fhir-structures-dstu2/.settings/org.eclipse.wst.validation.prefs deleted file mode 100644 index 04cad8cb752..00000000000 --- a/hapi-fhir-structures-dstu2/.settings/org.eclipse.wst.validation.prefs +++ /dev/null @@ -1,2 +0,0 @@ -disabled=06target -eclipse.preferences.version=1 diff --git a/hapi-fhir-structures-dstu3/.classpath b/hapi-fhir-structures-dstu3/.classpath deleted file mode 100644 index e55bfdf665c..00000000000 --- a/hapi-fhir-structures-dstu3/.classpath +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/hapi-fhir-structures-dstu3/.project b/hapi-fhir-structures-dstu3/.project deleted file mode 100644 index 1ca3f8e36b5..00000000000 --- a/hapi-fhir-structures-dstu3/.project +++ /dev/null @@ -1,31 +0,0 @@ - - - hapi-fhir-structures-dstu3 - - - - - - org.eclipse.wst.common.project.facet.core.builder - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.jem.workbench.JavaEMFNature - org.eclipse.wst.common.modulecore.ModuleCoreNature - org.eclipse.jdt.core.javanature - org.eclipse.m2e.core.maven2Nature - org.eclipse.wst.common.project.facet.core.nature - - diff --git a/hapi-fhir-structures-dstu3/.settings/org.eclipse.core.resources.prefs b/hapi-fhir-structures-dstu3/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c0203a..00000000000 --- a/hapi-fhir-structures-dstu3/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/hapi-fhir-structures-dstu3/.settings/org.eclipse.jdt.core.prefs b/hapi-fhir-structures-dstu3/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 6183714c795..00000000000 --- a/hapi-fhir-structures-dstu3/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,95 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled -org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore -org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull -org.eclipse.jdt.core.compiler.annotation.nonnull.secondary= -org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault -org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary= -org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable -org.eclipse.jdt.core.compiler.annotation.nullable.secondary= -org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled -org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning -org.eclipse.jdt.core.compiler.problem.autoboxing=ignore -org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning -org.eclipse.jdt.core.compiler.problem.deadCode=warning -org.eclipse.jdt.core.compiler.problem.deprecation=warning -org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled -org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled -org.eclipse.jdt.core.compiler.problem.discouragedReference=warning -org.eclipse.jdt.core.compiler.problem.emptyStatement=warning -org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore -org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning -org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled -org.eclipse.jdt.core.compiler.problem.fieldHiding=warning -org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning -org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning -org.eclipse.jdt.core.compiler.problem.forbiddenReference=error -org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning -org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled -org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning -org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning -org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore -org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning -org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning -org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore -org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore -org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled -org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled -org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning -org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore -org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning -org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning -org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore -org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning -org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning -org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error -org.eclipse.jdt.core.compiler.problem.nullReference=error -org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error -org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning -org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning -org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore -org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning -org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning -org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore -org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore -org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning -org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning -org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning -org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore -org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore -org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore -org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore -org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled -org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning -org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled -org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled -org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled -org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore -org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning -org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled -org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning -org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning -org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore -org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning -org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore -org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning -org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled -org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore -org.eclipse.jdt.core.compiler.problem.unusedImport=warning -org.eclipse.jdt.core.compiler.problem.unusedLabel=warning -org.eclipse.jdt.core.compiler.problem.unusedLocal=warning -org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=warning -org.eclipse.jdt.core.compiler.problem.unusedParameter=warning -org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled -org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning -org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning -org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning -org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning diff --git a/hapi-fhir-structures-dstu3/.settings/org.eclipse.m2e.core.prefs b/hapi-fhir-structures-dstu3/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f1cb2..00000000000 --- a/hapi-fhir-structures-dstu3/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/hapi-fhir-structures-hl7org-dstu2/.classpath b/hapi-fhir-structures-hl7org-dstu2/.classpath deleted file mode 100644 index f87998e1d5c..00000000000 --- a/hapi-fhir-structures-hl7org-dstu2/.classpath +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/hapi-fhir-structures-hl7org-dstu2/.project b/hapi-fhir-structures-hl7org-dstu2/.project deleted file mode 100644 index a7c216d2149..00000000000 --- a/hapi-fhir-structures-hl7org-dstu2/.project +++ /dev/null @@ -1,31 +0,0 @@ - - - hapi-fhir-structures-hl7org-dev - - - - - - org.eclipse.wst.common.project.facet.core.builder - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.jem.workbench.JavaEMFNature - org.eclipse.wst.common.modulecore.ModuleCoreNature - org.eclipse.jdt.core.javanature - org.eclipse.m2e.core.maven2Nature - org.eclipse.wst.common.project.facet.core.nature - - diff --git a/hapi-fhir-structures-hl7org-dstu2/.settings/org.eclipse.core.resources.prefs b/hapi-fhir-structures-hl7org-dstu2/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c0203a..00000000000 --- a/hapi-fhir-structures-hl7org-dstu2/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/hapi-fhir-structures-hl7org-dstu2/.settings/org.eclipse.jdt.core.prefs b/hapi-fhir-structures-hl7org-dstu2/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 0c74cfbcb11..00000000000 --- a/hapi-fhir-structures-hl7org-dstu2/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,386 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled -org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore -org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull -org.eclipse.jdt.core.compiler.annotation.nonnull.secondary= -org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault -org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary= -org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable -org.eclipse.jdt.core.compiler.annotation.nullable.secondary= -org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.autoboxing=ignore -org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning -org.eclipse.jdt.core.compiler.problem.deadCode=warning -org.eclipse.jdt.core.compiler.problem.deprecation=warning -org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled -org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled -org.eclipse.jdt.core.compiler.problem.discouragedReference=warning -org.eclipse.jdt.core.compiler.problem.emptyStatement=warning -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore -org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning -org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled -org.eclipse.jdt.core.compiler.problem.fieldHiding=warning -org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning -org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning -org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled -org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning -org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning -org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore -org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning -org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning -org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore -org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore -org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled -org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled -org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning -org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore -org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning -org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning -org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore -org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning -org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning -org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error -org.eclipse.jdt.core.compiler.problem.nullReference=error -org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error -org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning -org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning -org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore -org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning -org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning -org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore -org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore -org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning -org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning -org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning -org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore -org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore -org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore -org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore -org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled -org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning -org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled -org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled -org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled -org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore -org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning -org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled -org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning -org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning -org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore -org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning -org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore -org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning -org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled -org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore -org.eclipse.jdt.core.compiler.problem.unusedImport=warning -org.eclipse.jdt.core.compiler.problem.unusedLabel=warning -org.eclipse.jdt.core.compiler.problem.unusedLocal=warning -org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=warning -org.eclipse.jdt.core.compiler.problem.unusedParameter=warning -org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled -org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning -org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning -org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning -org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.6 -org.eclipse.jdt.core.formatter.align_type_members_on_columns=false -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_assignment=0 -org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 -org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 -org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 -org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 -org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 -org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80 -org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 -org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16 -org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_after_package=1 -org.eclipse.jdt.core.formatter.blank_lines_before_field=0 -org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0 -org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 -org.eclipse.jdt.core.formatter.blank_lines_before_method=1 -org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 -org.eclipse.jdt.core.formatter.blank_lines_before_package=0 -org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 -org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 -org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false -org.eclipse.jdt.core.formatter.comment.format_block_comments=true -org.eclipse.jdt.core.formatter.comment.format_header=false -org.eclipse.jdt.core.formatter.comment.format_html=true -org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true -org.eclipse.jdt.core.formatter.comment.format_line_comments=true -org.eclipse.jdt.core.formatter.comment.format_source_code=true -org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true -org.eclipse.jdt.core.formatter.comment.indent_root_tags=true -org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert -org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert -org.eclipse.jdt.core.formatter.comment.line_length=80 -org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true -org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true -org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false -org.eclipse.jdt.core.formatter.compact_else_if=true -org.eclipse.jdt.core.formatter.continuation_indentation=2 -org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 -org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off -org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on -org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false -org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true -org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_empty_lines=false -org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true -org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false -org.eclipse.jdt.core.formatter.indentation.size=2 -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert -org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert -org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert -org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.join_lines_in_comments=true -org.eclipse.jdt.core.formatter.join_wrapped_lines=true -org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false -org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false -org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false -org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false -org.eclipse.jdt.core.formatter.lineSplit=120 -org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false -org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false -org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 -org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1 -org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true -org.eclipse.jdt.core.formatter.tabulation.char=space -org.eclipse.jdt.core.formatter.tabulation.size=2 -org.eclipse.jdt.core.formatter.use_on_off_tags=false -org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=true -org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true -org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true -org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true -org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter diff --git a/hapi-fhir-structures-hl7org-dstu2/.settings/org.eclipse.jdt.ui.prefs b/hapi-fhir-structures-hl7org-dstu2/.settings/org.eclipse.jdt.ui.prefs deleted file mode 100644 index 11654f69c63..00000000000 --- a/hapi-fhir-structures-hl7org-dstu2/.settings/org.eclipse.jdt.ui.prefs +++ /dev/null @@ -1,3 +0,0 @@ -eclipse.preferences.version=1 -formatter_profile=_Grahame -formatter_settings_version=12 diff --git a/hapi-fhir-structures-hl7org-dstu2/.settings/org.eclipse.m2e.core.prefs b/hapi-fhir-structures-hl7org-dstu2/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f1cb2..00000000000 --- a/hapi-fhir-structures-hl7org-dstu2/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/hapi-fhir-structures-hl7org-dstu2/.settings/org.eclipse.wst.common.component b/hapi-fhir-structures-hl7org-dstu2/.settings/org.eclipse.wst.common.component deleted file mode 100644 index 2b2594a6fda..00000000000 --- a/hapi-fhir-structures-hl7org-dstu2/.settings/org.eclipse.wst.common.component +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/hapi-fhir-structures-hl7org-dstu2/.settings/org.eclipse.wst.common.project.facet.core.xml b/hapi-fhir-structures-hl7org-dstu2/.settings/org.eclipse.wst.common.project.facet.core.xml deleted file mode 100644 index c78d9323fe1..00000000000 --- a/hapi-fhir-structures-hl7org-dstu2/.settings/org.eclipse.wst.common.project.facet.core.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/hapi-fhir-structures-hl7org-dstu2/.settings/org.eclipse.wst.validation.prefs b/hapi-fhir-structures-hl7org-dstu2/.settings/org.eclipse.wst.validation.prefs deleted file mode 100644 index 92ac3ff26a8..00000000000 --- a/hapi-fhir-structures-hl7org-dstu2/.settings/org.eclipse.wst.validation.prefs +++ /dev/null @@ -1,10 +0,0 @@ -DELEGATES_PREFERENCE=delegateValidatorList -USER_BUILD_PREFERENCE=enabledBuildValidatorListorg.eclipse.jst.j2ee.internal.classpathdep.ClasspathDependencyValidator; -USER_MANUAL_PREFERENCE=enabledManualValidatorListorg.eclipse.jst.j2ee.internal.classpathdep.ClasspathDependencyValidator; -USER_PREFERENCE=overrideGlobalPreferencestruedisableAllValidationtrueversion1.2.600.v201501211647 -eclipse.preferences.version=1 -override=true -suspend=true -vals/org.eclipse.jst.jsf.facelet.ui.FaceletHTMLValidator/global=FF01 -vals/org.eclipse.wst.html.core.HTMLValidator/global=FF01 -vf.version=3 diff --git a/hapi-fhir-testpage-interceptor/.classpath b/hapi-fhir-testpage-interceptor/.classpath deleted file mode 100644 index fd7ad7fbda7..00000000000 --- a/hapi-fhir-testpage-interceptor/.classpath +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/hapi-fhir-testpage-interceptor/.project b/hapi-fhir-testpage-interceptor/.project deleted file mode 100644 index 733a24a9cde..00000000000 --- a/hapi-fhir-testpage-interceptor/.project +++ /dev/null @@ -1,23 +0,0 @@ - - - hapi-fhir-testpage-interceptor - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.jdt.core.javanature - org.eclipse.m2e.core.maven2Nature - - diff --git a/hapi-fhir-testpage-interceptor/.settings/org.eclipse.core.resources.prefs b/hapi-fhir-testpage-interceptor/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c0203a..00000000000 --- a/hapi-fhir-testpage-interceptor/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/hapi-fhir-testpage-interceptor/.settings/org.eclipse.jdt.core.prefs b/hapi-fhir-testpage-interceptor/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 60105c1b951..00000000000 --- a/hapi-fhir-testpage-interceptor/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,5 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.6 diff --git a/hapi-fhir-testpage-interceptor/.settings/org.eclipse.m2e.core.prefs b/hapi-fhir-testpage-interceptor/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f1cb2..00000000000 --- a/hapi-fhir-testpage-interceptor/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/hapi-fhir-testpage-overlay/.classpath b/hapi-fhir-testpage-overlay/.classpath deleted file mode 100644 index a19b3b79757..00000000000 --- a/hapi-fhir-testpage-overlay/.classpath +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/hapi-fhir-testpage-overlay/.project b/hapi-fhir-testpage-overlay/.project deleted file mode 100644 index f86c4f92f18..00000000000 --- a/hapi-fhir-testpage-overlay/.project +++ /dev/null @@ -1,42 +0,0 @@ - - - hapi-fhir-testpage-overlay - - - - - - org.eclipse.wst.jsdt.core.javascriptValidator - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.wst.common.project.facet.core.builder - - - - - org.eclipse.wst.validation.validationbuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.m2e.core.maven2Nature - org.eclipse.jem.workbench.JavaEMFNature - org.eclipse.wst.common.modulecore.ModuleCoreNature - org.eclipse.wst.common.project.facet.core.nature - org.eclipse.jdt.core.javanature - org.eclipse.wst.jsdt.core.jsNature - - diff --git a/hapi-fhir-testpage-overlay/.settings/.jsdtscope b/hapi-fhir-testpage-overlay/.settings/.jsdtscope deleted file mode 100644 index 6855c9bef39..00000000000 --- a/hapi-fhir-testpage-overlay/.settings/.jsdtscope +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - diff --git a/hapi-fhir-testpage-overlay/.settings/org.eclipse.core.resources.prefs b/hapi-fhir-testpage-overlay/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 29abf999564..00000000000 --- a/hapi-fhir-testpage-overlay/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,6 +0,0 @@ -eclipse.preferences.version=1 -encoding//src/main/java=UTF-8 -encoding//src/main/resources=UTF-8 -encoding//src/test/java=UTF-8 -encoding//src/test/resources=UTF-8 -encoding/=UTF-8 diff --git a/hapi-fhir-testpage-overlay/.settings/org.eclipse.jdt.core.prefs b/hapi-fhir-testpage-overlay/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 69c31cd493c..00000000000 --- a/hapi-fhir-testpage-overlay/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,8 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.6 diff --git a/hapi-fhir-testpage-overlay/.settings/org.eclipse.m2e.core.prefs b/hapi-fhir-testpage-overlay/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f1cb2..00000000000 --- a/hapi-fhir-testpage-overlay/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/hapi-fhir-testpage-overlay/.settings/org.eclipse.wst.common.component b/hapi-fhir-testpage-overlay/.settings/org.eclipse.wst.common.component deleted file mode 100644 index 0f3a94e51e1..00000000000 --- a/hapi-fhir-testpage-overlay/.settings/org.eclipse.wst.common.component +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - uses - - - uses - - - uses - - - uses - - - uses - - - uses - - - - - diff --git a/hapi-fhir-testpage-overlay/.settings/org.eclipse.wst.common.project.facet.core.xml b/hapi-fhir-testpage-overlay/.settings/org.eclipse.wst.common.project.facet.core.xml deleted file mode 100644 index 9f1491f6f6a..00000000000 --- a/hapi-fhir-testpage-overlay/.settings/org.eclipse.wst.common.project.facet.core.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/hapi-fhir-testpage-overlay/.settings/org.eclipse.wst.jsdt.core.prefs b/hapi-fhir-testpage-overlay/.settings/org.eclipse.wst.jsdt.core.prefs deleted file mode 100644 index 503f9af1c61..00000000000 --- a/hapi-fhir-testpage-overlay/.settings/org.eclipse.wst.jsdt.core.prefs +++ /dev/null @@ -1,50 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.wst.jsdt.core.compiler.codegen.inlineJsrBytecode=disabled -org.eclipse.wst.jsdt.core.compiler.codegen.targetPlatform=1.2 -org.eclipse.wst.jsdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.wst.jsdt.core.compiler.compliance=1.4 -org.eclipse.wst.jsdt.core.compiler.debug.lineNumber=generate -org.eclipse.wst.jsdt.core.compiler.debug.localVariable=generate -org.eclipse.wst.jsdt.core.compiler.debug.sourceFile=generate -org.eclipse.wst.jsdt.core.compiler.maxProblemPerUnit=100 -org.eclipse.wst.jsdt.core.compiler.problem.assertIdentifier=warning -org.eclipse.wst.jsdt.core.compiler.problem.deprecation=warning -org.eclipse.wst.jsdt.core.compiler.problem.deprecationInDeprecatedCode=disabled -org.eclipse.wst.jsdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled -org.eclipse.wst.jsdt.core.compiler.problem.discouragedReference=warning -org.eclipse.wst.jsdt.core.compiler.problem.duplicateLocalVariables=warning -org.eclipse.wst.jsdt.core.compiler.problem.emptyStatement=ignore -org.eclipse.wst.jsdt.core.compiler.problem.fallthroughCase=ignore -org.eclipse.wst.jsdt.core.compiler.problem.fieldHiding=ignore -org.eclipse.wst.jsdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning -org.eclipse.wst.jsdt.core.compiler.problem.forbiddenReference=error -org.eclipse.wst.jsdt.core.compiler.problem.hiddenCatchBlock=warning -org.eclipse.wst.jsdt.core.compiler.problem.indirectStaticAccess=ignore -org.eclipse.wst.jsdt.core.compiler.problem.localVariableHiding=ignore -org.eclipse.wst.jsdt.core.compiler.problem.looseVarDecleration=warning -org.eclipse.wst.jsdt.core.compiler.problem.noEffectAssignment=warning -org.eclipse.wst.jsdt.core.compiler.problem.nonExternalizedStringLiteral=ignore -org.eclipse.wst.jsdt.core.compiler.problem.nullReference=ignore -org.eclipse.wst.jsdt.core.compiler.problem.optionalSemicolon=warning -org.eclipse.wst.jsdt.core.compiler.problem.parameterAssignment=ignore -org.eclipse.wst.jsdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore -org.eclipse.wst.jsdt.core.compiler.problem.potentialNullReference=ignore -org.eclipse.wst.jsdt.core.compiler.problem.redundantNullCheck=ignore -org.eclipse.wst.jsdt.core.compiler.problem.undefinedField=warning -org.eclipse.wst.jsdt.core.compiler.problem.undocumentedEmptyBlock=ignore -org.eclipse.wst.jsdt.core.compiler.problem.uninitializedGlobalVariable=ignore -org.eclipse.wst.jsdt.core.compiler.problem.uninitializedLocalVariable=warning -org.eclipse.wst.jsdt.core.compiler.problem.unnecessaryElse=ignore -org.eclipse.wst.jsdt.core.compiler.problem.unresolvedFieldReference=error -org.eclipse.wst.jsdt.core.compiler.problem.unresolvedMethodReference=error -org.eclipse.wst.jsdt.core.compiler.problem.unresolvedTypeReference=error -org.eclipse.wst.jsdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled -org.eclipse.wst.jsdt.core.compiler.problem.unusedLabel=warning -org.eclipse.wst.jsdt.core.compiler.problem.unusedLocal=warning -org.eclipse.wst.jsdt.core.compiler.problem.unusedParameter=ignore -org.eclipse.wst.jsdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled -org.eclipse.wst.jsdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled -org.eclipse.wst.jsdt.core.compiler.problem.unusedPrivateMember=warning -org.eclipse.wst.jsdt.core.compiler.source=1.3 -semanticValidation=disabled -strictOnKeywordUsage=disabled diff --git a/hapi-fhir-testpage-overlay/.settings/org.eclipse.wst.jsdt.ui.superType.container b/hapi-fhir-testpage-overlay/.settings/org.eclipse.wst.jsdt.ui.superType.container deleted file mode 100644 index 3bd5d0a4803..00000000000 --- a/hapi-fhir-testpage-overlay/.settings/org.eclipse.wst.jsdt.ui.superType.container +++ /dev/null @@ -1 +0,0 @@ -org.eclipse.wst.jsdt.launching.baseBrowserLibrary \ No newline at end of file diff --git a/hapi-fhir-testpage-overlay/.settings/org.eclipse.wst.jsdt.ui.superType.name b/hapi-fhir-testpage-overlay/.settings/org.eclipse.wst.jsdt.ui.superType.name deleted file mode 100644 index 05bd71b6ec2..00000000000 --- a/hapi-fhir-testpage-overlay/.settings/org.eclipse.wst.jsdt.ui.superType.name +++ /dev/null @@ -1 +0,0 @@ -Window \ No newline at end of file diff --git a/hapi-fhir-testpage-overlay/.settings/org.eclipse.wst.validation.prefs b/hapi-fhir-testpage-overlay/.settings/org.eclipse.wst.validation.prefs deleted file mode 100644 index 04cad8cb752..00000000000 --- a/hapi-fhir-testpage-overlay/.settings/org.eclipse.wst.validation.prefs +++ /dev/null @@ -1,2 +0,0 @@ -disabled=06target -eclipse.preferences.version=1 diff --git a/hapi-fhir-tutorial/jpaserver-example-with-custom/.classpath b/hapi-fhir-tutorial/jpaserver-example-with-custom/.classpath deleted file mode 100644 index 953de0b8c76..00000000000 --- a/hapi-fhir-tutorial/jpaserver-example-with-custom/.classpath +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/hapi-fhir-tutorial/jpaserver-example-with-custom/.project b/hapi-fhir-tutorial/jpaserver-example-with-custom/.project deleted file mode 100644 index bf2b60b46db..00000000000 --- a/hapi-fhir-tutorial/jpaserver-example-with-custom/.project +++ /dev/null @@ -1,23 +0,0 @@ - - - hapi-fhir-jpaserver-example-advanced - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.jdt.core.javanature - org.eclipse.m2e.core.maven2Nature - - diff --git a/hapi-fhir-tutorial/jpaserver-example-with-custom/.settings/org.eclipse.jdt.core.prefs b/hapi-fhir-tutorial/jpaserver-example-with-custom/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index ec4300d5d09..00000000000 --- a/hapi-fhir-tutorial/jpaserver-example-with-custom/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,5 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 -org.eclipse.jdt.core.compiler.compliance=1.7 -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.7 diff --git a/hapi-fhir-tutorial/jpaserver-example-with-custom/.settings/org.eclipse.m2e.core.prefs b/hapi-fhir-tutorial/jpaserver-example-with-custom/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f1cb2..00000000000 --- a/hapi-fhir-tutorial/jpaserver-example-with-custom/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/hapi-fhir-tutorial/simple-server/.settings/.jsdtscope b/hapi-fhir-tutorial/simple-server/.settings/.jsdtscope deleted file mode 100644 index b72a6a47b2e..00000000000 --- a/hapi-fhir-tutorial/simple-server/.settings/.jsdtscope +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - diff --git a/hapi-fhir-tutorial/simple-server/.settings/org.eclipse.core.resources.prefs b/hapi-fhir-tutorial/simple-server/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index e9441bb123e..00000000000 --- a/hapi-fhir-tutorial/simple-server/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,3 +0,0 @@ -eclipse.preferences.version=1 -encoding//src/main/java=UTF-8 -encoding/=UTF-8 diff --git a/hapi-fhir-tutorial/simple-server/.settings/org.eclipse.jdt.core.prefs b/hapi-fhir-tutorial/simple-server/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 69c31cd493c..00000000000 --- a/hapi-fhir-tutorial/simple-server/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,8 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.6 diff --git a/hapi-fhir-tutorial/simple-server/.settings/org.eclipse.m2e.core.prefs b/hapi-fhir-tutorial/simple-server/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f1cb2..00000000000 --- a/hapi-fhir-tutorial/simple-server/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/hapi-fhir-tutorial/simple-server/.settings/org.eclipse.wst.common.component b/hapi-fhir-tutorial/simple-server/.settings/org.eclipse.wst.common.component deleted file mode 100644 index c442f87b24c..00000000000 --- a/hapi-fhir-tutorial/simple-server/.settings/org.eclipse.wst.common.component +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/hapi-fhir-tutorial/simple-server/.settings/org.eclipse.wst.common.project.facet.core.xml b/hapi-fhir-tutorial/simple-server/.settings/org.eclipse.wst.common.project.facet.core.xml deleted file mode 100644 index 5a887262619..00000000000 --- a/hapi-fhir-tutorial/simple-server/.settings/org.eclipse.wst.common.project.facet.core.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/hapi-fhir-tutorial/simple-server/.settings/org.eclipse.wst.jsdt.ui.superType.container b/hapi-fhir-tutorial/simple-server/.settings/org.eclipse.wst.jsdt.ui.superType.container deleted file mode 100644 index 3bd5d0a4803..00000000000 --- a/hapi-fhir-tutorial/simple-server/.settings/org.eclipse.wst.jsdt.ui.superType.container +++ /dev/null @@ -1 +0,0 @@ -org.eclipse.wst.jsdt.launching.baseBrowserLibrary \ No newline at end of file diff --git a/hapi-fhir-tutorial/simple-server/.settings/org.eclipse.wst.jsdt.ui.superType.name b/hapi-fhir-tutorial/simple-server/.settings/org.eclipse.wst.jsdt.ui.superType.name deleted file mode 100644 index 05bd71b6ec2..00000000000 --- a/hapi-fhir-tutorial/simple-server/.settings/org.eclipse.wst.jsdt.ui.superType.name +++ /dev/null @@ -1 +0,0 @@ -Window \ No newline at end of file diff --git a/hapi-fhir-tutorial/simple-server/.settings/org.eclipse.wst.validation.prefs b/hapi-fhir-tutorial/simple-server/.settings/org.eclipse.wst.validation.prefs deleted file mode 100644 index 04cad8cb752..00000000000 --- a/hapi-fhir-tutorial/simple-server/.settings/org.eclipse.wst.validation.prefs +++ /dev/null @@ -1,2 +0,0 @@ -disabled=06target -eclipse.preferences.version=1 diff --git a/hapi-fhir-tutorial/skeleton-project/.settings/org.eclipse.core.resources.prefs b/hapi-fhir-tutorial/skeleton-project/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index e9441bb123e..00000000000 --- a/hapi-fhir-tutorial/skeleton-project/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,3 +0,0 @@ -eclipse.preferences.version=1 -encoding//src/main/java=UTF-8 -encoding/=UTF-8 diff --git a/hapi-fhir-tutorial/skeleton-project/.settings/org.eclipse.jdt.core.prefs b/hapi-fhir-tutorial/skeleton-project/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 60105c1b951..00000000000 --- a/hapi-fhir-tutorial/skeleton-project/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,5 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.6 diff --git a/hapi-fhir-tutorial/skeleton-project/.settings/org.eclipse.m2e.core.prefs b/hapi-fhir-tutorial/skeleton-project/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f1cb2..00000000000 --- a/hapi-fhir-tutorial/skeleton-project/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/hapi-fhir-validation-resources-dstu2.1/.classpath b/hapi-fhir-validation-resources-dstu2.1/.classpath deleted file mode 100644 index a9eab599e39..00000000000 --- a/hapi-fhir-validation-resources-dstu2.1/.classpath +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/hapi-fhir-validation-resources-dstu2.1/.project b/hapi-fhir-validation-resources-dstu2.1/.project deleted file mode 100644 index ca3eebe5971..00000000000 --- a/hapi-fhir-validation-resources-dstu2.1/.project +++ /dev/null @@ -1,31 +0,0 @@ - - - hapi-fhir-validation-resources-dstu2.1 - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.wst.common.project.facet.core.builder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.jem.workbench.JavaEMFNature - org.eclipse.wst.common.modulecore.ModuleCoreNature - org.eclipse.m2e.core.maven2Nature - org.eclipse.wst.common.project.facet.core.nature - org.eclipse.jdt.core.javanature - - diff --git a/hapi-fhir-validation-resources-dstu2.1/.settings/org.eclipse.core.resources.prefs b/hapi-fhir-validation-resources-dstu2.1/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c0203a..00000000000 --- a/hapi-fhir-validation-resources-dstu2.1/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/hapi-fhir-validation-resources-dstu2.1/.settings/org.eclipse.m2e.core.prefs b/hapi-fhir-validation-resources-dstu2.1/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f1cb2..00000000000 --- a/hapi-fhir-validation-resources-dstu2.1/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/hapi-fhir-validation-resources-dstu2/.classpath b/hapi-fhir-validation-resources-dstu2/.classpath deleted file mode 100644 index a9eab599e39..00000000000 --- a/hapi-fhir-validation-resources-dstu2/.classpath +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/hapi-fhir-validation-resources-dstu2/.project b/hapi-fhir-validation-resources-dstu2/.project deleted file mode 100644 index b8198c02761..00000000000 --- a/hapi-fhir-validation-resources-dstu2/.project +++ /dev/null @@ -1,31 +0,0 @@ - - - hapi-fhir-validation-resources-dstu2 - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.wst.common.project.facet.core.builder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.jem.workbench.JavaEMFNature - org.eclipse.wst.common.modulecore.ModuleCoreNature - org.eclipse.m2e.core.maven2Nature - org.eclipse.wst.common.project.facet.core.nature - org.eclipse.jdt.core.javanature - - diff --git a/hapi-fhir-validation-resources-dstu2/.settings/org.eclipse.core.resources.prefs b/hapi-fhir-validation-resources-dstu2/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c0203a..00000000000 --- a/hapi-fhir-validation-resources-dstu2/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/hapi-fhir-validation-resources-dstu2/.settings/org.eclipse.jdt.core.prefs b/hapi-fhir-validation-resources-dstu2/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index f42de363afa..00000000000 --- a/hapi-fhir-validation-resources-dstu2/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,7 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 -org.eclipse.jdt.core.compiler.compliance=1.7 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.7 diff --git a/hapi-fhir-validation-resources-dstu2/.settings/org.eclipse.m2e.core.prefs b/hapi-fhir-validation-resources-dstu2/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f1cb2..00000000000 --- a/hapi-fhir-validation-resources-dstu2/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/hapi-fhir-validation-resources-dstu2/.settings/org.eclipse.wst.common.component b/hapi-fhir-validation-resources-dstu2/.settings/org.eclipse.wst.common.component deleted file mode 100644 index 133946b052d..00000000000 --- a/hapi-fhir-validation-resources-dstu2/.settings/org.eclipse.wst.common.component +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/hapi-fhir-validation-resources-dstu2/.settings/org.eclipse.wst.common.project.facet.core.xml b/hapi-fhir-validation-resources-dstu2/.settings/org.eclipse.wst.common.project.facet.core.xml deleted file mode 100644 index 1b22d705a50..00000000000 --- a/hapi-fhir-validation-resources-dstu2/.settings/org.eclipse.wst.common.project.facet.core.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/hapi-fhir-validation-resources-dstu3/.classpath b/hapi-fhir-validation-resources-dstu3/.classpath deleted file mode 100644 index f73e45f4e93..00000000000 --- a/hapi-fhir-validation-resources-dstu3/.classpath +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/hapi-fhir-validation-resources-dstu3/.project b/hapi-fhir-validation-resources-dstu3/.project deleted file mode 100644 index 9ac9c2b934f..00000000000 --- a/hapi-fhir-validation-resources-dstu3/.project +++ /dev/null @@ -1,29 +0,0 @@ - - - hapi-fhir-validation-resources-dstu3 - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.wst.common.project.facet.core.builder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.m2e.core.maven2Nature - org.eclipse.wst.common.project.facet.core.nature - org.eclipse.jdt.core.javanature - - diff --git a/hapi-fhir-validation-resources-dstu3/.settings/org.eclipse.core.resources.prefs b/hapi-fhir-validation-resources-dstu3/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c0203a..00000000000 --- a/hapi-fhir-validation-resources-dstu3/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/hapi-fhir-validation-resources-dstu3/.settings/org.eclipse.jdt.core.prefs b/hapi-fhir-validation-resources-dstu3/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index f42de363afa..00000000000 --- a/hapi-fhir-validation-resources-dstu3/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,7 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 -org.eclipse.jdt.core.compiler.compliance=1.7 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.7 diff --git a/hapi-fhir-validation-resources-dstu3/.settings/org.eclipse.m2e.core.prefs b/hapi-fhir-validation-resources-dstu3/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f1cb2..00000000000 --- a/hapi-fhir-validation-resources-dstu3/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/hapi-fhir-validation-resources-dstu3/.settings/org.eclipse.wst.common.project.facet.core.xml b/hapi-fhir-validation-resources-dstu3/.settings/org.eclipse.wst.common.project.facet.core.xml deleted file mode 100644 index bc0009a4558..00000000000 --- a/hapi-fhir-validation-resources-dstu3/.settings/org.eclipse.wst.common.project.facet.core.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/hapi-tinder-plugin/.classpath b/hapi-tinder-plugin/.classpath deleted file mode 100644 index 3f5d899f8a4..00000000000 --- a/hapi-tinder-plugin/.classpath +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/hapi-tinder-plugin/.project b/hapi-tinder-plugin/.project deleted file mode 100644 index 4b1d6b774f0..00000000000 --- a/hapi-tinder-plugin/.project +++ /dev/null @@ -1,36 +0,0 @@ - - - hapi-tinder-plugin - NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse. - - - - - org.eclipse.wst.common.project.facet.core.builder - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.wst.validation.validationbuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.jem.workbench.JavaEMFNature - org.eclipse.wst.common.modulecore.ModuleCoreNature - org.eclipse.m2e.core.maven2Nature - org.eclipse.jdt.core.javanature - org.eclipse.wst.common.project.facet.core.nature - - diff --git a/hapi-tinder-plugin/.settings/org.eclipse.core.resources.prefs b/hapi-tinder-plugin/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 29abf999564..00000000000 --- a/hapi-tinder-plugin/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,6 +0,0 @@ -eclipse.preferences.version=1 -encoding//src/main/java=UTF-8 -encoding//src/main/resources=UTF-8 -encoding//src/test/java=UTF-8 -encoding//src/test/resources=UTF-8 -encoding/=UTF-8 diff --git a/hapi-tinder-plugin/.settings/org.eclipse.jdt.core.prefs b/hapi-tinder-plugin/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 15441008ab1..00000000000 --- a/hapi-tinder-plugin/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,402 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled -org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore -org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull -org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault -org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable -org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.autoboxing=ignore -org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning -org.eclipse.jdt.core.compiler.problem.deadCode=warning -org.eclipse.jdt.core.compiler.problem.deprecation=warning -org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled -org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled -org.eclipse.jdt.core.compiler.problem.discouragedReference=warning -org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore -org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore -org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled -org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore -org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning -org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning -org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled -org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning -org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning -org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore -org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore -org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning -org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore -org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore -org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled -org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled -org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning -org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore -org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning -org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning -org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore -org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning -org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error -org.eclipse.jdt.core.compiler.problem.nullReference=warning -org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error -org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning -org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning -org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore -org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore -org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore -org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore -org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning -org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning -org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore -org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore -org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore -org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore -org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore -org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled -org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning -org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled -org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled -org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled -org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore -org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning -org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled -org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning -org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning -org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore -org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning -org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore -org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore -org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled -org.eclipse.jdt.core.compiler.problem.unusedImport=warning -org.eclipse.jdt.core.compiler.problem.unusedLabel=warning -org.eclipse.jdt.core.compiler.problem.unusedLocal=warning -org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore -org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore -org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled -org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning -org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore -org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning -org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.6 -org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 -org.eclipse.jdt.core.formatter.align_type_members_on_columns=false -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_assignment=0 -org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 -org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 -org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 -org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 -org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header=0 -org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 -org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 -org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references=0 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80 -org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 -org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_type_arguments=0 -org.eclipse.jdt.core.formatter.alignment_for_type_parameters=0 -org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16 -org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_after_package=1 -org.eclipse.jdt.core.formatter.blank_lines_before_field=0 -org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0 -org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 -org.eclipse.jdt.core.formatter.blank_lines_before_method=1 -org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 -org.eclipse.jdt.core.formatter.blank_lines_before_package=0 -org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 -org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 -org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false -org.eclipse.jdt.core.formatter.comment.format_block_comments=true -org.eclipse.jdt.core.formatter.comment.format_header=true -org.eclipse.jdt.core.formatter.comment.format_html=true -org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true -org.eclipse.jdt.core.formatter.comment.format_line_comments=true -org.eclipse.jdt.core.formatter.comment.format_source_code=true -org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true -org.eclipse.jdt.core.formatter.comment.indent_root_tags=true -org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert -org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert -org.eclipse.jdt.core.formatter.comment.line_length=200 -org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true -org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true -org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false -org.eclipse.jdt.core.formatter.compact_else_if=true -org.eclipse.jdt.core.formatter.continuation_indentation=2 -org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 -org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off -org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on -org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false -org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true -org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_empty_lines=false -org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true -org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false -org.eclipse.jdt.core.formatter.indentation.size=3 -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert -org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert -org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert -org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.join_lines_in_comments=false -org.eclipse.jdt.core.formatter.join_wrapped_lines=false -org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false -org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false -org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false -org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false -org.eclipse.jdt.core.formatter.lineSplit=200 -org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false -org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false -org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 -org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1 -org.eclipse.jdt.core.formatter.parentheses_positions_in_annotation=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_catch_clause=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_enum_constant_declaration=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_for_statment=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_if_while_statement=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_lambda_declaration=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_method_delcaration=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_method_invocation=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause=common_lines -org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true -org.eclipse.jdt.core.formatter.tabulation.char=tab -org.eclipse.jdt.core.formatter.tabulation.size=3 -org.eclipse.jdt.core.formatter.use_on_off_tags=true -org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false -org.eclipse.jdt.core.formatter.wrap_before_assignment_operator=false -org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true -org.eclipse.jdt.core.formatter.wrap_before_conditional_operator=true -org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true -org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true -org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter diff --git a/hapi-tinder-plugin/.settings/org.eclipse.jdt.ui.prefs b/hapi-tinder-plugin/.settings/org.eclipse.jdt.ui.prefs deleted file mode 100644 index 5382e703e79..00000000000 --- a/hapi-tinder-plugin/.settings/org.eclipse.jdt.ui.prefs +++ /dev/null @@ -1,3 +0,0 @@ -eclipse.preferences.version=1 -formatter_profile=_James -formatter_settings_version=12 diff --git a/hapi-tinder-plugin/.settings/org.eclipse.m2e.core.prefs b/hapi-tinder-plugin/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f1cb2..00000000000 --- a/hapi-tinder-plugin/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/hapi-tinder-test/.classpath b/hapi-tinder-test/.classpath deleted file mode 100644 index ead18831e48..00000000000 --- a/hapi-tinder-test/.classpath +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/hapi-tinder-test/.project b/hapi-tinder-test/.project deleted file mode 100644 index dea54c136b3..00000000000 --- a/hapi-tinder-test/.project +++ /dev/null @@ -1,23 +0,0 @@ - - - hapi-tinder-test - NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse. - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.m2e.core.maven2Nature - org.eclipse.jdt.core.javanature - - diff --git a/hapi-tinder-test/.settings/org.eclipse.core.resources.prefs b/hapi-tinder-test/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index cdfe4f1b669..00000000000 --- a/hapi-tinder-test/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,5 +0,0 @@ -eclipse.preferences.version=1 -encoding//src/main/java=UTF-8 -encoding//src/test/java=UTF-8 -encoding//src/test/resources=UTF-8 -encoding/=UTF-8 diff --git a/hapi-tinder-test/.settings/org.eclipse.jdt.core.prefs b/hapi-tinder-test/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 5ce45188994..00000000000 --- a/hapi-tinder-test/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,13 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.6 diff --git a/hapi-tinder-test/.settings/org.eclipse.m2e.core.prefs b/hapi-tinder-test/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f1cb2..00000000000 --- a/hapi-tinder-test/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/restful-server-example-test/.classpath b/restful-server-example-test/.classpath deleted file mode 100644 index afcbba556d2..00000000000 --- a/restful-server-example-test/.classpath +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/restful-server-example-test/.project b/restful-server-example-test/.project deleted file mode 100644 index 7e28d1c5f31..00000000000 --- a/restful-server-example-test/.project +++ /dev/null @@ -1,23 +0,0 @@ - - - restful-server-example-test - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.jdt.core.javanature - org.eclipse.m2e.core.maven2Nature - - diff --git a/restful-server-example-test/.settings/org.eclipse.core.resources.prefs b/restful-server-example-test/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 8dd9b1df3d6..00000000000 --- a/restful-server-example-test/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,3 +0,0 @@ -eclipse.preferences.version=1 -encoding//src/test/java=UTF-8 -encoding/=UTF-8 diff --git a/restful-server-example-test/.settings/org.eclipse.jdt.core.prefs b/restful-server-example-test/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 60105c1b951..00000000000 --- a/restful-server-example-test/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,5 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.6 diff --git a/restful-server-example-test/.settings/org.eclipse.m2e.core.prefs b/restful-server-example-test/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f1cb2..00000000000 --- a/restful-server-example-test/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/restful-server-example/.classpath b/restful-server-example/.classpath deleted file mode 100644 index 0b809b9cdb8..00000000000 --- a/restful-server-example/.classpath +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/restful-server-example/.settings/.jsdtscope b/restful-server-example/.settings/.jsdtscope deleted file mode 100644 index b72a6a47b2e..00000000000 --- a/restful-server-example/.settings/.jsdtscope +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - diff --git a/restful-server-example/.settings/org.eclipse.core.resources.prefs b/restful-server-example/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index e9441bb123e..00000000000 --- a/restful-server-example/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,3 +0,0 @@ -eclipse.preferences.version=1 -encoding//src/main/java=UTF-8 -encoding/=UTF-8 diff --git a/restful-server-example/.settings/org.eclipse.jdt.core.prefs b/restful-server-example/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 69c31cd493c..00000000000 --- a/restful-server-example/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,8 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.6 diff --git a/restful-server-example/.settings/org.eclipse.m2e.core.prefs b/restful-server-example/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f1cb2..00000000000 --- a/restful-server-example/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/restful-server-example/.settings/org.eclipse.wst.common.component b/restful-server-example/.settings/org.eclipse.wst.common.component deleted file mode 100644 index a2d9301fa62..00000000000 --- a/restful-server-example/.settings/org.eclipse.wst.common.component +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - uses - - - uses - - - consumes - - - consumes - - - - - diff --git a/restful-server-example/.settings/org.eclipse.wst.common.project.facet.core.xml b/restful-server-example/.settings/org.eclipse.wst.common.project.facet.core.xml deleted file mode 100644 index 5a887262619..00000000000 --- a/restful-server-example/.settings/org.eclipse.wst.common.project.facet.core.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/restful-server-example/.settings/org.eclipse.wst.jsdt.ui.superType.container b/restful-server-example/.settings/org.eclipse.wst.jsdt.ui.superType.container deleted file mode 100644 index 3bd5d0a4803..00000000000 --- a/restful-server-example/.settings/org.eclipse.wst.jsdt.ui.superType.container +++ /dev/null @@ -1 +0,0 @@ -org.eclipse.wst.jsdt.launching.baseBrowserLibrary \ No newline at end of file diff --git a/restful-server-example/.settings/org.eclipse.wst.jsdt.ui.superType.name b/restful-server-example/.settings/org.eclipse.wst.jsdt.ui.superType.name deleted file mode 100644 index 05bd71b6ec2..00000000000 --- a/restful-server-example/.settings/org.eclipse.wst.jsdt.ui.superType.name +++ /dev/null @@ -1 +0,0 @@ -Window \ No newline at end of file diff --git a/restful-server-example/.settings/org.eclipse.wst.validation.prefs b/restful-server-example/.settings/org.eclipse.wst.validation.prefs deleted file mode 100644 index 04cad8cb752..00000000000 --- a/restful-server-example/.settings/org.eclipse.wst.validation.prefs +++ /dev/null @@ -1,2 +0,0 @@ -disabled=06target -eclipse.preferences.version=1 From a150a96089d401c1c5cc8f117c0b1a0fa0df53a3 Mon Sep 17 00:00:00 2001 From: sekaijin Date: Sun, 29 Jan 2017 19:22:28 +0100 Subject: [PATCH 09/31] dependencies convergence correct dependencies convergence correct version use ${project.version} --- examples/pom.xml | 19 +- hapi-fhir-android/pom.xml | 10 +- hapi-fhir-base-test-mindeps-client/pom.xml | 17 +- hapi-fhir-base-test-mindeps-server/pom.xml | 16 +- hapi-fhir-base/pom.xml | 7 +- hapi-fhir-cli/hapi-fhir-cli-app/pom.xml | 26 +- hapi-fhir-cli/hapi-fhir-cli-jpaserver/pom.xml | 18 +- hapi-fhir-client-okhttp/pom.xml | 6 +- hapi-fhir-dist/pom.xml | 52 +-- hapi-fhir-jacoco/pom.xml | 46 ++- hapi-fhir-jaxrsserver-base/pom.xml | 6 +- hapi-fhir-jaxrsserver-example/pom.xml | 4 +- hapi-fhir-jpaserver-base/pom.xml | 52 ++- hapi-fhir-jpaserver-example/pom.xml | 18 +- .../pom.xml | 6 + hapi-fhir-jpaserver-uhnfhirtest/pom.xml | 18 +- hapi-fhir-osgi-core/pom.xml | 20 +- hapi-fhir-structures-dstu/pom.xml | 24 +- hapi-fhir-structures-dstu2.1/pom.xml | 29 +- hapi-fhir-structures-dstu2/pom.xml | 42 ++- hapi-fhir-structures-dstu3/pom.xml | 14 +- hapi-fhir-structures-hl7org-dstu2/pom.xml | 34 +- hapi-fhir-testpage-overlay/pom.xml | 10 +- hapi-fhir-tutorial/skeleton-project/pom.xml | 7 +- hapi-fhir-validation-resources-dstu3/pom.xml | 2 +- hapi-tinder-plugin/pom.xml | 91 ++++- .../ca/uhn/fhir/tinder/ValueSetGenerator.java | 8 +- hapi-tinder-test/pom.xml | 316 +++++++++++------- pom.xml | 5 + restful-server-example-test/pom.xml | 4 +- restful-server-example/pom.xml | 8 +- 31 files changed, 661 insertions(+), 274 deletions(-) diff --git a/examples/pom.xml b/examples/pom.xml index 863259dfa56..aff4b8f2b3e 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -18,37 +18,32 @@ ca.uhn.hapi.fhir hapi-fhir-base - 2.3-SNAPSHOT + ${project.version} ca.uhn.hapi.fhir hapi-fhir-structures-dstu2 - 2.3-SNAPSHOT + ${project.version} ca.uhn.hapi.fhir hapi-fhir-structures-dstu3 - 2.3-SNAPSHOT + ${project.version} ca.uhn.hapi.fhir hapi-fhir-structures-hl7org-dstu2 - 2.3-SNAPSHOT + ${project.version} ca.uhn.hapi.fhir hapi-fhir-validation-resources-dstu2 - 2.3-SNAPSHOT + ${project.version} ca.uhn.hapi.fhir hapi-fhir-client-okhttp - 2.3-SNAPSHOT - - - ca.uhn.hapi.fhir - hapi-fhir-jaxrsserver-base - 2.3-SNAPSHOT + ${project.version} javax.servlet @@ -59,7 +54,7 @@ ca.uhn.hapi.fhir hapi-fhir-jaxrsserver-base - 2.3-SNAPSHOT + ${project.version} javax.ws.rs diff --git a/hapi-fhir-android/pom.xml b/hapi-fhir-android/pom.xml index 768b04308c6..78559a549e3 100644 --- a/hapi-fhir-android/pom.xml +++ b/hapi-fhir-android/pom.xml @@ -29,7 +29,7 @@ ca.uhn.hapi.fhir hapi-fhir-base - 2.3-SNAPSHOT + ${project.version} commons-codec @@ -40,25 +40,25 @@ ca.uhn.hapi.fhir hapi-fhir-structures-dstu - 2.3-SNAPSHOT + ${project.version} true ca.uhn.hapi.fhir hapi-fhir-structures-dstu2 - 2.3-SNAPSHOT + ${project.version} true ca.uhn.hapi.fhir hapi-fhir-structures-dstu3 - 2.3-SNAPSHOT + ${project.version} true ca.uhn.hapi.fhir hapi-fhir-client-okhttp - 2.3-SNAPSHOT + ${project.version} commons-codec diff --git a/hapi-fhir-base-test-mindeps-client/pom.xml b/hapi-fhir-base-test-mindeps-client/pom.xml index 28a6d724960..4e11992215e 100644 --- a/hapi-fhir-base-test-mindeps-client/pom.xml +++ b/hapi-fhir-base-test-mindeps-client/pom.xml @@ -24,13 +24,18 @@ org.slf4j slf4j-simple 1.6.0 + + + slf4j-api + org.slf4j + + com.google.code.gson gson - 2.3.1 @@ -42,7 +37,6 @@ com.google.code.gson gson - 2.3.1 @@ -48,6 +47,12 @@ com.phloc phloc-schematron true + + com.phloc diff --git a/hapi-fhir-cli/hapi-fhir-cli-app/pom.xml b/hapi-fhir-cli/hapi-fhir-cli-app/pom.xml index 1b8f49362cb..b84a47a4f2e 100644 --- a/hapi-fhir-cli/hapi-fhir-cli-app/pom.xml +++ b/hapi-fhir-cli/hapi-fhir-cli-app/pom.xml @@ -21,57 +21,57 @@ ca.uhn.hapi.fhir hapi-fhir-base - 2.3-SNAPSHOT + ${project.version} ca.uhn.hapi.fhir hapi-fhir-cli-jpaserver - 2.3-SNAPSHOT + ${project.version} war ca.uhn.hapi.fhir hapi-fhir-cli-jpaserver - 2.3-SNAPSHOT + ${project.version} jar classes ca.uhn.hapi.fhir hapi-fhir-testpage-overlay - 2.3-SNAPSHOT + ${project.version} classes ca.uhn.hapi.fhir hapi-fhir-structures-dstu - 2.3-SNAPSHOT + ${project.version} ca.uhn.hapi.fhir hapi-fhir-structures-dstu2 - 2.3-SNAPSHOT + ${project.version} ca.uhn.hapi.fhir hapi-fhir-structures-dstu3 - 2.3-SNAPSHOT + ${project.version} ca.uhn.hapi.fhir hapi-fhir-structures-hl7org-dstu2 - 2.3-SNAPSHOT + ${project.version} ca.uhn.hapi.fhir hapi-fhir-validation-resources-dstu2 - 2.3-SNAPSHOT + ${project.version} ca.uhn.hapi.fhir hapi-fhir-validation-resources-dstu3 - 2.3-SNAPSHOT + ${project.version} @@ -174,6 +174,12 @@ com.phloc phloc-schematron + + + Saxon-HE + net.sf.saxon + + com.phloc diff --git a/hapi-fhir-cli/hapi-fhir-cli-jpaserver/pom.xml b/hapi-fhir-cli/hapi-fhir-cli-jpaserver/pom.xml index b261da71ff6..3677da08cd8 100644 --- a/hapi-fhir-cli/hapi-fhir-cli-jpaserver/pom.xml +++ b/hapi-fhir-cli/hapi-fhir-cli-jpaserver/pom.xml @@ -21,7 +21,7 @@ ca.uhn.hapi.fhir hapi-fhir-base - 2.3-SNAPSHOT + ${project.version} provided @@ -29,33 +29,33 @@ ca.uhn.hapi.fhir hapi-fhir-structures-dstu - 2.3-SNAPSHOT + ${project.version} ca.uhn.hapi.fhir hapi-fhir-structures-dstu2 - 2.3-SNAPSHOT + ${project.version} ca.uhn.hapi.fhir hapi-fhir-jpaserver-base - 2.3-SNAPSHOT + ${project.version} ca.uhn.hapi.fhir hapi-fhir-testpage-overlay - 2.3-SNAPSHOT + ${project.version} war provided ca.uhn.hapi.fhir hapi-fhir-testpage-overlay - 2.3-SNAPSHOT + ${project.version} classes provided @@ -146,6 +146,12 @@ com.phloc phloc-schematron + + + Saxon-HE + net.sf.saxon + + diff --git a/hapi-fhir-client-okhttp/pom.xml b/hapi-fhir-client-okhttp/pom.xml index 164e3d6536e..e565b48ee87 100644 --- a/hapi-fhir-client-okhttp/pom.xml +++ b/hapi-fhir-client-okhttp/pom.xml @@ -18,7 +18,7 @@ ca.uhn.hapi.fhir hapi-fhir-base - 2.3-SNAPSHOT + ${project.version} commons-logging @@ -38,12 +38,12 @@ ca.uhn.hapi.fhir hapi-fhir-structures-dstu2 - 2.3-SNAPSHOT + ${project.version} ca.uhn.hapi.fhir hapi-fhir-structures-dstu3 - 2.3-SNAPSHOT + ${project.version} diff --git a/hapi-fhir-dist/pom.xml b/hapi-fhir-dist/pom.xml index bd47a54f59d..f321fbfe21a 100644 --- a/hapi-fhir-dist/pom.xml +++ b/hapi-fhir-dist/pom.xml @@ -36,19 +36,19 @@ ca.uhn.hapi.fhir hapi-fhir-base - 2.3-SNAPSHOT + ${project.version} ca.uhn.hapi.fhir hapi-fhir-base - 2.3-SNAPSHOT + ${project.version} sources provided ca.uhn.hapi.fhir hapi-fhir-base - 2.3-SNAPSHOT + ${project.version} javadoc provided @@ -56,19 +56,19 @@ ca.uhn.hapi.fhir hapi-fhir-structures-dstu - 2.3-SNAPSHOT + ${project.version} ca.uhn.hapi.fhir hapi-fhir-structures-dstu - 2.3-SNAPSHOT + ${project.version} sources provided ca.uhn.hapi.fhir hapi-fhir-structures-dstu - 2.3-SNAPSHOT + ${project.version} javadoc provided @@ -76,19 +76,19 @@ ca.uhn.hapi.fhir hapi-fhir-structures-dstu2 - 2.3-SNAPSHOT + ${project.version} ca.uhn.hapi.fhir hapi-fhir-structures-dstu2 - 2.3-SNAPSHOT + ${project.version} sources provided ca.uhn.hapi.fhir hapi-fhir-structures-dstu2 - 2.3-SNAPSHOT + ${project.version} javadoc provided @@ -96,19 +96,19 @@ ca.uhn.hapi.fhir hapi-fhir-structures-hl7org-dstu2 - 2.3-SNAPSHOT + ${project.version} ca.uhn.hapi.fhir hapi-fhir-structures-hl7org-dstu2 - 2.3-SNAPSHOT + ${project.version} sources provided ca.uhn.hapi.fhir hapi-fhir-structures-hl7org-dstu2 - 2.3-SNAPSHOT + ${project.version} javadoc provided @@ -116,19 +116,19 @@ ca.uhn.hapi.fhir hapi-fhir-structures-dstu2.1 - 2.3-SNAPSHOT + ${project.version} ca.uhn.hapi.fhir hapi-fhir-structures-dstu2.1 - 2.3-SNAPSHOT + ${project.version} sources provided ca.uhn.hapi.fhir hapi-fhir-structures-dstu2.1 - 2.3-SNAPSHOT + ${project.version} javadoc provided @@ -136,19 +136,19 @@ ca.uhn.hapi.fhir hapi-fhir-structures-dstu3 - 2.3-SNAPSHOT + ${project.version} ca.uhn.hapi.fhir hapi-fhir-structures-dstu3 - 2.3-SNAPSHOT + ${project.version} sources provided ca.uhn.hapi.fhir hapi-fhir-structures-dstu3 - 2.3-SNAPSHOT + ${project.version} javadoc provided @@ -156,30 +156,30 @@ ca.uhn.hapi.fhir hapi-fhir-validation-resources-dstu2 - 2.3-SNAPSHOT + ${project.version} ca.uhn.hapi.fhir hapi-fhir-validation-resources-dstu2.1 - 2.3-SNAPSHOT + ${project.version} ca.uhn.hapi.fhir hapi-fhir-validation-resources-dstu3 - 2.3-SNAPSHOT + ${project.version} ca.uhn.hapi.fhir hapi-fhir-cli-app - 2.3-SNAPSHOT + ${project.version} provided ca.uhn.hapi.fhir hapi-fhir-android - 2.3-SNAPSHOT + ${project.version} provided @@ -194,6 +194,12 @@ com.phloc phloc-schematron + + + Saxon-HE + net.sf.saxon + + com.phloc diff --git a/hapi-fhir-jacoco/pom.xml b/hapi-fhir-jacoco/pom.xml index 86269737fbd..8ca8da8f602 100644 --- a/hapi-fhir-jacoco/pom.xml +++ b/hapi-fhir-jacoco/pom.xml @@ -19,52 +19,58 @@ ca.uhn.hapi.fhir hapi-fhir-base - 2.3-SNAPSHOT + ${project.version} ca.uhn.hapi.fhir hapi-fhir-structures-dstu - 2.3-SNAPSHOT + ${project.version} ca.uhn.hapi.fhir hapi-fhir-structures-dstu2 - 2.3-SNAPSHOT + ${project.version} ca.uhn.hapi.fhir hapi-fhir-structures-dstu3 - 2.3-SNAPSHOT + ${project.version} ca.uhn.hapi.fhir hapi-fhir-structures-hl7org-dstu2 - 2.3-SNAPSHOT + ${project.version} ca.uhn.hapi.fhir hapi-fhir-validation-resources-dstu2 - 2.3-SNAPSHOT + ${project.version} ca.uhn.hapi.fhir hapi-fhir-validation-resources-dstu3 - 2.3-SNAPSHOT + ${project.version} ca.uhn.hapi.fhir hapi-fhir-jpaserver-base - 2.3-SNAPSHOT + ${project.version} ca.uhn.hapi.fhir hapi-fhir-client-okhttp - 2.3-SNAPSHOT + ${project.version} com.phloc phloc-schematron + + + Saxon-HE + net.sf.saxon + + com.phloc @@ -139,6 +145,14 @@ commons-logging commons-logging + + commons-lang + commons-lang + + + ezmorph + net.sf.ezmorph + @@ -146,6 +160,20 @@ json-lib jdk15-sources test + + + commons-logging + commons-logging + + + commons-lang + commons-lang + + + ezmorph + net.sf.ezmorph + + directory-naming diff --git a/hapi-fhir-jaxrsserver-base/pom.xml b/hapi-fhir-jaxrsserver-base/pom.xml index 1fdd77dae5e..0c8adc6993a 100644 --- a/hapi-fhir-jaxrsserver-base/pom.xml +++ b/hapi-fhir-jaxrsserver-base/pom.xml @@ -18,7 +18,7 @@ ca.uhn.hapi.fhir hapi-fhir-base - 2.3-SNAPSHOT + ${project.version} commons-logging @@ -38,12 +38,12 @@ ca.uhn.hapi.fhir hapi-fhir-structures-dstu2 - 2.3-SNAPSHOT + ${project.version} ca.uhn.hapi.fhir hapi-fhir-structures-dstu3 - 2.3-SNAPSHOT + ${project.version} diff --git a/hapi-fhir-jaxrsserver-example/pom.xml b/hapi-fhir-jaxrsserver-example/pom.xml index c404cf05796..8bc2b7d3fca 100644 --- a/hapi-fhir-jaxrsserver-example/pom.xml +++ b/hapi-fhir-jaxrsserver-example/pom.xml @@ -31,13 +31,13 @@ ca.uhn.hapi.fhir hapi-fhir-jaxrsserver-base - 2.3-SNAPSHOT + ${project.version} javax.ws.rs javax.ws.rs-api - 2.0 + 2.0.1 provided diff --git a/hapi-fhir-jpaserver-base/pom.xml b/hapi-fhir-jpaserver-base/pom.xml index 3f5f9a01fc6..2c123d151d8 100644 --- a/hapi-fhir-jpaserver-base/pom.xml +++ b/hapi-fhir-jpaserver-base/pom.xml @@ -23,7 +23,7 @@ ca.uhn.hapi.fhir hapi-fhir-base - 2.3-SNAPSHOT + ${project.version} commons-logging @@ -34,32 +34,32 @@ ca.uhn.hapi.fhir hapi-fhir-structures-dstu - 2.3-SNAPSHOT + ${project.version} ca.uhn.hapi.fhir hapi-fhir-structures-dstu2 - 2.3-SNAPSHOT + ${project.version} ca.uhn.hapi.fhir hapi-fhir-structures-dstu3 - 2.3-SNAPSHOT + ${project.version} ca.uhn.hapi.fhir hapi-fhir-structures-hl7org-dstu2 - 2.3-SNAPSHOT + ${project.version} ca.uhn.hapi.fhir hapi-fhir-validation-resources-dstu2 - 2.3-SNAPSHOT + ${project.version} ca.uhn.hapi.fhir hapi-fhir-validation-resources-dstu3 - 2.3-SNAPSHOT + ${project.version} @@ -87,6 +87,12 @@ com.phloc phloc-schematron test + + + Saxon-HE + net.sf.saxon + + com.phloc @@ -104,6 +110,12 @@ net.riotopsys json_patch + + + com.google.code.gson + gson + + com.github.dnault @@ -183,6 +195,12 @@ org.springframework.data spring-data-jpa + + + spring-aop + org.springframework + + org.springframework @@ -233,6 +251,16 @@ org.hibernate hibernate-validator + + + com.fasterxml + classmate + + + org.jboss.logging + jboss-logging + + javax.transaction @@ -424,7 +452,7 @@ ca.uhn.hapi.fhir hapi-tinder-plugin - 2.3-SNAPSHOT + ${project.version} build_dstu1 @@ -476,22 +504,22 @@ ca.uhn.hapi.fhir hapi-fhir-structures-dstu - 2.3-SNAPSHOT + ${project.version} ca.uhn.hapi.fhir hapi-fhir-structures-dstu2 - 2.3-SNAPSHOT + ${project.version} ca.uhn.hapi.fhir hapi-fhir-structures-dstu3 - 2.3-SNAPSHOT + ${project.version} ca.uhn.hapi.fhir hapi-fhir-validation-resources-dstu3 - 2.3-SNAPSHOT + ${project.version} diff --git a/hapi-fhir-jpaserver-example/pom.xml b/hapi-fhir-jpaserver-example/pom.xml index 44bd920cb91..633805ed416 100644 --- a/hapi-fhir-jpaserver-example/pom.xml +++ b/hapi-fhir-jpaserver-example/pom.xml @@ -35,40 +35,40 @@ ca.uhn.hapi.fhir hapi-fhir-base - 2.3-SNAPSHOT + ${project.version} ca.uhn.hapi.fhir hapi-fhir-structures-dstu - 2.3-SNAPSHOT + ${project.version} ca.uhn.hapi.fhir hapi-fhir-structures-dstu2 - 2.3-SNAPSHOT + ${project.version} ca.uhn.hapi.fhir hapi-fhir-jpaserver-base - 2.3-SNAPSHOT + ${project.version} ca.uhn.hapi.fhir hapi-fhir-testpage-overlay - 2.3-SNAPSHOT + ${project.version} war provided ca.uhn.hapi.fhir hapi-fhir-testpage-overlay - 2.3-SNAPSHOT + ${project.version} classes provided @@ -164,6 +164,12 @@ com.phloc phloc-schematron + + + Saxon-HE + net.sf.saxon + + diff --git a/hapi-fhir-jpaserver-examples/hapi-fhir-jpaserver-example-postgres/pom.xml b/hapi-fhir-jpaserver-examples/hapi-fhir-jpaserver-example-postgres/pom.xml index e8ad8294b43..3cb4741f06c 100644 --- a/hapi-fhir-jpaserver-examples/hapi-fhir-jpaserver-example-postgres/pom.xml +++ b/hapi-fhir-jpaserver-examples/hapi-fhir-jpaserver-example-postgres/pom.xml @@ -140,6 +140,12 @@ com.phloc phloc-schematron + + + Saxon-HE + net.sf.saxon + + diff --git a/hapi-fhir-jpaserver-uhnfhirtest/pom.xml b/hapi-fhir-jpaserver-uhnfhirtest/pom.xml index 67141b3300c..4d5b7bc5b01 100644 --- a/hapi-fhir-jpaserver-uhnfhirtest/pom.xml +++ b/hapi-fhir-jpaserver-uhnfhirtest/pom.xml @@ -23,34 +23,34 @@ ca.uhn.hapi.fhir hapi-fhir-jpaserver-base - 2.3-SNAPSHOT + ${project.version} ca.uhn.hapi.fhir hapi-fhir-structures-dstu - 2.3-SNAPSHOT + ${project.version} ca.uhn.hapi.fhir hapi-fhir-structures-dstu2 - 2.3-SNAPSHOT + ${project.version} ca.uhn.hapi.fhir hapi-fhir-structures-hl7org-dstu2 - 2.3-SNAPSHOT + ${project.version} ca.uhn.hapi.fhir hapi-fhir-testpage-overlay - 2.3-SNAPSHOT + ${project.version} war provided ca.uhn.hapi.fhir hapi-fhir-testpage-overlay - 2.3-SNAPSHOT + ${project.version} classes provided @@ -58,6 +58,12 @@ com.phloc phloc-schematron + + + Saxon-HE + net.sf.saxon + + com.phloc diff --git a/hapi-fhir-osgi-core/pom.xml b/hapi-fhir-osgi-core/pom.xml index bffe2431148..673f51b9abf 100644 --- a/hapi-fhir-osgi-core/pom.xml +++ b/hapi-fhir-osgi-core/pom.xml @@ -19,37 +19,37 @@ ca.uhn.hapi.fhir hapi-fhir-base - 2.3-SNAPSHOT + ${project.version} ca.uhn.hapi.fhir hapi-fhir-structures-dstu - 2.3-SNAPSHOT + ${project.version} ca.uhn.hapi.fhir hapi-fhir-structures-dstu2 - 2.3-SNAPSHOT + ${project.version} ca.uhn.hapi.fhir hapi-fhir-structures-hl7org-dstu2 - 2.3-SNAPSHOT + ${project.version} ca.uhn.hapi.fhir hapi-fhir-structures-dstu3 - 2.3-SNAPSHOT + ${project.version} ca.uhn.hapi.fhir hapi-fhir-validation-resources-dstu2 - 2.3-SNAPSHOT + ${project.version} ca.uhn.hapi.fhir hapi-fhir-validation-resources-dstu3 - 2.3-SNAPSHOT + ${project.version} @@ -59,6 +59,12 @@ com.phloc phloc-schematron + + + Saxon-HE + net.sf.saxon + + com.phloc diff --git a/hapi-fhir-structures-dstu/pom.xml b/hapi-fhir-structures-dstu/pom.xml index 99ba20eb4c6..1cb0d65eb58 100644 --- a/hapi-fhir-structures-dstu/pom.xml +++ b/hapi-fhir-structures-dstu/pom.xml @@ -17,7 +17,7 @@ ca.uhn.hapi.fhir hapi-fhir-base - 2.3-SNAPSHOT + ${project.version} + com.phloc @@ -128,13 +134,32 @@ commons-logging commons-logging + + commons-lang + commons-lang + + + commons-lang + commons-lang + 2.5 + net.sf.json-lib json-lib jdk15-sources test + + + commons-logging + commons-logging + + directory-naming diff --git a/hapi-fhir-structures-dstu2/pom.xml b/hapi-fhir-structures-dstu2/pom.xml index 515ecd7f0c0..8c7a751c486 100644 --- a/hapi-fhir-structures-dstu2/pom.xml +++ b/hapi-fhir-structures-dstu2/pom.xml @@ -17,13 +17,13 @@ ca.uhn.hapi.fhir hapi-fhir-base - 2.3-SNAPSHOT + ${project.version} ca.uhn.hapi.fhir hapi-fhir-validation-resources-dstu2 - 2.3-SNAPSHOT + ${project.version} test @@ -89,7 +89,13 @@ com.phloc phloc-schematron - test + test com.phloc @@ -110,6 +116,14 @@ commons-logging commons-logging + + commons-lang + commons-lang + @@ -118,6 +132,26 @@ 2.4 jdk15-sources test + + + commons-logging + commons-logging + + + commons-lang + commons-lang + + + + + commons-lang + commons-lang + 2.5 + test directory-naming @@ -179,7 +213,7 @@ ca.uhn.hapi.fhir hapi-tinder-plugin - 2.3-SNAPSHOT + ${project.version} generate diff --git a/hapi-fhir-structures-dstu3/pom.xml b/hapi-fhir-structures-dstu3/pom.xml index e506fca0beb..f1a591a138b 100644 --- a/hapi-fhir-structures-dstu3/pom.xml +++ b/hapi-fhir-structures-dstu3/pom.xml @@ -18,12 +18,12 @@ ca.uhn.hapi.fhir hapi-fhir-base - 2.3-SNAPSHOT + ${project.version} ca.uhn.hapi.fhir hapi-fhir-validation-resources-dstu3 - 2.3-SNAPSHOT + ${project.version} test @@ -123,6 +123,10 @@ commons-logging commons-logging + + commons-lang + commons-lang + @@ -130,6 +134,12 @@ json-lib jdk15-sources test + + + commons-logging + commons-logging + + directory-naming diff --git a/hapi-fhir-structures-hl7org-dstu2/pom.xml b/hapi-fhir-structures-hl7org-dstu2/pom.xml index 60ce5d79519..c04497c465c 100644 --- a/hapi-fhir-structures-hl7org-dstu2/pom.xml +++ b/hapi-fhir-structures-hl7org-dstu2/pom.xml @@ -18,12 +18,12 @@ ca.uhn.hapi.fhir hapi-fhir-base - 2.3-SNAPSHOT + ${project.version} ca.uhn.hapi.fhir hapi-fhir-validation-resources-dstu2 - 2.3-SNAPSHOT + ${project.version} test @@ -103,6 +103,12 @@ com.phloc phloc-schematron test + + + Saxon-HE + net.sf.saxon + + com.phloc @@ -123,6 +129,14 @@ commons-logging commons-logging + + commons-lang + commons-lang + + + ezmorph + net.sf.ezmorph + @@ -131,6 +145,22 @@ 2.4 jdk15-sources test + + + commons-logging + commons-logging + + + commons-lang + commons-lang + + + + + commons-lang + commons-lang + 2.5 + test directory-naming diff --git a/hapi-fhir-testpage-overlay/pom.xml b/hapi-fhir-testpage-overlay/pom.xml index 182872e068e..efcad865f48 100644 --- a/hapi-fhir-testpage-overlay/pom.xml +++ b/hapi-fhir-testpage-overlay/pom.xml @@ -27,28 +27,28 @@ ca.uhn.hapi.fhir hapi-fhir-base - 2.3-SNAPSHOT + ${project.version} ca.uhn.hapi.fhir hapi-fhir-jpaserver-base - 2.3-SNAPSHOT + ${project.version} test ca.uhn.hapi.fhir hapi-fhir-structures-dstu - 2.3-SNAPSHOT + ${project.version} ca.uhn.hapi.fhir hapi-fhir-structures-dstu2 - 2.3-SNAPSHOT + ${project.version} ca.uhn.hapi.fhir hapi-fhir-structures-dstu3 - 2.3-SNAPSHOT + ${project.version} diff --git a/hapi-fhir-tutorial/skeleton-project/pom.xml b/hapi-fhir-tutorial/skeleton-project/pom.xml index ba4e6141e49..050113b9d87 100644 --- a/hapi-fhir-tutorial/skeleton-project/pom.xml +++ b/hapi-fhir-tutorial/skeleton-project/pom.xml @@ -67,7 +67,12 @@ com.phloc phloc-schematron - 2.7.1 + + + Saxon-HE + net.sf.saxon + + com.phloc diff --git a/hapi-fhir-validation-resources-dstu3/pom.xml b/hapi-fhir-validation-resources-dstu3/pom.xml index ca8a406cbec..b5c4aa783ba 100644 --- a/hapi-fhir-validation-resources-dstu3/pom.xml +++ b/hapi-fhir-validation-resources-dstu3/pom.xml @@ -17,7 +17,7 @@ ca.uhn.hapi.fhir hapi-fhir-base - 2.3-SNAPSHOT + ${project.version} ch.qos.logback diff --git a/hapi-tinder-plugin/pom.xml b/hapi-tinder-plugin/pom.xml index 11dad6aff02..4f6071af596 100644 --- a/hapi-tinder-plugin/pom.xml +++ b/hapi-tinder-plugin/pom.xml @@ -19,7 +19,7 @@ ca.uhn.hapi.fhir hapi-fhir-base - 2.3-SNAPSHOT + ${project.version} @@ -108,17 +161,43 @@ org.apache.maven maven-project 2.2.1 + + + org.codehaus.plexus + plexus-utils + + + org.apache.maven + maven-model + + + org.apache.maven + maven-artifact + + org.apache.maven maven-plugin-api 3.2.5 + + + org.eclipse.sisu + org.eclipse.sisu.plexus + + org.apache.maven.plugin-tools maven-plugin-annotations 3.2 provided + + + org.apache.maven + maven-artifact + + diff --git a/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/tinder/ValueSetGenerator.java b/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/tinder/ValueSetGenerator.java index d1872813549..a0b23264424 100644 --- a/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/tinder/ValueSetGenerator.java +++ b/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/tinder/ValueSetGenerator.java @@ -9,6 +9,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; import java.io.OutputStreamWriter; +import java.nio.charset.Charset; import java.util.Collection; import java.util.HashMap; import java.util.HashSet; @@ -119,7 +120,12 @@ public class ValueSetGenerator { name = "/org/hl7/fhir/instance/model/dstu3/valueset/valuesets.xml"; } ourLog.info("Loading valuesets from: {}", name); - String vs = IOUtils.toString(ValueSetGenerator.class.getResourceAsStream(name)); + InputStream is = ValueSetGenerator.class.getResourceAsStream(name); + if (null == is) { + ourLog.error("Failed loading valuesets from: " + name); + throw new FileNotFoundException(name); + } + String vs = IOUtils.toString(is, Charset.defaultCharset()); if ("dstu".equals(myVersion)) { Bundle bundle = newXmlParser.parseBundle(vs); for (BundleEntry next : bundle.getEntries()) { diff --git a/hapi-tinder-test/pom.xml b/hapi-tinder-test/pom.xml index fe5c7ccaed2..c96532291e8 100644 --- a/hapi-tinder-test/pom.xml +++ b/hapi-tinder-test/pom.xml @@ -1,4 +1,5 @@ - + 4.0.0 @@ -17,19 +18,53 @@ ca.uhn.hapi.fhir hapi-fhir-base - 2.3-SNAPSHOT + ${project.version} ca.uhn.hapi.fhir hapi-fhir-structures-dstu - 2.3-SNAPSHOT + ${project.version} ca.uhn.hapi.fhir hapi-fhir-structures-dstu2 - 2.3-SNAPSHOT + ${project.version} + + + + ca.uhn.hapi.fhir + hapi-fhir-structures-dstu2.1 + ${project.version} + + + ca.uhn.hapi.fhir + hapi-fhir-base + + + + + ca.uhn.hapi.fhir + hapi-fhir-structures-dstu3 + ${project.version} + + + ca.uhn.hapi.fhir + hapi-fhir-structures-hl7org-dstu2 + ${project.version} + + + ca.uhn.hapi.fhir + hapi-fhir-validation-resources-dstu2 + ${project.version} + + + ca.uhn.hapi.fhir + hapi-fhir-validation-resources-dstu3 + ${project.version} - junit junit @@ -41,16 +76,70 @@ - + ca.uhn.hapi.fhir hapi-tinder-plugin - 2.3-SNAPSHOT + ${project.version} + + + ca.uhn.hapi.fhir + hapi-fhir-base + ${project.version} + + + ca.uhn.hapi.fhir + hapi-fhir-structures-dstu + ${project.version} + + + ca.uhn.hapi.fhir + hapi-fhir-structures-dstu2 + ${project.version} + + + ca.uhn.hapi.fhir + hapi-fhir-structures-dstu2.1 + ${project.version} + + + ca.uhn.hapi.fhir + hapi-fhir-base + + + + + ca.uhn.hapi.fhir + hapi-fhir-structures-dstu3 + ${project.version} + + + ca.uhn.hapi.fhir + hapi-fhir-structures-hl7org-dstu2 + ${project.version} + + + ca.uhn.hapi.fhir + hapi-fhir-validation-resources-dstu2 + ${project.version} + + + ca.uhn.hapi.fhir + hapi-fhir-validation-resources-dstu3 + ${project.version} + + custom-structs @@ -179,124 +268,102 @@ - + + + + + maven-antrun-plugin + + + testTinderTask + generate-sources + + run + + + + + + + + + + + + - - ca.uhn.hapi.fhir - hapi-fhir-base - 2.3-SNAPSHOT - - - ca.uhn.hapi.fhir - hapi-fhir-structures-dstu - 2.3-SNAPSHOT - - - ca.uhn.hapi.fhir - hapi-fhir-structures-dstu2 - 2.3-SNAPSHOT - - - - - maven-antrun-plugin - - - testTinderTask - generate-sources - - run - - - - - - - - - - - - - - - - ca.uhn.hapi.fhir - hapi-fhir-base - 2.3-SNAPSHOT - + + ca.uhn.hapi.fhir + hapi-fhir-base + ${project.version} + + + ca.uhn.hapi.fhir + hapi-fhir-structures-dstu + ${project.version} + + + ca.uhn.hapi.fhir + hapi-fhir-structures-dstu2 + ${project.version} + + + ca.uhn.hapi.fhir + hapi-fhir-structures-dstu2.1 + ${project.version} + + + ca.uhn.hapi.fhir + hapi-fhir-base + + + + + ca.uhn.hapi.fhir + hapi-fhir-structures-dstu3 + ${project.version} + + + ca.uhn.hapi.fhir + hapi-fhir-structures-hl7org-dstu2 + ${project.version} + + + ca.uhn.hapi.fhir + hapi-fhir-validation-resources-dstu2 + ${project.version} + + + ca.uhn.hapi.fhir + hapi-fhir-validation-resources-dstu3 + ${project.version} + ca.uhn.hapi.fhir hapi-tinder-plugin - 2.3-SNAPSHOT + ${project.version} - - ca.uhn.hapi.fhir - hapi-fhir-structures-dstu2 - 2.3-SNAPSHOT - - - - + + org.apache.maven.plugins maven-deploy-plugin @@ -307,7 +374,8 @@ - + org.eclipse.m2e lifecycle-mapping diff --git a/pom.xml b/pom.xml index e07858d2edd..65d9954a550 100644 --- a/pom.xml +++ b/pom.xml @@ -410,6 +410,11 @@ javax.json-api 1.0 + + com.google.code.gson + gson + 2.7 + javax.mail javax.mail-api diff --git a/restful-server-example-test/pom.xml b/restful-server-example-test/pom.xml index 9a50db16dc1..7b559a97d72 100644 --- a/restful-server-example-test/pom.xml +++ b/restful-server-example-test/pom.xml @@ -17,12 +17,12 @@ ca.uhn.hapi.fhir hapi-fhir-base - 2.3-SNAPSHOT + ${project.version} ca.uhn.hapi.fhir hapi-fhir-structures-dstu2 - 2.3-SNAPSHOT + ${project.version} test diff --git a/restful-server-example/pom.xml b/restful-server-example/pom.xml index 2494784c4d2..72138f7b1c6 100644 --- a/restful-server-example/pom.xml +++ b/restful-server-example/pom.xml @@ -33,27 +33,27 @@ ca.uhn.hapi.fhir hapi-fhir-base - 2.3-SNAPSHOT + ${project.version} ca.uhn.hapi.fhir hapi-fhir-structures-dstu2 - 2.3-SNAPSHOT + ${project.version} ca.uhn.hapi.fhir hapi-fhir-testpage-overlay - 2.3-SNAPSHOT + ${project.version} war provided ca.uhn.hapi.fhir hapi-fhir-testpage-overlay - 2.3-SNAPSHOT + ${project.version} classes provided From b66aa9761e1eeca9ee9e8917b55cacf96ec545a2 Mon Sep 17 00:00:00 2001 From: James Date: Sun, 29 Jan 2017 15:49:10 -0500 Subject: [PATCH 10/31] Allow parsing of RSQuot --- .../hl7/fhir/utilities/xhtml/XhtmlParser.java | 21 ++++++++++++------- .../uhn/fhir/model/primitive/XhtmlDtTest.java | 8 +++++++ .../java/ca/uhn/fhir/model/XhtmlNodeTest.java | 11 ++++++++++ src/changes/changes.xml | 4 ++++ 4 files changed, 37 insertions(+), 7 deletions(-) diff --git a/hapi-fhir-base/src/main/java/org/hl7/fhir/utilities/xhtml/XhtmlParser.java b/hapi-fhir-base/src/main/java/org/hl7/fhir/utilities/xhtml/XhtmlParser.java index 43e8076acfc..1a54dc7db73 100644 --- a/hapi-fhir-base/src/main/java/org/hl7/fhir/utilities/xhtml/XhtmlParser.java +++ b/hapi-fhir-base/src/main/java/org/hl7/fhir/utilities/xhtml/XhtmlParser.java @@ -38,7 +38,7 @@ package org.hl7.fhir.utilities.xhtml; * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -48,7 +48,6 @@ package org.hl7.fhir.utilities.xhtml; * #L% */ - import java.io.*; import java.util.*; @@ -378,10 +377,12 @@ public class XhtmlParser { } return result; } + public XhtmlDocument parse(String source, String entryName) throws FHIRFormatError, IOException { rdr = new StringReader(source); return parse(entryName); } + private void parseAttributes(XhtmlNode node) throws FHIRFormatError, IOException { while (Character.isWhitespace(peekChar())) readChar(); @@ -410,6 +411,7 @@ public class XhtmlParser { readChar(); } } + private String parseAttributeValue(char term) throws IOException, FHIRFormatError { StringBuilder b = new StringBuilder(); while (peekChar() != '\0' && peekChar() != '>' && (term != '\0' || peekChar() != '/') && peekChar() != term) { @@ -422,6 +424,7 @@ public class XhtmlParser { readChar(); return b.toString(); } + private void parseElement(XhtmlNode parent, List parents, NSMap nsm) throws IOException, FHIRFormatError { QName name = new QName(readName()); XhtmlNode node = parent.addTag(name.getName()); @@ -438,6 +441,7 @@ public class XhtmlParser { parseElementInner(node, newParents, nsm); } } + private void parseElementInner(XhtmlNode node, List parents, NSMap nsm) throws FHIRFormatError, IOException { StringBuilder s = new StringBuilder(); while (peekChar() != '\0' && !parents.contains(unwindPoint) && !(node == unwindPoint)) { @@ -488,6 +492,7 @@ public class XhtmlParser { } addTextNode(node, s); } + private XhtmlNode parseFragment() throws IOException, FHIRException { skipWhiteSpace(); if (peekChar() != '<') @@ -558,6 +563,8 @@ public class XhtmlParser { s.append(XhtmlNode.NBSP); else if (c.equals("amp")) s.append('&'); + else if (c.equals("rsquo")) + s.append('’'); else if (c.equals("gt")) s.append('>'); else if (c.equals("lt")) @@ -860,12 +867,12 @@ public class XhtmlParser { StartElement firstEvent = (StartElement) xpp.nextEvent(); res.setName(firstEvent.getSchemaType().getLocalPart()); - for (Iterator attrIter = firstEvent.getAttributes(); attrIter.hasNext(); ) { + for (Iterator attrIter = firstEvent.getAttributes(); attrIter.hasNext();) { Attribute nextAttr = (Attribute) attrIter.next(); if (attributeIsOk(firstEvent.getName().getLocalPart(), nextAttr.getName().getLocalPart(), nextAttr.getValue())) res.getAttributes().put(nextAttr.getName().getLocalPart(), nextAttr.getValue()); } - + while (xpp.hasNext()) { XMLEvent nextEvent = xpp.nextEvent(); int eventType = nextEvent.getEventType(); @@ -873,11 +880,11 @@ public class XhtmlParser { break; } if (eventType == XMLEvent.CHARACTERS) { - res.addText(((Characters)xpp).getData()); + res.addText(((Characters) xpp).getData()); } else if (eventType == XMLEvent.COMMENT) { - res.addComment(((Comment)xpp).getText()); + res.addComment(((Comment) xpp).getText()); } else if (eventType == XMLEvent.START_ELEMENT) { - StartElement nextStart = (StartElement)nextEvent; + StartElement nextStart = (StartElement) nextEvent; if (elementIsOk(nextStart.getName().getLocalPart())) { res.getChildNodes().add(parseNode(xpp)); } diff --git a/hapi-fhir-structures-dstu/src/test/java/ca/uhn/fhir/model/primitive/XhtmlDtTest.java b/hapi-fhir-structures-dstu/src/test/java/ca/uhn/fhir/model/primitive/XhtmlDtTest.java index a4f11bfb1bb..00c09d0e2b3 100644 --- a/hapi-fhir-structures-dstu/src/test/java/ca/uhn/fhir/model/primitive/XhtmlDtTest.java +++ b/hapi-fhir-structures-dstu/src/test/java/ca/uhn/fhir/model/primitive/XhtmlDtTest.java @@ -29,6 +29,14 @@ public class XhtmlDtTest { } + @Test + public void testParseRsquo() { + XhtmlDt dt = new XhtmlDt(); + dt.setValueAsString("It’s January again"); + assertEquals("
It’s January again
", dt.getValueAsString()); + assertEquals("
It’s January again
", new XhtmlDt().setValue(dt.getValue()).getValueAsString()); + } + @Test public void testRoundtrip() { String div = "
\r\n<Alert xmlns="http://hl7.org/fhir"> \"doco\"\r\n <!-- from Resource: extension, modifierExtension, language, text, and contained -->\r\n <identifier><!-- 0..* Identifier Business identifier --></identifier>\r\n <category><!-- 0..1 CodeableConcept Clinical, administrative, etc. --></category>\r\n <status value="[code]"/><!-- 1..1 active | inactive | entered in error -->\r\n <subject><!-- 1..1 Resource(Patient) Who is alert about? --></subject>\r\n <author><!-- 0..1 Resource(Practitioner|Patient|Device) Alert creator --></author>\r\n <note value="[string]"/><!-- 1..1 Text of alert -->\r\n</Alert>\r\n
"; diff --git a/hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/model/XhtmlNodeTest.java b/hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/model/XhtmlNodeTest.java index ab4796e1465..b87263ed32b 100644 --- a/hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/model/XhtmlNodeTest.java +++ b/hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/model/XhtmlNodeTest.java @@ -3,10 +3,12 @@ package ca.uhn.fhir.model; import static org.junit.Assert.*; import org.hl7.fhir.dstu3.model.ExplanationOfBenefit; +import org.hl7.fhir.utilities.xhtml.XhtmlNode; import org.junit.AfterClass; import org.junit.Test; import ca.uhn.fhir.context.FhirContext; +import ca.uhn.fhir.model.primitive.XhtmlDt; import ca.uhn.fhir.util.TestUtil; public class XhtmlNodeTest { @@ -20,6 +22,15 @@ public class XhtmlNodeTest { private static FhirContext ourCtx = FhirContext.forDstu3(); + @Test + public void testParseRsquo() { + XhtmlNode dt = new XhtmlNode(); + dt.setValueAsString("It’s January again"); + assertEquals("
It’s January again
", dt.getValueAsString()); + assertEquals("
It’s January again
", new XhtmlNode().setValue(dt.getValue()).getValueAsString()); + } + + /** * See #443 */ diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 2ce0f1a6ecf..9f6099f9801 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -237,6 +237,10 @@ Declared extensions with multiple type() options listed in the @Child annotation caused a crash on startup. Now this is supported. + + STU3 XHTML parser for narrative choked if the narrative contained + an &rsquot;]]> entity string. + From f0cdc467c655e757cabc96c4abc7166ce1ac95cb Mon Sep 17 00:00:00 2001 From: James Date: Sun, 29 Jan 2017 17:50:49 -0500 Subject: [PATCH 11/31] Move new exmaple from #489 to subdirectory --- .../hapi-fhir-standalone-overlay-example}/.classpath | 0 .../hapi-fhir-standalone-overlay-example}/.project | 0 .../.settings/org.eclipse.core.resources.prefs | 0 .../.settings/org.eclipse.m2e.core.prefs | 0 .../hapi-fhir-standalone-overlay-example}/pom.xml | 0 .../src/main/java/embedded/example/ContextListener.java | 0 .../src/main/java/embedded/example/FhirTesterConfig.java | 0 .../src/main/webapp/WEB-INF/web.xml | 0 .../src/test/java/test/WarTester.java | 0 9 files changed, 0 insertions(+), 0 deletions(-) rename {hapi-fhir-standalone-overlay-example => example-projects/hapi-fhir-standalone-overlay-example}/.classpath (100%) rename {hapi-fhir-standalone-overlay-example => example-projects/hapi-fhir-standalone-overlay-example}/.project (100%) rename {hapi-fhir-standalone-overlay-example => example-projects/hapi-fhir-standalone-overlay-example}/.settings/org.eclipse.core.resources.prefs (100%) rename {hapi-fhir-standalone-overlay-example => example-projects/hapi-fhir-standalone-overlay-example}/.settings/org.eclipse.m2e.core.prefs (100%) rename {hapi-fhir-standalone-overlay-example => example-projects/hapi-fhir-standalone-overlay-example}/pom.xml (100%) rename {hapi-fhir-standalone-overlay-example => example-projects/hapi-fhir-standalone-overlay-example}/src/main/java/embedded/example/ContextListener.java (100%) rename {hapi-fhir-standalone-overlay-example => example-projects/hapi-fhir-standalone-overlay-example}/src/main/java/embedded/example/FhirTesterConfig.java (100%) rename {hapi-fhir-standalone-overlay-example => example-projects/hapi-fhir-standalone-overlay-example}/src/main/webapp/WEB-INF/web.xml (100%) rename {hapi-fhir-standalone-overlay-example => example-projects/hapi-fhir-standalone-overlay-example}/src/test/java/test/WarTester.java (100%) diff --git a/hapi-fhir-standalone-overlay-example/.classpath b/example-projects/hapi-fhir-standalone-overlay-example/.classpath similarity index 100% rename from hapi-fhir-standalone-overlay-example/.classpath rename to example-projects/hapi-fhir-standalone-overlay-example/.classpath diff --git a/hapi-fhir-standalone-overlay-example/.project b/example-projects/hapi-fhir-standalone-overlay-example/.project similarity index 100% rename from hapi-fhir-standalone-overlay-example/.project rename to example-projects/hapi-fhir-standalone-overlay-example/.project diff --git a/hapi-fhir-standalone-overlay-example/.settings/org.eclipse.core.resources.prefs b/example-projects/hapi-fhir-standalone-overlay-example/.settings/org.eclipse.core.resources.prefs similarity index 100% rename from hapi-fhir-standalone-overlay-example/.settings/org.eclipse.core.resources.prefs rename to example-projects/hapi-fhir-standalone-overlay-example/.settings/org.eclipse.core.resources.prefs diff --git a/hapi-fhir-standalone-overlay-example/.settings/org.eclipse.m2e.core.prefs b/example-projects/hapi-fhir-standalone-overlay-example/.settings/org.eclipse.m2e.core.prefs similarity index 100% rename from hapi-fhir-standalone-overlay-example/.settings/org.eclipse.m2e.core.prefs rename to example-projects/hapi-fhir-standalone-overlay-example/.settings/org.eclipse.m2e.core.prefs diff --git a/hapi-fhir-standalone-overlay-example/pom.xml b/example-projects/hapi-fhir-standalone-overlay-example/pom.xml similarity index 100% rename from hapi-fhir-standalone-overlay-example/pom.xml rename to example-projects/hapi-fhir-standalone-overlay-example/pom.xml diff --git a/hapi-fhir-standalone-overlay-example/src/main/java/embedded/example/ContextListener.java b/example-projects/hapi-fhir-standalone-overlay-example/src/main/java/embedded/example/ContextListener.java similarity index 100% rename from hapi-fhir-standalone-overlay-example/src/main/java/embedded/example/ContextListener.java rename to example-projects/hapi-fhir-standalone-overlay-example/src/main/java/embedded/example/ContextListener.java diff --git a/hapi-fhir-standalone-overlay-example/src/main/java/embedded/example/FhirTesterConfig.java b/example-projects/hapi-fhir-standalone-overlay-example/src/main/java/embedded/example/FhirTesterConfig.java similarity index 100% rename from hapi-fhir-standalone-overlay-example/src/main/java/embedded/example/FhirTesterConfig.java rename to example-projects/hapi-fhir-standalone-overlay-example/src/main/java/embedded/example/FhirTesterConfig.java diff --git a/hapi-fhir-standalone-overlay-example/src/main/webapp/WEB-INF/web.xml b/example-projects/hapi-fhir-standalone-overlay-example/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from hapi-fhir-standalone-overlay-example/src/main/webapp/WEB-INF/web.xml rename to example-projects/hapi-fhir-standalone-overlay-example/src/main/webapp/WEB-INF/web.xml diff --git a/hapi-fhir-standalone-overlay-example/src/test/java/test/WarTester.java b/example-projects/hapi-fhir-standalone-overlay-example/src/test/java/test/WarTester.java similarity index 100% rename from hapi-fhir-standalone-overlay-example/src/test/java/test/WarTester.java rename to example-projects/hapi-fhir-standalone-overlay-example/src/test/java/test/WarTester.java From 3960666c684f1a923a4f3f4629feddbe39473ffe Mon Sep 17 00:00:00 2001 From: James Date: Sun, 29 Jan 2017 17:56:13 -0500 Subject: [PATCH 12/31] Credit for #538 --- src/changes/changes.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 9f6099f9801..7e3de664f6d 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -241,6 +241,13 @@ STU3 XHTML parser for narrative choked if the narrative contained an &rsquot;]]> entity string. + + When parsing a quantity parameter on the server with a + value and units but no system (e.g. + GET [base]/Observation?value=5.4||mg]]>) + the unit was incorrectly treated as the system. Thanks to + @CarthageKing for the pull request! + From d3ef52d49d35d2e3467a41cae1c3eaf80df4dcad Mon Sep 17 00:00:00 2001 From: James Date: Sun, 29 Jan 2017 18:01:00 -0500 Subject: [PATCH 13/31] Credit for #533 --- pom.xml | 4 ++++ src/changes/changes.xml | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/pom.xml b/pom.xml index e07858d2edd..8fde86d0a16 100644 --- a/pom.xml +++ b/pom.xml @@ -288,6 +288,10 @@ rqg0717 James Ren + + Robbert1 + Robbert van Waveren + diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 7e3de664f6d..a8dd6006321 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -248,6 +248,11 @@ the unit was incorrectly treated as the system. Thanks to @CarthageKing for the pull request! + + Correct a typo in the JPA ValueSet ResourceProvider which prevented + successful operation under Spring 4.3. Thanks to + Robbert van Waveren for the pull request! + From ce80007f8da9d88231318676891e83b49dc53103 Mon Sep 17 00:00:00 2001 From: James Date: Sun, 29 Jan 2017 22:55:22 -0500 Subject: [PATCH 14/31] Bump spring version and refactor examples --- .../.classpath | 0 .../.project | 0 .../org.eclipse.core.resources.prefs | 0 .../.settings/org.eclipse.m2e.core.prefs | 0 .../pom.xml | 4 ++- .../main/java/embedded/ContextListener.java | 0 .../java/embedded/FhirRestfulServlet.java | 0 .../src/main/java/embedded/ServerStartup.java | 0 .../java/embedded/SomeResourceProvider.java | 0 .../pom.xml | 8 +++-- .../server/servlet/ServletRequestDetails.java | 15 ---------- hapi-fhir-jpaserver-base/pom.xml | 1 + .../fhir/rest/server/ResourceMethodTest.java | 29 +++++++++++++++---- .../resources/vm/jpa_spring_beans_java.vm | 25 +++++++++++----- pom.xml | 5 ++-- src/changes/changes.xml | 2 +- 16 files changed, 54 insertions(+), 35 deletions(-) rename {hapi-fhir-base-example-embedded-ws => example-projects/hapi-fhir-base-example-embedded-ws}/.classpath (100%) rename {hapi-fhir-base-example-embedded-ws => example-projects/hapi-fhir-base-example-embedded-ws}/.project (100%) rename {hapi-fhir-base-example-embedded-ws => example-projects/hapi-fhir-base-example-embedded-ws}/.settings/org.eclipse.core.resources.prefs (100%) rename {hapi-fhir-base-example-embedded-ws => example-projects/hapi-fhir-base-example-embedded-ws}/.settings/org.eclipse.m2e.core.prefs (100%) rename {hapi-fhir-base-example-embedded-ws => example-projects/hapi-fhir-base-example-embedded-ws}/pom.xml (95%) rename {hapi-fhir-base-example-embedded-ws => example-projects/hapi-fhir-base-example-embedded-ws}/src/main/java/embedded/ContextListener.java (100%) rename {hapi-fhir-base-example-embedded-ws => example-projects/hapi-fhir-base-example-embedded-ws}/src/main/java/embedded/FhirRestfulServlet.java (100%) rename {hapi-fhir-base-example-embedded-ws => example-projects/hapi-fhir-base-example-embedded-ws}/src/main/java/embedded/ServerStartup.java (100%) rename {hapi-fhir-base-example-embedded-ws => example-projects/hapi-fhir-base-example-embedded-ws}/src/main/java/embedded/SomeResourceProvider.java (100%) diff --git a/hapi-fhir-base-example-embedded-ws/.classpath b/example-projects/hapi-fhir-base-example-embedded-ws/.classpath similarity index 100% rename from hapi-fhir-base-example-embedded-ws/.classpath rename to example-projects/hapi-fhir-base-example-embedded-ws/.classpath diff --git a/hapi-fhir-base-example-embedded-ws/.project b/example-projects/hapi-fhir-base-example-embedded-ws/.project similarity index 100% rename from hapi-fhir-base-example-embedded-ws/.project rename to example-projects/hapi-fhir-base-example-embedded-ws/.project diff --git a/hapi-fhir-base-example-embedded-ws/.settings/org.eclipse.core.resources.prefs b/example-projects/hapi-fhir-base-example-embedded-ws/.settings/org.eclipse.core.resources.prefs similarity index 100% rename from hapi-fhir-base-example-embedded-ws/.settings/org.eclipse.core.resources.prefs rename to example-projects/hapi-fhir-base-example-embedded-ws/.settings/org.eclipse.core.resources.prefs diff --git a/hapi-fhir-base-example-embedded-ws/.settings/org.eclipse.m2e.core.prefs b/example-projects/hapi-fhir-base-example-embedded-ws/.settings/org.eclipse.m2e.core.prefs similarity index 100% rename from hapi-fhir-base-example-embedded-ws/.settings/org.eclipse.m2e.core.prefs rename to example-projects/hapi-fhir-base-example-embedded-ws/.settings/org.eclipse.m2e.core.prefs diff --git a/hapi-fhir-base-example-embedded-ws/pom.xml b/example-projects/hapi-fhir-base-example-embedded-ws/pom.xml similarity index 95% rename from hapi-fhir-base-example-embedded-ws/pom.xml rename to example-projects/hapi-fhir-base-example-embedded-ws/pom.xml index c37d000f727..ce746e8ae97 100644 --- a/hapi-fhir-base-example-embedded-ws/pom.xml +++ b/example-projects/hapi-fhir-base-example-embedded-ws/pom.xml @@ -5,6 +5,7 @@ ca.uhn.hapi.fhir hapi-fhir 2.3-SNAPSHOT + ../hapi-deployable-pom/pom.xml jar @@ -41,6 +42,7 @@ org.ebaysf.web cors-filter + 1.0.1 ca.uhn.hapi.fhir @@ -71,4 +73,4 @@ - \ No newline at end of file + diff --git a/hapi-fhir-base-example-embedded-ws/src/main/java/embedded/ContextListener.java b/example-projects/hapi-fhir-base-example-embedded-ws/src/main/java/embedded/ContextListener.java similarity index 100% rename from hapi-fhir-base-example-embedded-ws/src/main/java/embedded/ContextListener.java rename to example-projects/hapi-fhir-base-example-embedded-ws/src/main/java/embedded/ContextListener.java diff --git a/hapi-fhir-base-example-embedded-ws/src/main/java/embedded/FhirRestfulServlet.java b/example-projects/hapi-fhir-base-example-embedded-ws/src/main/java/embedded/FhirRestfulServlet.java similarity index 100% rename from hapi-fhir-base-example-embedded-ws/src/main/java/embedded/FhirRestfulServlet.java rename to example-projects/hapi-fhir-base-example-embedded-ws/src/main/java/embedded/FhirRestfulServlet.java diff --git a/hapi-fhir-base-example-embedded-ws/src/main/java/embedded/ServerStartup.java b/example-projects/hapi-fhir-base-example-embedded-ws/src/main/java/embedded/ServerStartup.java similarity index 100% rename from hapi-fhir-base-example-embedded-ws/src/main/java/embedded/ServerStartup.java rename to example-projects/hapi-fhir-base-example-embedded-ws/src/main/java/embedded/ServerStartup.java diff --git a/hapi-fhir-base-example-embedded-ws/src/main/java/embedded/SomeResourceProvider.java b/example-projects/hapi-fhir-base-example-embedded-ws/src/main/java/embedded/SomeResourceProvider.java similarity index 100% rename from hapi-fhir-base-example-embedded-ws/src/main/java/embedded/SomeResourceProvider.java rename to example-projects/hapi-fhir-base-example-embedded-ws/src/main/java/embedded/SomeResourceProvider.java diff --git a/example-projects/hapi-fhir-standalone-overlay-example/pom.xml b/example-projects/hapi-fhir-standalone-overlay-example/pom.xml index 05efe37315f..fef33f1705c 100644 --- a/example-projects/hapi-fhir-standalone-overlay-example/pom.xml +++ b/example-projects/hapi-fhir-standalone-overlay-example/pom.xml @@ -4,7 +4,8 @@ ca.uhn.hapi.fhir hapi-fhir - 2.1-SNAPSHOT + 2.3-SNAPSHOT + ../hapi-deployable-pom/pom.xml hapi-fhir-standalone-overlay-example @@ -36,14 +37,14 @@ ca.uhn.hapi.fhir hapi-fhir-testpage-overlay - 2.1-SNAPSHOT + 2.3-SNAPSHOT war provided ca.uhn.hapi.fhir hapi-fhir-testpage-overlay - 2.1-SNAPSHOT + 2.3-SNAPSHOT classes provided @@ -73,6 +74,7 @@ org.ebaysf.web cors-filter + 1.0.1 diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/servlet/ServletRequestDetails.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/servlet/ServletRequestDetails.java index 5cb84b72763..3000ed48133 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/servlet/ServletRequestDetails.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/servlet/ServletRequestDetails.java @@ -28,10 +28,7 @@ import java.io.Reader; import java.nio.charset.Charset; import java.util.Collections; import java.util.Enumeration; -import java.util.HashMap; import java.util.List; -import java.util.Map; -import java.util.Set; import java.util.zip.GZIPInputStream; import javax.servlet.http.HttpServletRequest; @@ -41,7 +38,6 @@ import org.apache.commons.io.IOUtils; import org.apache.http.entity.ContentType; import ca.uhn.fhir.context.ConfigurationException; -import ca.uhn.fhir.rest.api.RequestTypeEnum; import ca.uhn.fhir.rest.method.BaseMethodBinding; import ca.uhn.fhir.rest.method.BaseMethodBinding.IRequestReader; import ca.uhn.fhir.rest.method.RequestDetails; @@ -168,17 +164,6 @@ public class ServletRequestDetails extends RequestDetails { this.myServletResponse = myServletResponse; } - public static RequestDetails withResourceAndParams(String theResourceName, RequestTypeEnum theRequestType, Set theParamNames) { - RequestDetails retVal = new ServletRequestDetails(); - retVal.setResourceName(theResourceName); - retVal.setRequestType(theRequestType); - Map paramNames = new HashMap(); - for (String next : theParamNames) { - paramNames.put(next, new String[0]); - } - retVal.setParameters(paramNames); - return retVal; - } @Override public Charset getCharset() { diff --git a/hapi-fhir-jpaserver-base/pom.xml b/hapi-fhir-jpaserver-base/pom.xml index 3f5f9a01fc6..fdd93780866 100644 --- a/hapi-fhir-jpaserver-base/pom.xml +++ b/hapi-fhir-jpaserver-base/pom.xml @@ -419,6 +419,7 @@ alphabetical ${argLine} -Dfile.encoding=UTF-8 -Xmx1024m + 0.6C diff --git a/hapi-fhir-structures-dstu/src/test/java/ca/uhn/fhir/rest/server/ResourceMethodTest.java b/hapi-fhir-structures-dstu/src/test/java/ca/uhn/fhir/rest/server/ResourceMethodTest.java index 87906b7fc11..de081483877 100644 --- a/hapi-fhir-structures-dstu/src/test/java/ca/uhn/fhir/rest/server/ResourceMethodTest.java +++ b/hapi-fhir-structures-dstu/src/test/java/ca/uhn/fhir/rest/server/ResourceMethodTest.java @@ -2,12 +2,17 @@ package ca.uhn.fhir.rest.server; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; +import static org.mockito.Mockito.mock; import java.util.ArrayList; +import java.util.HashMap; import java.util.HashSet; import java.util.List; +import java.util.Map; import java.util.Set; +import javax.servlet.http.HttpServletRequest; + import org.junit.AfterClass; import org.junit.Before; import org.junit.Test; @@ -54,7 +59,7 @@ public class ResourceMethodTest { inputParams.add("lastName"); inputParams.add("mrn"); - RequestDetails params = ServletRequestDetails.withResourceAndParams("Patient", RequestTypeEnum.GET, inputParams); + RequestDetails params = withResourceAndParams("Patient", RequestTypeEnum.GET, inputParams); boolean actual = rm.incomingServerRequestMatchesMethod(params); assertTrue( actual); // True } @@ -75,7 +80,7 @@ public class ResourceMethodTest { inputParams.add("mrn"); inputParams.add("foo"); - assertEquals(false, rm.incomingServerRequestMatchesMethod(ServletRequestDetails.withResourceAndParams("Patient", RequestTypeEnum.GET, inputParams))); // False + assertEquals(false, rm.incomingServerRequestMatchesMethod(withResourceAndParams("Patient", RequestTypeEnum.GET, inputParams))); // False } @Test @@ -92,7 +97,7 @@ public class ResourceMethodTest { inputParams.add("firstName"); inputParams.add("mrn"); - assertEquals(true, rm.incomingServerRequestMatchesMethod(ServletRequestDetails.withResourceAndParams("Patient", RequestTypeEnum.GET, inputParams))); // True + assertEquals(true, rm.incomingServerRequestMatchesMethod(withResourceAndParams("Patient", RequestTypeEnum.GET, inputParams))); // True } @Test @@ -109,7 +114,7 @@ public class ResourceMethodTest { inputParams.add("firstName"); inputParams.add("lastName"); - assertEquals(false, rm.incomingServerRequestMatchesMethod(ServletRequestDetails.withResourceAndParams("Patient", RequestTypeEnum.GET, inputParams))); // False + assertEquals(false, rm.incomingServerRequestMatchesMethod(withResourceAndParams("Patient", RequestTypeEnum.GET, inputParams))); // False } @Test @@ -124,7 +129,7 @@ public class ResourceMethodTest { Set inputParams = new HashSet(); inputParams.add("mrn"); - assertEquals(true, rm.incomingServerRequestMatchesMethod(ServletRequestDetails.withResourceAndParams("Patient", RequestTypeEnum.GET, inputParams))); // True + assertEquals(true, rm.incomingServerRequestMatchesMethod(withResourceAndParams("Patient", RequestTypeEnum.GET, inputParams))); // True } @Test(expected=IllegalStateException.class) @@ -142,4 +147,18 @@ public class ResourceMethodTest { TestUtil.clearAllStaticFieldsForUnitTest(); } + + public static RequestDetails withResourceAndParams(String theResourceName, RequestTypeEnum theRequestType, Set theParamNames) { + ServletRequestDetails retVal = new ServletRequestDetails(); + retVal.setResourceName(theResourceName); + retVal.setRequestType(theRequestType); + Map paramNames = new HashMap(); + for (String next : theParamNames) { + paramNames.put(next, new String[0]); + } + retVal.setParameters(paramNames); + retVal.setServletRequest(mock(HttpServletRequest.class)); + return retVal; + } + } diff --git a/hapi-tinder-plugin/src/main/resources/vm/jpa_spring_beans_java.vm b/hapi-tinder-plugin/src/main/resources/vm/jpa_spring_beans_java.vm index 7230adc3648..d3c5c30e8c8 100644 --- a/hapi-tinder-plugin/src/main/resources/vm/jpa_spring_beans_java.vm +++ b/hapi-tinder-plugin/src/main/resources/vm/jpa_spring_beans_java.vm @@ -21,9 +21,7 @@ import org.springframework.scheduling.config.ScheduledTaskRegistrar; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.model.api.IResource; import ca.uhn.fhir.rest.server.IResourceProvider; -import ca.uhn.fhir.jpa.dao.BaseHapiFhirDao; -import ca.uhn.fhir.jpa.dao.IFhirResourceDao; -import ca.uhn.fhir.jpa.dao.IFhirSystemDao; +import ca.uhn.fhir.jpa.dao.*; @Configuration public abstract class BaseJavaConfig${versionCapitalized} extends ca.uhn.fhir.jpa.config${package_suffix}.Base${versionCapitalized}Config { @@ -49,12 +47,23 @@ public abstract class BaseJavaConfig${versionCapitalized} extends ca.uhn.fhir.jp #foreach ( $res in $resources ) @Bean(name="my${res.name}Dao${versionCapitalized}", autowire=Autowire.BY_NAME) @Lazy - public IFhirResourceDao<${resourcePackage}.${res.declaringClassNameComplete}> dao${res.declaringClassNameComplete}${versionCapitalized}() { - ca.uhn.fhir.jpa.dao${package_suffix}.FhirResourceDao${versionCapitalized}<${resourcePackage}.${res.declaringClassNameComplete}> retVal; -#if ( ${versionCapitalized} != 'Dstu1' && ( ${res.name} == 'Bundle' || ${res.name} == 'Encounter' || ${res.name} == 'Everything' || ${res.name} == 'Patient' || ${res.name} == 'Subscription' || ${res.name} == 'ValueSet' || ${res.name} == 'QuestionnaireResponse' || ${res.name} == 'SearchParameter' || ${res.name} == 'CodeSystem')) - retVal = new ca.uhn.fhir.jpa.dao${package_suffix}.FhirResourceDao${res.name}${versionCapitalized}(); + public +#if ( ${versionCapitalized} == 'Dstu2' && ${res.name} == 'ValueSet' ) + IFhirResourceDaoValueSet +#elseif ( ${versionCapitalized} == 'Dstu3' && ${res.name} == 'ValueSet' ) + IFhirResourceDaoValueSet +#elseif ( ${versionCapitalized} == 'Dstu3' && ${res.name} == 'CodeSystem' ) + IFhirResourceDaoCodeSystem +#elseif ( ${versionCapitalized} != 'Dstu1' && ( ${res.name} == 'Encounter' || ${res.name} == 'Everything' || ${res.name} == 'Patient' || ${res.name} == 'Subscription' || ${res.name} == 'SearchParameter')) + IFhirResourceDao${res.name}<${resourcePackage}.${res.declaringClassNameComplete}> #else - retVal = new ca.uhn.fhir.jpa.dao${package_suffix}.FhirResourceDao${versionCapitalized}<${resourcePackage}.${res.declaringClassNameComplete}>(); + IFhirResourceDao<${resourcePackage}.${res.declaringClassNameComplete}> +#end + dao${res.declaringClassNameComplete}${versionCapitalized}() { +#if ( ${versionCapitalized} != 'Dstu1' && ( ${res.name} == 'Bundle' || ${res.name} == 'Encounter' || ${res.name} == 'Everything' || ${res.name} == 'Patient' || ${res.name} == 'Subscription' || ${res.name} == 'ValueSet' || ${res.name} == 'QuestionnaireResponse' || ${res.name} == 'SearchParameter' || ${res.name} == 'CodeSystem')) + ca.uhn.fhir.jpa.dao${package_suffix}.FhirResourceDao${res.name}${versionCapitalized} retVal = new ca.uhn.fhir.jpa.dao${package_suffix}.FhirResourceDao${res.name}${versionCapitalized}(); +#else + ca.uhn.fhir.jpa.dao${package_suffix}.FhirResourceDao${versionCapitalized}<${resourcePackage}.${res.declaringClassNameComplete}> retVal = new ca.uhn.fhir.jpa.dao${package_suffix}.FhirResourceDao${versionCapitalized}<${resourcePackage}.${res.declaringClassNameComplete}>(); #end retVal.setResourceType(${resourcePackage}.${res.declaringClassNameComplete}.class); retVal.setContext(fhirContext${versionCapitalized}()); diff --git a/pom.xml b/pom.xml index 8fde86d0a16..63286b29d3e 100644 --- a/pom.xml +++ b/pom.xml @@ -325,7 +325,7 @@ 2.4 2.7.1 4.4.6 - 4.3.1.RELEASE + 4.3.4.RELEASE 3.0.1.RELEASE 1.6 @@ -1642,7 +1642,8 @@ hapi-fhir-cli hapi-fhir-dist examples - hapi-fhir-base-example-embedded-ws + example-projects/hapi-fhir-base-example-embedded-ws + example-projects/hapi-fhir-standalone-overlay-example hapi-fhir-jacoco diff --git a/src/changes/changes.xml b/src/changes/changes.xml index a8dd6006321..2d651282ea0 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -12,7 +12,7 @@ latest versions (dependent HAPI modules listed in brackets): - +
  • spring (JPA): 4.3.1 -> 4.3.4
  • Derby (CLI): 10.12.1.1 -> 10.13.1.1
  • Jetty (CLI): 9.3.10.v20160621 -> 9.3.14.v20161028
  • JAnsi (CLI): 1.13 -> 1.14
    • From ad324174bdfce75d974242a1c6417990dc23f914 Mon Sep 17 00:00:00 2001 From: James Date: Mon, 30 Jan 2017 08:06:31 -0500 Subject: [PATCH 15/31] Try to get travis working again --- hapi-fhir-jpaserver-base/pom.xml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/hapi-fhir-jpaserver-base/pom.xml b/hapi-fhir-jpaserver-base/pom.xml index fdd93780866..a8becc64ed4 100644 --- a/hapi-fhir-jpaserver-base/pom.xml +++ b/hapi-fhir-jpaserver-base/pom.xml @@ -526,6 +526,20 @@ true + + NOPARALLEL + + + + org.apache.maven.plugins + maven-surefire-plugin + + 1 + + + + + - - 5.1.0.Final - 5.2.4.Final + 5.2.7.Final + 5.3.4.Final + + 5.7.0.CR1 + 5.5.2 2.5.3 1.8 2.4 2.7.1 4.4.6 - 4.3.4.RELEASE - 3.0.1.RELEASE + 4.3.6.RELEASE + 3.0.2.RELEASE 1.6 @@ -515,12 +515,12 @@ org.apache.lucene lucene-highlighter - 5.3.1 + ${lucene_version} org.apache.lucene lucene-analyzers-phonetic - 5.3.1 + ${lucene_version} org.apache.maven.doxia @@ -675,7 +675,7 @@ org.hibernate hibernate-search-orm - 5.5.4.Final + ${hibernate_search_version} org.javassist diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 2d651282ea0..9b85d7a26de 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -11,8 +11,11 @@ Bump the version of a few dependencies to the latest versions (dependent HAPI modules listed in brackets): -
  • spring (JPA): 4.3.1 -> 4.3.4
    • +