From 190f0a0d5a74208e86955cae8a016b6a8b936fbd Mon Sep 17 00:00:00 2001 From: James Agnew Date: Sun, 7 Jul 2019 09:58:31 -0400 Subject: [PATCH] Bump several dependency versions to latest versions --- .../jpaserver-example-with-custom/.gitignore | 1 - .../jpaserver-example-with-custom/pom.xml | 231 -- .../java/ca/uhn/fhir/jpa/demo/DerbyInit.java | 9 - .../ca/uhn/fhir/jpa/demo/JpaServerDemo.java | 117 - .../ca/uhn/fhir/jpa/demo/entity/User.java | 75 - .../RequestAuthorizationInterceptor.java | 47 - .../uhn/fhir/jpa/demo/svc/LoginResponse.java | 18 - .../fhir/jpa/demo/svc/ServiceController.java | 28 - .../src/main/resources/logback.xml | 16 - .../WEB-INF/hapi-fhir-server-config.xml | 42 - .../hapi-fhir-server-database-config.xml | 57 - .../WEB-INF/hapi-fhir-tester-config.xml | 23 - .../WEB-INF/non-fhir-services-config.xml | 29 - .../main/webapp/WEB-INF/templates/about.html | 67 - .../webapp/WEB-INF/templates/tmpl-footer.html | 16 - .../WEB-INF/templates/tmpl-home-welcome.html | 52 - .../src/main/webapp/WEB-INF/web.xml | 104 - .../src/main/webapp/WEB-INF/xsd/javaee_6.xsd | 2419 ----------------- .../src/main/webapp/WEB-INF/xsd/jsp_2_2.xsd | 389 --- .../main/webapp/WEB-INF/xsd/web-app_3_0.xsd | 272 -- .../webapp/WEB-INF/xsd/web-common_3_0.xsd | 1575 ----------- .../src/main/webapp/WEB-INF/xsd/xml.xsd | 287 -- .../ca/uhn/fhir/jpa/demo/ServiceTest.java | 32 - .../test-hapi-fhir-server-config.xml | 42 - .../test-hapi-fhir-server-database-config.xml | 57 - .../test-non-fhir-services-config.xml | 29 - hapi-fhir-tutorial/simple-server/.gitignore | 4 - hapi-fhir-tutorial/simple-server/pom.xml | 121 - .../simple-server/scripts/example3_create.txt | 1 - .../ex1/Example01_ResourceProviders.java | 46 - .../Example02_PatientResourceProvider.java | 46 - .../ex2/Example02_SimpleRestfulServer.java | 27 - .../Example03_PatientResourceProvider.java | 98 - .../ex3/Example03_SimpleRestfulServer.java | 27 - .../Example04_PatientResourceProvider.java | 75 - .../ex4/Example04_SimpleRestfulServer.java | 19 - .../src/main/webapp/WEB-INF/web.xml | 6 - .../skeleton-project/.gitignore | 3 - hapi-fhir-tutorial/skeleton-project/pom.xml | 126 - .../example/Example01_CreateAPatient.java | 27 - .../example/Example02_CreateAPatient.java | 27 - .../example/Example03_EncodeResource.java | 32 - .../fhir/example/Example04_ParseResource.java | 29 - .../fhir/example/Example05_ClientCreate.java | 31 - .../Example06_ClientReadAndUpdate.java | 39 - .../fhir/example/Example07_ClientSearch.java | 31 - .../example/Example08_ValidateResource.java | 34 - .../example/Example09_NarrativeGenerator.java | 30 - .../fhir/example/Example10_Extensions.java | 24 - .../example/Example11_ExtendedPatient.java | 27 - .../fhir/example/Example11_UseExtensions.java | 22 - .../src/main/resources/logback.xml | 16 - pom.xml | 11 +- src/changes/changes.xml | 5 + 54 files changed, 11 insertions(+), 7007 deletions(-) delete mode 100644 hapi-fhir-tutorial/jpaserver-example-with-custom/.gitignore delete mode 100644 hapi-fhir-tutorial/jpaserver-example-with-custom/pom.xml delete mode 100644 hapi-fhir-tutorial/jpaserver-example-with-custom/src/main/java/ca/uhn/fhir/jpa/demo/DerbyInit.java delete mode 100644 hapi-fhir-tutorial/jpaserver-example-with-custom/src/main/java/ca/uhn/fhir/jpa/demo/JpaServerDemo.java delete mode 100644 hapi-fhir-tutorial/jpaserver-example-with-custom/src/main/java/ca/uhn/fhir/jpa/demo/entity/User.java delete mode 100644 hapi-fhir-tutorial/jpaserver-example-with-custom/src/main/java/ca/uhn/fhir/jpa/demo/interceptor/RequestAuthorizationInterceptor.java delete mode 100644 hapi-fhir-tutorial/jpaserver-example-with-custom/src/main/java/ca/uhn/fhir/jpa/demo/svc/LoginResponse.java delete mode 100644 hapi-fhir-tutorial/jpaserver-example-with-custom/src/main/java/ca/uhn/fhir/jpa/demo/svc/ServiceController.java delete mode 100644 hapi-fhir-tutorial/jpaserver-example-with-custom/src/main/resources/logback.xml delete mode 100644 hapi-fhir-tutorial/jpaserver-example-with-custom/src/main/webapp/WEB-INF/hapi-fhir-server-config.xml delete mode 100644 hapi-fhir-tutorial/jpaserver-example-with-custom/src/main/webapp/WEB-INF/hapi-fhir-server-database-config.xml delete mode 100644 hapi-fhir-tutorial/jpaserver-example-with-custom/src/main/webapp/WEB-INF/hapi-fhir-tester-config.xml delete mode 100644 hapi-fhir-tutorial/jpaserver-example-with-custom/src/main/webapp/WEB-INF/non-fhir-services-config.xml delete mode 100644 hapi-fhir-tutorial/jpaserver-example-with-custom/src/main/webapp/WEB-INF/templates/about.html delete mode 100644 hapi-fhir-tutorial/jpaserver-example-with-custom/src/main/webapp/WEB-INF/templates/tmpl-footer.html delete mode 100644 hapi-fhir-tutorial/jpaserver-example-with-custom/src/main/webapp/WEB-INF/templates/tmpl-home-welcome.html delete mode 100644 hapi-fhir-tutorial/jpaserver-example-with-custom/src/main/webapp/WEB-INF/web.xml delete mode 100644 hapi-fhir-tutorial/jpaserver-example-with-custom/src/main/webapp/WEB-INF/xsd/javaee_6.xsd delete mode 100644 hapi-fhir-tutorial/jpaserver-example-with-custom/src/main/webapp/WEB-INF/xsd/jsp_2_2.xsd delete mode 100644 hapi-fhir-tutorial/jpaserver-example-with-custom/src/main/webapp/WEB-INF/xsd/web-app_3_0.xsd delete mode 100644 hapi-fhir-tutorial/jpaserver-example-with-custom/src/main/webapp/WEB-INF/xsd/web-common_3_0.xsd delete mode 100644 hapi-fhir-tutorial/jpaserver-example-with-custom/src/main/webapp/WEB-INF/xsd/xml.xsd delete mode 100644 hapi-fhir-tutorial/jpaserver-example-with-custom/src/test/java/ca/uhn/fhir/jpa/demo/ServiceTest.java delete mode 100644 hapi-fhir-tutorial/jpaserver-example-with-custom/src/test/resources/test-hapi-fhir-server-config.xml delete mode 100644 hapi-fhir-tutorial/jpaserver-example-with-custom/src/test/resources/test-hapi-fhir-server-database-config.xml delete mode 100644 hapi-fhir-tutorial/jpaserver-example-with-custom/src/test/resources/test-non-fhir-services-config.xml delete mode 100644 hapi-fhir-tutorial/simple-server/.gitignore delete mode 100644 hapi-fhir-tutorial/simple-server/pom.xml delete mode 100644 hapi-fhir-tutorial/simple-server/scripts/example3_create.txt delete mode 100644 hapi-fhir-tutorial/simple-server/src/main/java/ca/uhn/fhir/example/ex1/Example01_ResourceProviders.java delete mode 100644 hapi-fhir-tutorial/simple-server/src/main/java/ca/uhn/fhir/example/ex2/Example02_PatientResourceProvider.java delete mode 100644 hapi-fhir-tutorial/simple-server/src/main/java/ca/uhn/fhir/example/ex2/Example02_SimpleRestfulServer.java delete mode 100644 hapi-fhir-tutorial/simple-server/src/main/java/ca/uhn/fhir/example/ex3/Example03_PatientResourceProvider.java delete mode 100644 hapi-fhir-tutorial/simple-server/src/main/java/ca/uhn/fhir/example/ex3/Example03_SimpleRestfulServer.java delete mode 100644 hapi-fhir-tutorial/simple-server/src/main/java/ca/uhn/fhir/example/ex4/Example04_PatientResourceProvider.java delete mode 100644 hapi-fhir-tutorial/simple-server/src/main/java/ca/uhn/fhir/example/ex4/Example04_SimpleRestfulServer.java delete mode 100644 hapi-fhir-tutorial/simple-server/src/main/webapp/WEB-INF/web.xml delete mode 100644 hapi-fhir-tutorial/skeleton-project/.gitignore delete mode 100644 hapi-fhir-tutorial/skeleton-project/pom.xml delete mode 100644 hapi-fhir-tutorial/skeleton-project/src/main/java/ca/uhn/fhir/example/Example01_CreateAPatient.java delete mode 100644 hapi-fhir-tutorial/skeleton-project/src/main/java/ca/uhn/fhir/example/Example02_CreateAPatient.java delete mode 100644 hapi-fhir-tutorial/skeleton-project/src/main/java/ca/uhn/fhir/example/Example03_EncodeResource.java delete mode 100644 hapi-fhir-tutorial/skeleton-project/src/main/java/ca/uhn/fhir/example/Example04_ParseResource.java delete mode 100644 hapi-fhir-tutorial/skeleton-project/src/main/java/ca/uhn/fhir/example/Example05_ClientCreate.java delete mode 100644 hapi-fhir-tutorial/skeleton-project/src/main/java/ca/uhn/fhir/example/Example06_ClientReadAndUpdate.java delete mode 100644 hapi-fhir-tutorial/skeleton-project/src/main/java/ca/uhn/fhir/example/Example07_ClientSearch.java delete mode 100644 hapi-fhir-tutorial/skeleton-project/src/main/java/ca/uhn/fhir/example/Example08_ValidateResource.java delete mode 100644 hapi-fhir-tutorial/skeleton-project/src/main/java/ca/uhn/fhir/example/Example09_NarrativeGenerator.java delete mode 100644 hapi-fhir-tutorial/skeleton-project/src/main/java/ca/uhn/fhir/example/Example10_Extensions.java delete mode 100644 hapi-fhir-tutorial/skeleton-project/src/main/java/ca/uhn/fhir/example/Example11_ExtendedPatient.java delete mode 100644 hapi-fhir-tutorial/skeleton-project/src/main/java/ca/uhn/fhir/example/Example11_UseExtensions.java delete mode 100644 hapi-fhir-tutorial/skeleton-project/src/main/resources/logback.xml diff --git a/hapi-fhir-tutorial/jpaserver-example-with-custom/.gitignore b/hapi-fhir-tutorial/jpaserver-example-with-custom/.gitignore deleted file mode 100644 index b834fa249bd..00000000000 --- a/hapi-fhir-tutorial/jpaserver-example-with-custom/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/jpaserver_derby_files diff --git a/hapi-fhir-tutorial/jpaserver-example-with-custom/pom.xml b/hapi-fhir-tutorial/jpaserver-example-with-custom/pom.xml deleted file mode 100644 index 93bdd026358..00000000000 --- a/hapi-fhir-tutorial/jpaserver-example-with-custom/pom.xml +++ /dev/null @@ -1,231 +0,0 @@ - - 4.0.0 - ca.uhn.hapi.fhir - hapi-fhir-jpaserver-example-with-custom - 0.0.1-SNAPSHOT - - HAPI FHIR JPA Server - Example with Custom Resources - - - - oss-snapshots - - true - - https://oss.sonatype.org/content/repositories/snapshots/ - - - - - - - - ca.uhn.hapi.fhir - hapi-fhir-base - 1.0-SNAPSHOT - - - - - ca.uhn.hapi.fhir - hapi-fhir-structures-dstu2 - 1.0-SNAPSHOT - - - - - ca.uhn.hapi.fhir - hapi-fhir-jpaserver-base - 1.0-SNAPSHOT - - - - - ca.uhn.hapi.fhir - hapi-fhir-testpage-overlay - 1.0-SNAPSHOT - war - provided - - - - - ch.qos.logback - logback-classic - 1.1.2 - - - - - javax.servlet - javax.servlet-api - 3.0.1 - provided - - - - - org.thymeleaf - thymeleaf - 2.1.4.RELEASE - - - - - org.ebaysf.web - cors-filter - 1.0.1 - - - servlet-api - javax.servlet - - - - - - - org.springframework - spring-web - 4.1.6.RELEASE - provided - - - org.springframework - spring-webmvc - 4.1.6.RELEASE - - - - - org.apache.commons - commons-dbcp2 - 2.0.1 - - - - - - com.fasterxml.jackson.core - jackson-core - 2.5.2 - - - com.fasterxml.jackson.core - jackson-annotations - 2.5.2 - - - com.fasterxml.jackson.core - jackson-databind - 2.5.2 - - - - - org.apache.derby - derby - 10.11.1.1 - - - org.apache.derby - derbynet - 10.11.1.1 - - - org.apache.derby - derbyclient - 10.11.1.1 - - - - - junit - junit - 4.12 - test - - - org.hamcrest - java-hamcrest - 2.0.0.0 - test - - - - - - - - hapi-fhir-jpaserver-example - - - - - - org.eclipse.jetty - jetty-maven-plugin - 9.1.1.v20140108 - - - /hapi-fhir-jpaserver-example-advanced - - - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.2 - - 1.7 - 1.7 - - - - - - org.apache.maven.plugins - maven-war-plugin - - - - ca.uhn.hapi.fhir - hapi-fhir-testpage-overlay - - - - - - - - org.apache.maven.plugins - maven-deploy-plugin - - true - - - - - - - - diff --git a/hapi-fhir-tutorial/jpaserver-example-with-custom/src/main/java/ca/uhn/fhir/jpa/demo/DerbyInit.java b/hapi-fhir-tutorial/jpaserver-example-with-custom/src/main/java/ca/uhn/fhir/jpa/demo/DerbyInit.java deleted file mode 100644 index 3326fb1d274..00000000000 --- a/hapi-fhir-tutorial/jpaserver-example-with-custom/src/main/java/ca/uhn/fhir/jpa/demo/DerbyInit.java +++ /dev/null @@ -1,9 +0,0 @@ -package ca.uhn.fhir.jpa.demo; - -public class DerbyInit { - - public DerbyInit() throws ClassNotFoundException { - Class.forName("org.apache.derby.jdbc.ClientDriver"); - } - -} diff --git a/hapi-fhir-tutorial/jpaserver-example-with-custom/src/main/java/ca/uhn/fhir/jpa/demo/JpaServerDemo.java b/hapi-fhir-tutorial/jpaserver-example-with-custom/src/main/java/ca/uhn/fhir/jpa/demo/JpaServerDemo.java deleted file mode 100644 index 4decd751270..00000000000 --- a/hapi-fhir-tutorial/jpaserver-example-with-custom/src/main/java/ca/uhn/fhir/jpa/demo/JpaServerDemo.java +++ /dev/null @@ -1,117 +0,0 @@ -package ca.uhn.fhir.jpa.demo; - -import java.util.List; - -import javax.servlet.ServletException; - -import ca.uhn.fhir.context.FhirVersionEnum; - -import org.springframework.web.context.ContextLoaderListener; -import org.springframework.web.context.WebApplicationContext; - -import ca.uhn.fhir.context.FhirContext; -import ca.uhn.fhir.jpa.dao.IFhirSystemDao; -import ca.uhn.fhir.jpa.provider.JpaConformanceProviderDstu1; -import ca.uhn.fhir.jpa.provider.JpaConformanceProviderDstu2; -import ca.uhn.fhir.jpa.provider.JpaSystemProviderDstu1; -import ca.uhn.fhir.jpa.provider.JpaSystemProviderDstu2; -import ca.uhn.fhir.model.api.IResource; -import ca.uhn.fhir.model.dstu2.resource.Bundle; -import ca.uhn.fhir.narrative.DefaultThymeleafNarrativeGenerator; -import ca.uhn.fhir.rest.server.ETagSupportEnum; -import ca.uhn.fhir.rest.server.EncodingEnum; -import ca.uhn.fhir.rest.server.FifoMemoryPagingProvider; -import ca.uhn.fhir.rest.server.IResourceProvider; -import ca.uhn.fhir.rest.server.RestfulServer; -import ca.uhn.fhir.rest.server.interceptor.IServerInterceptor; -import ca.uhn.fhir.rest.server.interceptor.LoggingInterceptor; - -public class JpaServerDemo extends RestfulServer { - - private static final long serialVersionUID = 1L; - - private WebApplicationContext myAppCtx; - - @SuppressWarnings("unchecked") - @Override - protected void initialize() throws ServletException { - super.initialize(); - - /* - * We want to support FHIR DSTU2 format. This means that the server - * will use the DSTU2 bundle format and other DSTU2 encoding changes. - * - * If you want to use DSTU1 instead, change the following line, and change the 2 occurrences of dstu2 in web.xml to dstu1 - */ - FhirVersionEnum fhirVersion = FhirVersionEnum.DSTU2; - setFhirContext(new FhirContext(fhirVersion)); - - // Get the spring context from the web container (it's declared in web.xml) - myAppCtx = ContextLoaderListener.getCurrentWebApplicationContext(); - - /* - * The hapi-fhir-server-resourceproviders-dev.xml file is a spring configuration - * file which is automatically generated as a part of hapi-fhir-jpaserver-base and - * contains bean definitions for a resource provider for each resource type - */ - ResourceProviderFactory beans = myAppCtx.getBean("myResourceProvidersDstu2", List.class); - setResourceProviders(beans); - - /* - * The system provider implements non-resource-type methods, such as - * transaction, and global history. - */ - Object systemProvider = myAppCtx.getBean("mySystemProviderDstu2", JpaSystemProviderDstu2.class); - setPlainProviders(systemProvider); - - /* - * The conformance provider exports the supported resources, search parameters, etc for - * this server. The JPA version adds resource counts to the exported statement, so it - * is a nice addition. - */ - IFhirSystemDao systemDao = myAppCtx.getBean("mySystemDaoDstu2", IFhirSystemDao.class); - JpaConformanceProviderDstu2 confProvider = new JpaConformanceProviderDstu2(this, systemDao); - confProvider.setImplementationDescription("Example Server"); - setServerConformanceProvider(confProvider); - - /* - * Enable ETag Support (this is already the default) - */ - setETagSupport(ETagSupportEnum.ENABLED); - - /* - * This tells the server to use "browser friendly" MIME types if it - * detects that the request is coming from a browser, in the hopes that the - * browser won't just treat the content as a binary payload and try - * to download it (which is what generally happens if you load a - * FHIR URL in a browser). - * - * This means that the server isn't technically complying with the - * FHIR specification for direct browser requests, but this mode - * is very helpful for testing and troubleshooting since it means - * you can look at FHIR URLs directly in a browser. - */ - setUseBrowserFriendlyContentTypes(true); - - /* - * Default to XML and pretty printing - */ - setDefaultPrettyPrint(true); - setDefaultResponseEncoding(EncodingEnum.JSON); - - /* - * This is a simple paging strategy that keeps the last 10 searches in memory - */ - setPagingProvider(new FifoMemoryPagingProvider(10)); - - /* - * Load interceptors for the server from Spring (these are defined in hapi-fhir-server-config.xml - */ - List interceptorBeans = myAppCtx.getBean("myServerInterceptors", List.class); - for (IServerInterceptor interceptor : interceptorBeans) { - this.registerInterceptor(interceptor); - } - - } - -} diff --git a/hapi-fhir-tutorial/jpaserver-example-with-custom/src/main/java/ca/uhn/fhir/jpa/demo/entity/User.java b/hapi-fhir-tutorial/jpaserver-example-with-custom/src/main/java/ca/uhn/fhir/jpa/demo/entity/User.java deleted file mode 100644 index 9fbbefc3e9d..00000000000 --- a/hapi-fhir-tutorial/jpaserver-example-with-custom/src/main/java/ca/uhn/fhir/jpa/demo/entity/User.java +++ /dev/null @@ -1,75 +0,0 @@ -package ca.uhn.fhir.jpa.demo.entity; - -/* - * #%L - * HAPI FHIR JPA Server - * %% - * Copyright (C) 2014 - 2015 University Health Network - * %% - * Licensed under the Apache License, Version 2.0 (the "License"); - * 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 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * #L% - */ - -import java.io.Serializable; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; - -//@formatter:off -@Entity() -@Table(name = "CUST_USER") -//@formatter:on -public class User implements Serializable { - - private static final long serialVersionUID = 1L; - - @GeneratedValue(strategy = GenerationType.AUTO) - @Id - @Column(name = "PID") - private Long myId; - - @Column(name = "PASSWORD", length = 200) - private String myPassword; - - @Column(name = "USERNAME", length = 200) - private String myUsername; - - public Long getId() { - return myId; - } - - public String getPassword() { - return myPassword; - } - - public String getUsername() { - return myUsername; - } - - public void setId(Long theId) { - myId = theId; - } - - public void setPassword(String thePassword) { - myPassword = thePassword; - } - - public void setUsername(String theUsername) { - myUsername = theUsername; - } - -} diff --git a/hapi-fhir-tutorial/jpaserver-example-with-custom/src/main/java/ca/uhn/fhir/jpa/demo/interceptor/RequestAuthorizationInterceptor.java b/hapi-fhir-tutorial/jpaserver-example-with-custom/src/main/java/ca/uhn/fhir/jpa/demo/interceptor/RequestAuthorizationInterceptor.java deleted file mode 100644 index d3690744bae..00000000000 --- a/hapi-fhir-tutorial/jpaserver-example-with-custom/src/main/java/ca/uhn/fhir/jpa/demo/interceptor/RequestAuthorizationInterceptor.java +++ /dev/null @@ -1,47 +0,0 @@ -package ca.uhn.fhir.jpa.demo.interceptor; - -import javax.persistence.EntityManager; -import javax.persistence.NoResultException; -import javax.persistence.PersistenceContext; -import javax.persistence.TypedQuery; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.transaction.PlatformTransactionManager; -import org.springframework.transaction.annotation.Propagation; -import org.springframework.transaction.annotation.Transactional; - -import ca.uhn.fhir.jpa.demo.entity.User; -import ca.uhn.fhir.rest.server.interceptor.InterceptorAdapter; - -public class RequestAuthorizationInterceptor extends InterceptorAdapter { - private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(RequestAuthorizationInterceptor.class); - - @PersistenceContext() - private EntityManager myEntityManager; - - @Autowired - private PlatformTransactionManager myPlatformTransactionManager; - - @Transactional(propagation = Propagation.REQUIRED) - @Override - public boolean incomingRequestPreProcessed(HttpServletRequest theRequest, HttpServletResponse theResponse) { - - String authorization = theResponse.getHeader("Authorization"); - - TypedQuery q = myEntityManager.createQuery("SELECT u FROM User u WHERE u.myUsername = :username", User.class); - String username = authorization; - - q.setParameter("username", username); - try { - User user = q.getSingleResult(); - ourLog.info("Found user [{}]: {}", username, user); - } catch (NoResultException e) { - ourLog.info("No user found in user table with username [{}]", username); - } - - return true; - } - -} diff --git a/hapi-fhir-tutorial/jpaserver-example-with-custom/src/main/java/ca/uhn/fhir/jpa/demo/svc/LoginResponse.java b/hapi-fhir-tutorial/jpaserver-example-with-custom/src/main/java/ca/uhn/fhir/jpa/demo/svc/LoginResponse.java deleted file mode 100644 index bb45bb13be3..00000000000 --- a/hapi-fhir-tutorial/jpaserver-example-with-custom/src/main/java/ca/uhn/fhir/jpa/demo/svc/LoginResponse.java +++ /dev/null @@ -1,18 +0,0 @@ -package ca.uhn.fhir.jpa.demo.svc; - -import com.fasterxml.jackson.annotation.JsonProperty; - -public class LoginResponse { - - @JsonProperty(value = "success") - private boolean mySuccess; - - public boolean isSuccess() { - return mySuccess; - } - - public void setSuccess(boolean theSuccess) { - mySuccess = theSuccess; - } - -} diff --git a/hapi-fhir-tutorial/jpaserver-example-with-custom/src/main/java/ca/uhn/fhir/jpa/demo/svc/ServiceController.java b/hapi-fhir-tutorial/jpaserver-example-with-custom/src/main/java/ca/uhn/fhir/jpa/demo/svc/ServiceController.java deleted file mode 100644 index 300419a0193..00000000000 --- a/hapi-fhir-tutorial/jpaserver-example-with-custom/src/main/java/ca/uhn/fhir/jpa/demo/svc/ServiceController.java +++ /dev/null @@ -1,28 +0,0 @@ -package ca.uhn.fhir.jpa.demo.svc; - -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; - -@RestController -public class ServiceController { - - private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(ServiceController.class); - - public ServiceController() { - ourLog.info("Starting service controller"); - } - - @RequestMapping(value = "/login", method = {RequestMethod.GET, RequestMethod.POST} ) - public @ResponseBody LoginResponse handleFormUpload(@RequestParam("name") String theUsername) { - ourLog.info("Login request for user[{}]", theUsername); - - LoginResponse retVal = new LoginResponse(); - retVal.setSuccess(true); - - return retVal; - } - -} diff --git a/hapi-fhir-tutorial/jpaserver-example-with-custom/src/main/resources/logback.xml b/hapi-fhir-tutorial/jpaserver-example-with-custom/src/main/resources/logback.xml deleted file mode 100644 index ffec8d30c06..00000000000 --- a/hapi-fhir-tutorial/jpaserver-example-with-custom/src/main/resources/logback.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - INFO - - - %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} [%file:%line] %msg%n - - - - - - - - \ No newline at end of file diff --git a/hapi-fhir-tutorial/jpaserver-example-with-custom/src/main/webapp/WEB-INF/hapi-fhir-server-config.xml b/hapi-fhir-tutorial/jpaserver-example-with-custom/src/main/webapp/WEB-INF/hapi-fhir-server-config.xml deleted file mode 100644 index 054e108e2e9..00000000000 --- a/hapi-fhir-tutorial/jpaserver-example-with-custom/src/main/webapp/WEB-INF/hapi-fhir-server-config.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/hapi-fhir-tutorial/jpaserver-example-with-custom/src/main/webapp/WEB-INF/hapi-fhir-server-database-config.xml b/hapi-fhir-tutorial/jpaserver-example-with-custom/src/main/webapp/WEB-INF/hapi-fhir-server-database-config.xml deleted file mode 100644 index 3c750b12e76..00000000000 --- a/hapi-fhir-tutorial/jpaserver-example-with-custom/src/main/webapp/WEB-INF/hapi-fhir-server-database-config.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - - - - - - - - - - - ca.uhn.fhir.jpa.entity - ca.uhn.fhir.jpa.model.entity - ca.uhn.fhir.jpa.demo.entity - - - - - - - - - - - - diff --git a/hapi-fhir-tutorial/jpaserver-example-with-custom/src/main/webapp/WEB-INF/hapi-fhir-tester-config.xml b/hapi-fhir-tutorial/jpaserver-example-with-custom/src/main/webapp/WEB-INF/hapi-fhir-tester-config.xml deleted file mode 100644 index cac5c724ca6..00000000000 --- a/hapi-fhir-tutorial/jpaserver-example-with-custom/src/main/webapp/WEB-INF/hapi-fhir-tester-config.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - home , DSTU2 , Local Server , ${serverBase}/fhir - - - - - - - - diff --git a/hapi-fhir-tutorial/jpaserver-example-with-custom/src/main/webapp/WEB-INF/non-fhir-services-config.xml b/hapi-fhir-tutorial/jpaserver-example-with-custom/src/main/webapp/WEB-INF/non-fhir-services-config.xml deleted file mode 100644 index a94a56f55ac..00000000000 --- a/hapi-fhir-tutorial/jpaserver-example-with-custom/src/main/webapp/WEB-INF/non-fhir-services-config.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/hapi-fhir-tutorial/jpaserver-example-with-custom/src/main/webapp/WEB-INF/templates/about.html b/hapi-fhir-tutorial/jpaserver-example-with-custom/src/main/webapp/WEB-INF/templates/about.html deleted file mode 100644 index d552027e956..00000000000 --- a/hapi-fhir-tutorial/jpaserver-example-with-custom/src/main/webapp/WEB-INF/templates/about.html +++ /dev/null @@ -1,67 +0,0 @@ - - - - About This Server - - - -
-
- -
-
-
- -
- -
- -
-
-

About This Server

-
-
-
- -
-

- This server provides a nearly complete implementation of the FHIR Specification - using a 100% open source software stack. It is hosted by University Health Network. -

-

- The architecture in use here is shown in the image on the right. This server is built - from a number of modules of the - HAPI FHIR - project, which is a 100% open-source (Apache 2.0 Licensed) Java based - implementation of the FHIR specification. -

-

- -

-
-
-
-
-

Data On This Server

-
-
-

- This server is regularly loaded with a standard set of test data sourced - from UHN's own testing environment. Do not use this server to store any data - that you will need later, as we will be regularly resetting it. -

-

- This is not a production server and it provides no privacy. Do not store any - confidential data here. -

-
-
- -
-
-
- -
-
- - diff --git a/hapi-fhir-tutorial/jpaserver-example-with-custom/src/main/webapp/WEB-INF/templates/tmpl-footer.html b/hapi-fhir-tutorial/jpaserver-example-with-custom/src/main/webapp/WEB-INF/templates/tmpl-footer.html deleted file mode 100644 index bf18c498a78..00000000000 --- a/hapi-fhir-tutorial/jpaserver-example-with-custom/src/main/webapp/WEB-INF/templates/tmpl-footer.html +++ /dev/null @@ -1,16 +0,0 @@ - - -
- -
- diff --git a/hapi-fhir-tutorial/jpaserver-example-with-custom/src/main/webapp/WEB-INF/templates/tmpl-home-welcome.html b/hapi-fhir-tutorial/jpaserver-example-with-custom/src/main/webapp/WEB-INF/templates/tmpl-home-welcome.html deleted file mode 100644 index dfc4769d6e4..00000000000 --- a/hapi-fhir-tutorial/jpaserver-example-with-custom/src/main/webapp/WEB-INF/templates/tmpl-home-welcome.html +++ /dev/null @@ -1,52 +0,0 @@ - - -
- -

- This is the home for the FHIR test server operated by - University Health Network. This server - (and the testing application you are currently using to access it) - is entirely built using - HAPI-FHIR, - a 100% open-source Java implementation of the - FHIR specification. -

-

- Here are some things you might wish to try: -

-
    -
  • - View a - list of patients - on this server. -
    • -
  • - Construct a - search query - on this server. -
    • -
  • - Access a - different server - (use the Server menu at the top of the page to see a list of public FHIR servers) -
    • -
- - -

- You are accessing the public FHIR server - . This server is hosted elsewhere on the internet - but is being accessed using the HAPI client implementation. -

- -

- - - This is not a production server! - - Do not store any information here that contains personal health information - or any other confidential information. This server will be regularly purged - and reloaded with fixed test data. -

-
- diff --git a/hapi-fhir-tutorial/jpaserver-example-with-custom/src/main/webapp/WEB-INF/web.xml b/hapi-fhir-tutorial/jpaserver-example-with-custom/src/main/webapp/WEB-INF/web.xml deleted file mode 100644 index 72689c0e498..00000000000 --- a/hapi-fhir-tutorial/jpaserver-example-with-custom/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,104 +0,0 @@ - - - - org.springframework.web.context.ContextLoaderListener - - - - contextConfigLocation - - classpath:hapi-fhir-server-resourceproviders-dstu2.xml - /WEB-INF/hapi-fhir-server-database-config.xml - /WEB-INF/hapi-fhir-server-config.xml - /WEB-INF/hapi-fhir-tester-application-context.xml - /WEB-INF/hapi-fhir-tester-config.xml - /WEB-INF/non-fhir-services-config.xml - - - - - - - spring - org.springframework.web.servlet.DispatcherServlet - - contextConfigLocation - - /WEB-INF/hapi-fhir-tester-application-context.xml - /WEB-INF/hapi-fhir-tester-config.xml - - - 2 - - - - fhirServlet - ca.uhn.fhir.jpa.demo.JpaServerDemo - - ImplementationDescription - FHIR JPA Server - - 1 - - - - fhirServlet - /fhir/* - - - - spring - / - - - - - - - CORS Filter - org.ebaysf.web.cors.CORSFilter - - A comma separated list of allowed origins. Note: An '*' cannot be used for an allowed origin when using credentials. - cors.allowed.origins - * - - - A comma separated list of HTTP verbs, using which a CORS request can be made. - cors.allowed.methods - GET,POST,PUT,DELETE,OPTIONS - - - A comma separated list of allowed headers when making a non simple CORS request. - cors.allowed.headers - X-FHIR-Starter,Origin,Accept,X-Requested-With,Content-Type,Access-Control-Request-Method,Access-Control-Request-Headers - - - A comma separated list non-standard response headers that will be exposed to XHR2 object. - cors.exposed.headers - Location,Content-Location - - - A flag that suggests if CORS is supported with cookies - cors.support.credentials - true - - - A flag to control logging - cors.logging.enabled - true - - - Indicates how long (in seconds) the results of a preflight request can be cached in a preflight result cache. - cors.preflight.maxage - 300 - - - - CORS Filter - /* - - - - diff --git a/hapi-fhir-tutorial/jpaserver-example-with-custom/src/main/webapp/WEB-INF/xsd/javaee_6.xsd b/hapi-fhir-tutorial/jpaserver-example-with-custom/src/main/webapp/WEB-INF/xsd/javaee_6.xsd deleted file mode 100644 index 9fb587749ce..00000000000 --- a/hapi-fhir-tutorial/jpaserver-example-with-custom/src/main/webapp/WEB-INF/xsd/javaee_6.xsd +++ /dev/null @@ -1,2419 +0,0 @@ - - - - - - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - - Copyright 2003-2009 Sun Microsystems, Inc. All rights reserved. - - The contents of this file are subject to the terms of either the - GNU General Public License Version 2 only ("GPL") or the Common - Development and Distribution License("CDDL") (collectively, the - "License"). You may not use this file except in compliance with - the License. You can obtain a copy of the License at - https://glassfish.dev.java.net/public/CDDL+GPL.html or - glassfish/bootstrap/legal/LICENSE.txt. See the License for the - specific language governing permissions and limitations under the - License. - - When distributing the software, include this License Header - Notice in each file and include the License file at - glassfish/bootstrap/legal/LICENSE.txt. Sun designates this - particular file as subject to the "Classpath" exception as - provided by Sun in the GPL Version 2 section of the License file - that accompanied this code. If applicable, add the following - below the License Header, with the fields enclosed by brackets [] - replaced by your own identifying information: - "Portions Copyrighted [year] [name of copyright owner]" - - Contributor(s): - - If you wish your version of this file to be governed by only the - CDDL or only the GPL Version 2, indicate your decision by adding - "[Contributor] elects to include this software in this - distribution under the [CDDL or GPL Version 2] license." If you - don't indicate a single choice of license, a recipient has the - option to distribute your version of this file under either the - CDDL, the GPL Version 2 or to extend the choice of license to its - licensees as provided above. However, if you add GPL Version 2 - code and therefore, elected the GPL Version 2 license, then the - option applies only if the new code is made subject to such - option by the copyright holder. - - - - - - - - The following definitions that appear in the common - shareable schema(s) of Java EE deployment descriptors should be - interpreted with respect to the context they are included: - - Deployment Component may indicate one of the following: - java ee application; - application client; - web application; - enterprise bean; - resource adapter; - - Deployment File may indicate one of the following: - ear file; - war file; - jar file; - rar file; - - - - - - - - - - - This group keeps the usage of the contained description related - elements consistent across Java EE deployment descriptors. - - All elements may occur multiple times with different languages, - to support localization of the content. - - - - - - - - - - - - - - - This group keeps the usage of the contained JNDI environment - reference elements consistent across Java EE deployment descriptors. - - - - - - - - - - - - - - - - - - - - - - - This group collects elements that are common to most - JNDI resource elements. - - - - - - - - - - The JNDI name to be looked up to resolve a resource reference. - - - - - - - - - - - - This group collects elements that are common to all the - JNDI resource elements. It does not include the lookup-name - element, that is only applicable to some resource elements. - - - - - - - - - A product specific name that this resource should be - mapped to. The name of this resource, as defined by the - resource's name element or defaulted, is a name that is - local to the application component using the resource. - (It's a name in the JNDI java:comp/env namespace.) Many - application servers provide a way to map these local - names to names of resources known to the application - server. This mapped name is often a global JNDI name, - but may be a name of any form. - - Application servers are not required to support any - particular form or type of mapped name, nor the ability - to use mapped names. The mapped name is - product-dependent and often installation-dependent. No - use of a mapped name is portable. - - - - - - - - - - - - - - - - Configuration of a DataSource. - - - - - - - - - Description of this DataSource. - - - - - - - - - The name element specifies the JNDI name of the - data source being defined. - - - - - - - - - DataSource, XADataSource or ConnectionPoolDataSource - implementation class. - - - - - - - - - Database server name. - - - - - - - - - Port number where a server is listening for requests. - - - - - - - - - Name of a database on a server. - - - - - - - - url property is specified - along with other standard DataSource properties - such as serverName, databaseName - and portNumber, the more specific properties will - take precedence and url will be ignored. - - ]]> - - - - - - - - User name to use for connection authentication. - - - - - - - - - Password to use for connection authentication. - - - - - - - - - JDBC DataSource property. This may be a vendor-specific - property or a less commonly used DataSource property. - - - - - - - - - Sets the maximum time in seconds that this data source - will wait while attempting to connect to a database. - - - - - - - - - Set to false if connections should not participate in - transactions. - - - - - - - - - Isolation level for connections. - - - - - - - - - Number of connections that should be created when a - connection pool is initialized. - - - - - - - - - Maximum number of connections that should be concurrently - allocated for a connection pool. - - - - - - - - - Minimum number of connections that should be concurrently - allocated for a connection pool. - - - - - - - - - The number of seconds that a physical connection should - remain unused in the pool before the connection is - closed for a connection pool. - - - - - - - - - The total number of statements that a connection pool - should keep open. - - - - - - - - - - - - - - - - The description type is used by a description element to - provide text describing the parent element. The elements - that use this type should include any information that the - Deployment Component's Deployment File file producer wants - to provide to the consumer of the Deployment Component's - Deployment File (i.e., to the Deployer). Typically, the - tools used by such a Deployment File consumer will display - the description when processing the parent element that - contains the description. - - The lang attribute defines the language that the - description is provided in. The default value is "en" (English). - - - - - - - - - - - - - - - This type defines a dewey decimal that is used - to describe versions of documents. - - - - - - - - - - - - - - - - Employee Self Service - - - The value of the xml:lang attribute is "en" (English) by default. - - ]]> - - - - - - - - - - - - - - - - EmployeeRecord - - ../products/product.jar#ProductEJB - - ]]> - - - - - - - - - - - - - - - The ejb-local-refType is used by ejb-local-ref elements for - the declaration of a reference to an enterprise bean's local - home or to the local business interface of a 3.0 bean. - The declaration consists of: - - - an optional description - - the EJB reference name used in the code of the Deployment - Component that's referencing the enterprise bean. - - the optional expected type of the referenced enterprise bean - - the optional expected local interface of the referenced - enterprise bean or the local business interface of the - referenced enterprise bean. - - the optional expected local home interface of the referenced - enterprise bean. Not applicable if this ejb-local-ref refers - to the local business interface of a 3.0 bean. - - optional ejb-link information, used to specify the - referenced enterprise bean - - optional elements to define injection of the named enterprise - bean into a component field or property. - - - - - - - - - - - - - - - - - - - - - - ejb/Payroll - - ]]> - - - - - - - - - - - - - - - The ejb-refType is used by ejb-ref elements for the - declaration of a reference to an enterprise bean's home or - to the remote business interface of a 3.0 bean. - The declaration consists of: - - - an optional description - - the EJB reference name used in the code of - the Deployment Component that's referencing the enterprise - bean. - - the optional expected type of the referenced enterprise bean - - the optional remote interface of the referenced enterprise bean - or the remote business interface of the referenced enterprise - bean - - the optional expected home interface of the referenced - enterprise bean. Not applicable if this ejb-ref - refers to the remote business interface of a 3.0 bean. - - optional ejb-link information, used to specify the - referenced enterprise bean - - optional elements to define injection of the named enterprise - bean into a component field or property - - - - - - - - - - - - - - - - - - - - - - - The ejb-ref-typeType contains the expected type of the - referenced enterprise bean. - - The ejb-ref-type designates a value - that must be one of the following: - - Entity - Session - - - - - - - - - - - - - - - - - - - This type is used to designate an empty - element when used. - - - - - - - - - - - - - - The env-entryType is used to declare an application's - environment entry. The declaration consists of an optional - description, the name of the environment entry, a type - (optional if the value is injected, otherwise required), and - an optional value. - - It also includes optional elements to define injection of - the named resource into fields or JavaBeans properties. - - If a value is not specified and injection is requested, - no injection will occur and no entry of the specified name - will be created. This allows an initial value to be - specified in the source code without being incorrectly - changed when no override has been specified. - - If a value is not specified and no injection is requested, - a value must be supplied during deployment. - - This type is used by env-entry elements. - - - - - - - - - minAmount - - ]]> - - - - - - - java.lang.Integer - - ]]> - - - - - - - 100.00 - - ]]> - - - - - - - - - - - - - - - java.lang.Boolean - java.lang.Class - com.example.Color - - ]]> - - - - - - - - - - - - - - - The elements that use this type designate the name of a - Java class or interface. The name is in the form of a - "binary name", as defined in the JLS. This is the form - of name used in Class.forName(). Tools that need the - canonical name (the name used in source code) will need - to convert this binary name to the canonical name. - - - - - - - - - - - - - - - - This type defines four different values which can designate - boolean values. This includes values yes and no which are - not designated by xsd:boolean - - - - - - - - - - - - - - - - - - - - - The icon type contains small-icon and large-icon elements - that specify the file names for small and large GIF, JPEG, - or PNG icon images used to represent the parent element in a - GUI tool. - - The xml:lang attribute defines the language that the - icon file names are provided in. Its value is "en" (English) - by default. - - - - - - - - employee-service-icon16x16.jpg - - ]]> - - - - - - - employee-service-icon32x32.jpg - - ]]> - - - - - - - - - - - - - - - - An injection target specifies a class and a name within - that class into which a resource should be injected. - - The injection target class specifies the fully qualified - class name that is the target of the injection. The - Java EE specifications describe which classes can be an - injection target. - - The injection target name specifies the target within - the specified class. The target is first looked for as a - JavaBeans property name. If not found, the target is - looked for as a field name. - - The specified resource will be injected into the target - during initialization of the class by either calling the - set method for the target property or by setting a value - into the named field. - - - - - - - - - - - - - - The following transaction isolation levels are allowed - (see documentation for the java.sql.Connection interface): - TRANSACTION_READ_UNCOMMITTED - TRANSACTION_READ_COMMITTED - TRANSACTION_REPEATABLE_READ - TRANSACTION_SERIALIZABLE - - - - - - - - - - - - - - - - - - - The java-identifierType defines a Java identifier. - The users of this type should further verify that - the content does not contain Java reserved keywords. - - - - - - - - - - - - - - - - - - This is a generic type that designates a Java primitive - type or a fully qualified name of a Java interface/type, - or an array of such types. - - - - - - - - - - - - - - - - - : - - Example: - - jdbc:mysql://localhost:3307/testdb - - ]]> - - - - - - - - - - - - - - - - - The jndi-nameType type designates a JNDI name in the - Deployment Component's environment and is relative to the - java:comp/env context. A JNDI name must be unique within the - Deployment Component. - - - - - - - - - - - - - - - com.aardvark.payroll.PayrollHome - - ]]> - - - - - - - - - - - - - - - The lifecycle-callback type specifies a method on a - class to be called when a lifecycle event occurs. - Note that each class may have only one lifecycle callback - method for any given event and that the method may not - be overloaded. - - If the lifefycle-callback-class element is missing then - the class defining the callback is assumed to be the - component class in scope at the place in the descriptor - in which the callback definition appears. - - - - - - - - - - - - - - - - - The listenerType indicates the deployment properties for a web - application listener bean. - - - - - - - - - - The listener-class element declares a class in the - application must be registered as a web - application listener bean. The value is the fully - qualified classname of the listener class. - - - - - - - - - - - - - - - - The localType defines the fully-qualified name of an - enterprise bean's local interface. - - - - - - - - - - - - - - - - The local-homeType defines the fully-qualified - name of an enterprise bean's local home interface. - - - - - - - - - - - - - - - - This type is a general type that can be used to declare - parameter/value lists. - - - - - - - - - - The param-name element contains the name of a - parameter. - - - - - - - - - The param-value element contains the value of a - parameter. - - - - - - - - - - - - - - - - The elements that use this type designate either a relative - path or an absolute path starting with a "/". - - In elements that specify a pathname to a file within the - same Deployment File, relative filenames (i.e., those not - starting with "/") are considered relative to the root of - the Deployment File's namespace. Absolute filenames (i.e., - those starting with "/") also specify names in the root of - the Deployment File's namespace. In general, relative names - are preferred. The exception is .war files where absolute - names are preferred for consistency with the Servlet API. - - - - - - - - - - - - - - - - myPersistenceContext - - - - - myPersistenceContext - - PersistenceUnit1 - - Extended - - - ]]> - - - - - - - - - The persistence-context-ref-name element specifies - the name of a persistence context reference; its - value is the environment entry name used in - Deployment Component code. The name is a JNDI name - relative to the java:comp/env context. - - - - - - - - - The Application Assembler(or BeanProvider) may use the - following syntax to avoid the need to rename persistence - units to have unique names within a Java EE application. - - The Application Assembler specifies the pathname of the - root of the persistence.xml file for the referenced - persistence unit and appends the name of the persistence - unit separated from the pathname by #. The pathname is - relative to the referencing application component jar file. - In this manner, multiple persistence units with the same - persistence unit name may be uniquely identified when the - Application Assembler cannot change persistence unit names. - - - - - - - - - - Used to specify properties for the container or persistence - provider. Vendor-specific properties may be included in - the set of properties. Properties that are not recognized - by a vendor must be ignored. Entries that make use of the - namespace javax.persistence and its subnamespaces must not - be used for vendor-specific properties. The namespace - javax.persistence is reserved for use by the specification. - - - - - - - - - - - - - - - - - The persistence-context-typeType specifies the transactional - nature of a persistence context reference. - - The value of the persistence-context-type element must be - one of the following: - Transaction - Extended - - - - - - - - - - - - - - - - - - - Specifies a name/value pair. - - - - - - - - - - - - - - - - - - - - myPersistenceUnit - - - - - myPersistenceUnit - - PersistenceUnit1 - - - - ]]> - - - - - - - - - The persistence-unit-ref-name element specifies - the name of a persistence unit reference; its - value is the environment entry name used in - Deployment Component code. The name is a JNDI name - relative to the java:comp/env context. - - - - - - - - - The Application Assembler(or BeanProvider) may use the - following syntax to avoid the need to rename persistence - units to have unique names within a Java EE application. - - The Application Assembler specifies the pathname of the - root of the persistence.xml file for the referenced - persistence unit and appends the name of the persistence - unit separated from the pathname by #. The pathname is - relative to the referencing application component jar file. - In this manner, multiple persistence units with the same - persistence unit name may be uniquely identified when the - Application Assembler cannot change persistence unit names. - - - - - - - - - - - - - - - - com.wombat.empl.EmployeeService - - ]]> - - - - - - - - - - - - - - - jms/StockQueue - - javax.jms.Queue - - - - ]]> - - - - - - - - - The resource-env-ref-name element specifies the name - of a resource environment reference; its value is - the environment entry name used in - the Deployment Component code. The name is a JNDI - name relative to the java:comp/env context and must - be unique within a Deployment Component. - - - - - - - - - The resource-env-ref-type element specifies the type - of a resource environment reference. It is the - fully qualified name of a Java language class or - interface. - - - - - - - - - - - - - - - - - jdbc/EmployeeAppDB - javax.sql.DataSource - Container - Shareable - - - ]]> - - - - - - - - - The res-ref-name element specifies the name of a - resource manager connection factory reference. - The name is a JNDI name relative to the - java:comp/env context. - The name must be unique within a Deployment File. - - - - - - - - - The res-type element specifies the type of the data - source. The type is specified by the fully qualified - Java language class or interface - expected to be implemented by the data source. - - - - - - - - - - - - - - - - - - - The res-authType specifies whether the Deployment Component - code signs on programmatically to the resource manager, or - whether the Container will sign on to the resource manager - on behalf of the Deployment Component. In the latter case, - the Container uses information that is supplied by the - Deployer. - - The value must be one of the two following: - - Application - Container - - - - - - - - - - - - - - - - - - - The res-sharing-scope type specifies whether connections - obtained through the given resource manager connection - factory reference can be shared. The value, if specified, - must be one of the two following: - - Shareable - Unshareable - - The default value is Shareable. - - - - - - - - - - - - - - - - - - - The run-asType specifies the run-as identity to be - used for the execution of a component. It contains an - optional description, and the name of a security role. - - - - - - - - - - - - - - - - - - The role-nameType designates the name of a security role. - - The name must conform to the lexical rules for a token. - - - - - - - - - - - - - - - - - This role includes all employees who are authorized - to access the employee service application. - - employee - - - ]]> - - - - - - - - - - - - - - - - - The security-role-refType contains the declaration of a - security role reference in a component's or a - Deployment Component's code. The declaration consists of an - optional description, the security role name used in the - code, and an optional link to a security role. If the - security role is not specified, the Deployer must choose an - appropriate security role. - - - - - - - - - - The value of the role-name element must be the String used - as the parameter to the - EJBContext.isCallerInRole(String roleName) method or the - HttpServletRequest.isUserInRole(String role) method. - - - - - - - - - The role-link element is a reference to a defined - security role. The role-link element must contain - the name of one of the security roles defined in the - security-role elements. - - - - - - - - - - - - - - - - This type adds an "id" attribute to xsd:QName. - - - - - - - - - - - - - - - - - - This type adds an "id" attribute to xsd:boolean. - - - - - - - - - - - - - - - - - - This type adds an "id" attribute to xsd:NMTOKEN. - - - - - - - - - - - - - - - - - - This type adds an "id" attribute to xsd:anyURI. - - - - - - - - - - - - - - - - - - This type adds an "id" attribute to xsd:integer. - - - - - - - - - - - - - - - - - - This type adds an "id" attribute to xsd:positiveInteger. - - - - - - - - - - - - - - - - - - This type adds an "id" attribute to xsd:nonNegativeInteger. - - - - - - - - - - - - - - - - - - This type adds an "id" attribute to xsd:string. - - - - - - - - - - - - - - - - - - This is a special string datatype that is defined by Java EE as - a base type for defining collapsed strings. When schemas - require trailing/leading space elimination as well as - collapsing the existing whitespace, this base type may be - used. - - - - - - - - - - - - - - - - - - This simple type designates a boolean with only two - permissible values - - - true - - false - - - - - - - - - - - - - - - - - - The url-patternType contains the url pattern of the mapping. - It must follow the rules specified in Section 11.2 of the - Servlet API Specification. This pattern is assumed to be in - URL-decoded form and must not contain CR(#xD) or LF(#xA). - If it contains those characters, the container must inform - the developer with a descriptive error message. - The container must preserve all characters including whitespaces. - - - - - - - - - - - - - - - - CorporateStocks - - - - ]]> - - - - - - - - - The message-destination-name element specifies a - name for a message destination. This name must be - unique among the names of message destinations - within the Deployment File. - - - - - - - - - A product specific name that this message destination - should be mapped to. Each message-destination-ref - element that references this message destination will - define a name in the namespace of the referencing - component or in one of the other predefined namespaces. - Many application servers provide a way to map these - local names to names of resources known to the - application server. This mapped name is often a global - JNDI name, but may be a name of any form. Each of the - local names should be mapped to this same global name. - - Application servers are not required to support any - particular form or type of mapped name, nor the ability - to use mapped names. The mapped name is - product-dependent and often installation-dependent. No - use of a mapped name is portable. - - - - - - - - - The JNDI name to be looked up to resolve the message destination. - - - - - - - - - - - - - - - - jms/StockQueue - - javax.jms.Queue - - Consumes - - CorporateStocks - - - - ]]> - - - - - - - - - The message-destination-ref-name element specifies - the name of a message destination reference; its - value is the environment entry name used in - Deployment Component code. - - - - - - - - - - - - - - - - - - - - The message-destination-usageType specifies the use of the - message destination indicated by the reference. The value - indicates whether messages are consumed from the message - destination, produced for the destination, or both. The - Assembler makes use of this information in linking producers - of a destination with its consumers. - - The value of the message-destination-usage element must be - one of the following: - Consumes - Produces - ConsumesProduces - - - - - - - - - - - - - - - - - - - javax.jms.Queue - - - ]]> - - - - - - - - - - - - - - - The message-destination-linkType is used to link a message - destination reference or message-driven bean to a message - destination. - - The Assembler sets the value to reflect the flow of messages - between producers and consumers in the application. - - The value must be the message-destination-name of a message - destination in the same Deployment File or in another - Deployment File in the same Java EE application unit. - - Alternatively, the value may be composed of a path name - specifying a Deployment File containing the referenced - message destination with the message-destination-name of the - destination appended and separated from the path name by - "#". The path name is relative to the Deployment File - containing Deployment Component that is referencing the - message destination. This allows multiple message - destinations with the same name to be uniquely identified. - - - - - - - - - diff --git a/hapi-fhir-tutorial/jpaserver-example-with-custom/src/main/webapp/WEB-INF/xsd/jsp_2_2.xsd b/hapi-fhir-tutorial/jpaserver-example-with-custom/src/main/webapp/WEB-INF/xsd/jsp_2_2.xsd deleted file mode 100644 index fa41e4266f1..00000000000 --- a/hapi-fhir-tutorial/jpaserver-example-with-custom/src/main/webapp/WEB-INF/xsd/jsp_2_2.xsd +++ /dev/null @@ -1,389 +0,0 @@ - - - - - - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - - Copyright 2003-2009 Sun Microsystems, Inc. All rights reserved. - - The contents of this file are subject to the terms of either the - GNU General Public License Version 2 only ("GPL") or the Common - Development and Distribution License("CDDL") (collectively, the - "License"). You may not use this file except in compliance with - the License. You can obtain a copy of the License at - https://glassfish.dev.java.net/public/CDDL+GPL.html or - glassfish/bootstrap/legal/LICENSE.txt. See the License for the - specific language governing permissions and limitations under the - License. - - When distributing the software, include this License Header - Notice in each file and include the License file at - glassfish/bootstrap/legal/LICENSE.txt. Sun designates this - particular file as subject to the "Classpath" exception as - provided by Sun in the GPL Version 2 section of the License file - that accompanied this code. If applicable, add the following - below the License Header, with the fields enclosed by brackets [] - replaced by your own identifying information: - "Portions Copyrighted [year] [name of copyright owner]" - - Contributor(s): - - If you wish your version of this file to be governed by only the - CDDL or only the GPL Version 2, indicate your decision by adding - "[Contributor] elects to include this software in this - distribution under the [CDDL or GPL Version 2] license." If you - don't indicate a single choice of license, a recipient has the - option to distribute your version of this file under either the - CDDL, the GPL Version 2 or to extend the choice of license to its - licensees as provided above. However, if you add GPL Version 2 - code and therefore, elected the GPL Version 2 license, then the - option applies only if the new code is made subject to such - option by the copyright holder. - - - - - - - - This is the XML Schema for the JSP 2.2 deployment descriptor - types. The JSP 2.2 schema contains all the special - structures and datatypes that are necessary to use JSP files - from a web application. - - The contents of this schema is used by the web-common_3_0.xsd - file to define JSP specific content. - - - - - - - - The following conventions apply to all Java EE - deployment descriptor elements unless indicated otherwise. - - - In elements that specify a pathname to a file within the - same JAR file, relative filenames (i.e., those not - starting with "/") are considered relative to the root of - the JAR file's namespace. Absolute filenames (i.e., those - starting with "/") also specify names in the root of the - JAR file's namespace. In general, relative names are - preferred. The exception is .war files where absolute - names are preferred for consistency with the Servlet API. - - - - - - - - - - - - - - The jsp-configType is used to provide global configuration - information for the JSP files in a web application. It has - two subelements, taglib and jsp-property-group. - - - - - - - - - - - - - - - - - - The jsp-file element contains the full path to a JSP file - within the web application beginning with a `/'. - - - - - - - - - - - - - - - - The jsp-property-groupType is used to group a number of - files so they can be given global property information. - All files so described are deemed to be JSP files. The - following additional properties can be described: - - - Control whether EL is ignored. - - Control whether scripting elements are invalid. - - Indicate pageEncoding information. - - Indicate that a resource is a JSP document (XML). - - Prelude and Coda automatic includes. - - Control whether the character sequence #{ is allowed - when used as a String literal. - - Control whether template text containing only - whitespaces must be removed from the response output. - - Indicate the default contentType information. - - Indicate the default buffering model for JspWriter - - Control whether error should be raised for the use of - undeclared namespaces in a JSP page. - - - - - - - - - - - Can be used to easily set the isELIgnored - property of a group of JSP pages. By default, the - EL evaluation is enabled for Web Applications using - a Servlet 2.4 or greater web.xml, and disabled - otherwise. - - - - - - - - - The valid values of page-encoding are those of the - pageEncoding page directive. It is a - translation-time error to name different encodings - in the pageEncoding attribute of the page directive - of a JSP page and in a JSP configuration element - matching the page. It is also a translation-time - error to name different encodings in the prolog - or text declaration of a document in XML syntax and - in a JSP configuration element matching the document. - It is legal to name the same encoding through - mulitple mechanisms. - - - - - - - - - Can be used to easily disable scripting in a - group of JSP pages. By default, scripting is - enabled. - - - - - - - - - If true, denotes that the group of resources - that match the URL pattern are JSP documents, - and thus must be interpreted as XML documents. - If false, the resources are assumed to not - be JSP documents, unless there is another - property group that indicates otherwise. - - - - - - - - - The include-prelude element is a context-relative - path that must correspond to an element in the - Web Application. When the element is present, - the given path will be automatically included (as - in an include directive) at the beginning of each - JSP page in this jsp-property-group. - - - - - - - - - The include-coda element is a context-relative - path that must correspond to an element in the - Web Application. When the element is present, - the given path will be automatically included (as - in an include directive) at the end of each - JSP page in this jsp-property-group. - - - - - - - - - The character sequence #{ is reserved for EL expressions. - Consequently, a translation error occurs if the #{ - character sequence is used as a String literal, unless - this element is enabled (true). Disabled (false) by - default. - - - - - - - - - Indicates that template text containing only whitespaces - must be removed from the response output. It has no - effect on JSP documents (XML syntax). Disabled (false) - by default. - - - - - - - - - The valid values of default-content-type are those of the - contentType page directive. It specifies the default - response contentType if the page directive does not include - a contentType attribute. - - - - - - - - - The valid values of buffer are those of the - buffer page directive. It specifies if buffering should be - used for the output to response, and if so, the size of the - buffer to use. - - - - - - - - - The default behavior when a tag with unknown namespace is used - in a JSP page (regular syntax) is to silently ignore it. If - set to true, then an error must be raised during the translation - time when an undeclared tag is used in a JSP page. Disabled - (false) by default. - - - - - - - - - - - - - - - - The taglibType defines the syntax for declaring in - the deployment descriptor that a tag library is - available to the application. This can be done - to override implicit map entries from TLD files and - from the container. - - - - - - - - - A taglib-uri element describes a URI identifying a - tag library used in the web application. The body - of the taglib-uri element may be either an - absolute URI specification, or a relative URI. - There should be no entries in web.xml with the - same taglib-uri value. - - - - - - - - - the taglib-location element contains the location - (as a resource relative to the root of the web - application) where to find the Tag Library - Description file for the tag library. - - - - - - - - - diff --git a/hapi-fhir-tutorial/jpaserver-example-with-custom/src/main/webapp/WEB-INF/xsd/web-app_3_0.xsd b/hapi-fhir-tutorial/jpaserver-example-with-custom/src/main/webapp/WEB-INF/xsd/web-app_3_0.xsd deleted file mode 100644 index bbcdf43cd3a..00000000000 --- a/hapi-fhir-tutorial/jpaserver-example-with-custom/src/main/webapp/WEB-INF/xsd/web-app_3_0.xsd +++ /dev/null @@ -1,272 +0,0 @@ - - - - - - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - - Copyright 2003-2009 Sun Microsystems, Inc. All rights reserved. - - The contents of this file are subject to the terms of either the - GNU General Public License Version 2 only ("GPL") or the Common - Development and Distribution License("CDDL") (collectively, the - "License"). You may not use this file except in compliance with - the License. You can obtain a copy of the License at - https://glassfish.dev.java.net/public/CDDL+GPL.html or - glassfish/bootstrap/legal/LICENSE.txt. See the License for the - specific language governing permissions and limitations under the - License. - - When distributing the software, include this License Header - Notice in each file and include the License file at - glassfish/bootstrap/legal/LICENSE.txt. Sun designates this - particular file as subject to the "Classpath" exception as - provided by Sun in the GPL Version 2 section of the License file - that accompanied this code. If applicable, add the following - below the License Header, with the fields enclosed by brackets [] - replaced by your own identifying information: - "Portions Copyrighted [year] [name of copyright owner]" - - Contributor(s): - - If you wish your version of this file to be governed by only the - CDDL or only the GPL Version 2, indicate your decision by adding - "[Contributor] elects to include this software in this - distribution under the [CDDL or GPL Version 2] license." If you - don't indicate a single choice of license, a recipient has the - option to distribute your version of this file under either the - CDDL, the GPL Version 2 or to extend the choice of license to its - licensees as provided above. However, if you add GPL Version 2 - code and therefore, elected the GPL Version 2 license, then the - option applies only if the new code is made subject to such - option by the copyright holder. - - - - - - - - ... - - - The instance documents may indicate the published version of - the schema using the xsi:schemaLocation attribute for Java EE - namespace with the following location: - - http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd - - ]]> - - - - - - - The following conventions apply to all Java EE - deployment descriptor elements unless indicated otherwise. - - - In elements that specify a pathname to a file within the - same JAR file, relative filenames (i.e., those not - starting with "/") are considered relative to the root of - the JAR file's namespace. Absolute filenames (i.e., those - starting with "/") also specify names in the root of the - JAR file's namespace. In general, relative names are - preferred. The exception is .war files where absolute - names are preferred for consistency with the Servlet API. - - - - - - - - - - - - - - The web-app element is the root of the deployment - descriptor for a web application. Note that the sub-elements - of this element can be in the arbitrary order. Because of - that, the multiplicity of the elements of distributable, - session-config, welcome-file-list, jsp-config, login-config, - and locale-encoding-mapping-list was changed from "?" to "*" - in this schema. However, the deployment descriptor instance - file must not contain multiple elements of session-config, - jsp-config, and login-config. When there are multiple elements of - welcome-file-list or locale-encoding-mapping-list, the container - must concatenate the element contents. The multiple occurence - of the element distributable is redundant and the container - treats that case exactly in the same way when there is only - one distributable. - - - - - - - - The servlet element contains the name of a servlet. - The name must be unique within the web application. - - - - - - - - - - - The filter element contains the name of a filter. - The name must be unique within the web application. - - - - - - - - - - - The ejb-local-ref-name element contains the name of an EJB - reference. The EJB reference is an entry in the web - application's environment and is relative to the - java:comp/env context. The name must be unique within - the web application. - - It is recommended that name is prefixed with "ejb/". - - - - - - - - - - - The ejb-ref-name element contains the name of an EJB - reference. The EJB reference is an entry in the web - application's environment and is relative to the - java:comp/env context. The name must be unique within - the web application. - - It is recommended that name is prefixed with "ejb/". - - - - - - - - - - - The resource-env-ref-name element specifies the name of - a resource environment reference; its value is the - environment entry name used in the web application code. - The name is a JNDI name relative to the java:comp/env - context and must be unique within a web application. - - - - - - - - - - - The message-destination-ref-name element specifies the name of - a message destination reference; its value is the - environment entry name used in the web application code. - The name is a JNDI name relative to the java:comp/env - context and must be unique within a web application. - - - - - - - - - - - The res-ref-name element specifies the name of a - resource manager connection factory reference. The name - is a JNDI name relative to the java:comp/env context. - The name must be unique within a web application. - - - - - - - - - - - The env-entry-name element contains the name of a web - application's environment entry. The name is a JNDI - name relative to the java:comp/env context. The name - must be unique within a web application. - - - - - - - - - - - A role-name-key is specified to allow the references - from the security-role-refs. - - - - - - - - - - - The keyref indicates the references from - security-role-ref to a specified role-name. - - - - - - - - - diff --git a/hapi-fhir-tutorial/jpaserver-example-with-custom/src/main/webapp/WEB-INF/xsd/web-common_3_0.xsd b/hapi-fhir-tutorial/jpaserver-example-with-custom/src/main/webapp/WEB-INF/xsd/web-common_3_0.xsd deleted file mode 100644 index f994bc2c651..00000000000 --- a/hapi-fhir-tutorial/jpaserver-example-with-custom/src/main/webapp/WEB-INF/xsd/web-common_3_0.xsd +++ /dev/null @@ -1,1575 +0,0 @@ - - - - - - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - - Copyright 2003-2009 Sun Microsystems, Inc. All rights reserved. - - The contents of this file are subject to the terms of either the - GNU General Public License Version 2 only ("GPL") or the Common - Development and Distribution License("CDDL") (collectively, the - "License"). You may not use this file except in compliance with - the License. You can obtain a copy of the License at - https://glassfish.dev.java.net/public/CDDL+GPL.html or - glassfish/bootstrap/legal/LICENSE.txt. See the License for the - specific language governing permissions and limitations under the - License. - - When distributing the software, include this License Header - Notice in each file and include the License file at - glassfish/bootstrap/legal/LICENSE.txt. Sun designates this - particular file as subject to the "Classpath" exception as - provided by Sun in the GPL Version 2 section of the License file - that accompanied this code. If applicable, add the following - below the License Header, with the fields enclosed by brackets [] - replaced by your own identifying information: - "Portions Copyrighted [year] [name of copyright owner]" - - Contributor(s): - - If you wish your version of this file to be governed by only the - CDDL or only the GPL Version 2, indicate your decision by adding - "[Contributor] elects to include this software in this - distribution under the [CDDL or GPL Version 2] license." If you - don't indicate a single choice of license, a recipient has the - option to distribute your version of this file under either the - CDDL, the GPL Version 2 or to extend the choice of license to its - licensees as provided above. However, if you add GPL Version 2 - code and therefore, elected the GPL Version 2 license, then the - option applies only if the new code is made subject to such - option by the copyright holder. - - - - - - - - ... - - - The instance documents may indicate the published version of - the schema using the xsi:schemaLocation attribute for Java EE - namespace with the following location: - - http://java.sun.com/xml/ns/javaee/web-common_3_0.xsd - - ]]> - - - - - - - The following conventions apply to all Java EE - deployment descriptor elements unless indicated otherwise. - - - In elements that specify a pathname to a file within the - same JAR file, relative filenames (i.e., those not - starting with "/") are considered relative to the root of - the JAR file's namespace. Absolute filenames (i.e., those - starting with "/") also specify names in the root of the - JAR file's namespace. In general, relative names are - preferred. The exception is .war files where absolute - names are preferred for consistency with the Servlet API. - - - - - - - - - - - - - - - - - The context-param element contains the declaration - of a web application's servlet context - initialization parameters. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - The metadata-complete attribute defines whether this - deployment descriptor and other related deployment - descriptors for this module (e.g., web service - descriptors) are complete, or whether the class - files available to this module and packaged with - this application should be examined for annotations - that specify deployment information. - - If metadata-complete is set to "true", the deployment - tool must ignore any annotations that specify deployment - information, which might be present in the class files - of the application. - - If metadata-complete is not specified or is set to - "false", the deployment tool must examine the class - files of the application for annotations, as - specified by the specifications. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - The auth-constraintType indicates the user roles that - should be permitted access to this resource - collection. The role-name used here must either correspond - to the role-name of one of the security-role elements - defined for this web application, or be the specially - reserved role-name "*" that is a compact syntax for - indicating all roles in the web application. If both "*" - and rolenames appear, the container interprets this as all - roles. If no roles are defined, no user is allowed access - to the portion of the web application described by the - containing security-constraint. The container matches - role names case sensitively when determining access. - - - - - - - - - - - - - - - - - - The auth-methodType is used to configure the authentication - mechanism for the web application. As a prerequisite to - gaining access to any web resources which are protected by - an authorization constraint, a user must have authenticated - using the configured mechanism. Legal values are "BASIC", - "DIGEST", "FORM", "CLIENT-CERT", or a vendor-specific - authentication scheme. - - Used in: login-config - - - - - - - - - - - - - - - - The dispatcher has five legal values: FORWARD, REQUEST, - INCLUDE, ASYNC, and ERROR. - - A value of FORWARD means the Filter will be applied under - RequestDispatcher.forward() calls. - A value of REQUEST means the Filter will be applied under - ordinary client calls to the path or servlet. - A value of INCLUDE means the Filter will be applied under - RequestDispatcher.include() calls. - A value of ASYNC means the Filter will be applied under - calls dispatched from an AsyncContext. - A value of ERROR means the Filter will be applied under the - error page mechanism. - - The absence of any dispatcher elements in a filter-mapping - indicates a default of applying filters only under ordinary - client calls to the path or servlet. - - - - - - - - - - - - - - - - - - - - - - The error-code contains an HTTP error code, ex: 404 - - Used in: error-page - - - - - - - - - - - - - - - - - - - The error-pageType contains a mapping between an error code - or exception type to the path of a resource in the web - application. - - Error-page declarations using the exception-type element in - the deployment descriptor must be unique up to the class name of - the exception-type. Similarly, error-page declarations using the - status-code element must be unique in the deployment descriptor - up to the status code. - - Used in: web-app - - - - - - - - - - - The exception-type contains a fully qualified class - name of a Java exception type. - - - - - - - - - - The location element contains the location of the - resource in the web application relative to the root of - the web application. The value of the location must have - a leading `/'. - - - - - - - - - - - - - - - - The filterType is used to declare a filter in the web - application. The filter is mapped to either a servlet or a - URL pattern in the filter-mapping element, using the - filter-name value to reference. Filters can access the - initialization parameters declared in the deployment - descriptor at runtime via the FilterConfig interface. - - Used in: web-app - - - - - - - - - - - The fully qualified classname of the filter. - - - - - - - - - - The init-param element contains a name/value pair as - an initialization param of a servlet filter - - - - - - - - - - - - - - - - Declaration of the filter mappings in this web - application is done by using filter-mappingType. - The container uses the filter-mapping - declarations to decide which filters to apply to a request, - and in what order. The container matches the request URI to - a Servlet in the normal way. To determine which filters to - apply it matches filter-mapping declarations either on - servlet-name, or on url-pattern for each filter-mapping - element, depending on which style is used. The order in - which filters are invoked is the order in which - filter-mapping declarations that match a request URI for a - servlet appear in the list of filter-mapping elements.The - filter-name value must be the value of the filter-name - sub-elements of one of the filter declarations in the - deployment descriptor. - - - - - - - - - - - - - - - - - - - - - - This type defines a string which contains at least one - character. - - - - - - - - - - - - - - - - - - The logical name of the filter is declare - by using filter-nameType. This name is used to map the - filter. Each filter name is unique within the web - application. - - Used in: filter, filter-mapping - - - - - - - - - - - - - - - - The form-login-configType specifies the login and error - pages that should be used in form based login. If form based - authentication is not used, these elements are ignored. - - Used in: login-config - - - - - - - - - The form-login-page element defines the location in the web - app where the page that can be used for login can be - found. The path begins with a leading / and is interpreted - relative to the root of the WAR. - - - - - - - - - The form-error-page element defines the location in - the web app where the error page that is displayed - when login is not successful can be found. - The path begins with a leading / and is interpreted - relative to the root of the WAR. - - - - - - - - - - - - - A HTTP method type as defined in HTTP 1.1 section 2.2. - - - - - - - - - - - - - - - - - - - - - - - - - - The login-configType is used to configure the authentication - method that should be used, the realm name that should be - used for this application, and the attributes that are - needed by the form login mechanism. - - Used in: web-app - - - - - - - - - - The realm name element specifies the realm name to - use in HTTP Basic authorization. - - - - - - - - - - - - - - - - - The mime-mappingType defines a mapping between an extension - and a mime type. - - Used in: web-app - - - - - - - - The extension element contains a string describing an - extension. example: "txt" - - - - - - - - - - - - - - - - - The mime-typeType is used to indicate a defined mime type. - - Example: - "text/plain" - - Used in: mime-mapping - - - - - - - - - - - - - - - - - - The security-constraintType is used to associate - security constraints with one or more web resource - collections - - Used in: web-app - - - - - - - - - - - - - - - - - - - - The servletType is used to declare a servlet. - It contains the declarative data of a - servlet. If a jsp-file is specified and the load-on-startup - element is present, then the JSP should be precompiled and - loaded. - - Used in: web-app - - - - - - - - - - - - The servlet-class element contains the fully - qualified class name of the servlet. - - - - - - - - - - - - The load-on-startup element indicates that this - servlet should be loaded (instantiated and have - its init() called) on the startup of the web - application. The optional contents of these - element must be an integer indicating the order in - which the servlet should be loaded. If the value - is a negative integer, or the element is not - present, the container is free to load the servlet - whenever it chooses. If the value is a positive - integer or 0, the container must load and - initialize the servlet as the application is - deployed. The container must guarantee that - servlets marked with lower integers are loaded - before servlets marked with higher integers. The - container may choose the order of loading of - servlets with the same load-on-start-up value. - - - - - - - - - - - - - - - - - - - - - The servlet-mappingType defines a mapping between a - servlet and a url pattern. - - Used in: web-app - - - - - - - - - - - - - - - - - - The servlet-name element contains the canonical name of the - servlet. Each servlet name is unique within the web - application. - - - - - - - - - - - - - - - - The session-configType defines the session parameters - for this web application. - - Used in: web-app - - - - - - - - - The session-timeout element defines the default - session timeout interval for all sessions created - in this web application. The specified timeout - must be expressed in a whole number of minutes. - If the timeout is 0 or less, the container ensures - the default behaviour of sessions is never to time - out. If this element is not specified, the container - must set its default timeout period. - - - - - - - - - The cookie-config element defines the configuration of the - session tracking cookies created by this web application. - - - - - - - - - The tracking-mode element defines the tracking modes - for sessions created by this web application - - - - - - - - - - - - - - - - The cookie-configType defines the configuration for the - session tracking cookies of this web application. - - Used in: session-config - - - - - - - - - The name that will be assigned to any session tracking - cookies created by this web application. - The default is JSESSIONID - - - - - - - - - The domain name that will be assigned to any session tracking - cookies created by this web application. - - - - - - - - - The path that will be assigned to any session tracking - cookies created by this web application. - - - - - - - - - The comment that will be assigned to any session tracking - cookies created by this web application. - - - - - - - - - Specifies whether any session tracking cookies created - by this web application will be marked as HttpOnly - - - - - - - - - Specifies whether any session tracking cookies created - by this web application will be marked as secure - even if the request that initiated the corresponding session - is using plain HTTP instead of HTTPS - - - - - - - - - The lifetime (in seconds) that will be assigned to any - session tracking cookies created by this web application. - Default is -1 - - - - - - - - - - - - - - - - The name that will be assigned to any session tracking - cookies created by this web application. - The default is JSESSIONID - - Used in: cookie-config - - - - - - - - - - - - - - - - The domain name that will be assigned to any session tracking - cookies created by this web application. - - Used in: cookie-config - - - - - - - - - - - - - - - - The path that will be assigned to any session tracking - cookies created by this web application. - - Used in: cookie-config - - - - - - - - - - - - - - - - The comment that will be assigned to any session tracking - cookies created by this web application. - - Used in: cookie-config - - - - - - - - - - - - - - - - The tracking modes for sessions created by this web - application - - Used in: session-config - - - - - - - - - - - - - - - - - - - - The transport-guaranteeType specifies that the communication - between client and server should be NONE, INTEGRAL, or - CONFIDENTIAL. NONE means that the application does not - require any transport guarantees. A value of INTEGRAL means - that the application requires that the data sent between the - client and server be sent in such a way that it can't be - changed in transit. CONFIDENTIAL means that the application - requires that the data be transmitted in a fashion that - prevents other entities from observing the contents of the - transmission. In most cases, the presence of the INTEGRAL or - CONFIDENTIAL flag will indicate that the use of SSL is - required. - - Used in: user-data-constraint - - - - - - - - - - - - - - - - - - - - The user-data-constraintType is used to indicate how - data communicated between the client and container should be - protected. - - Used in: security-constraint - - - - - - - - - - - - - - - - - - The elements that use this type designate a path starting - with a "/" and interpreted relative to the root of a WAR - file. - - - - - - - - - - - - - - - This type contains the recognized versions of - web-application supported. It is used to designate the - version of the web application. - - - - - - - - - - - - - - - - The web-resource-collectionType is used to identify the - resources and HTTP methods on those resources to which a - security constraint applies. If no HTTP methods are specified, - then the security constraint applies to all HTTP methods. - If HTTP methods are specified by http-method-omission - elements, the security constraint applies to all methods - except those identified in the collection. - http-method-omission and http-method elements are never - mixed in the same collection. - - Used in: security-constraint - - - - - - - - - The web-resource-name contains the name of this web - resource collection. - - - - - - - - - - - - Each http-method names an HTTP method to which the - constraint applies. - - - - - - - - - Each http-method-omission names an HTTP method to - which the constraint does not apply. - - - - - - - - - - - - - - - - - The welcome-file-list contains an ordered list of welcome - files elements. - - Used in: web-app - - - - - - - - - The welcome-file element contains file name to use - as a default welcome file, such as index.html - - - - - - - - - - - - - The localeType defines valid locale defined by ISO-639-1 - and ISO-3166. - - - - - - - - - - - - - The encodingType defines IANA character sets. - - - - - - - - - - - - - - - - The locale-encoding-mapping-list contains one or more - locale-encoding-mapping(s). - - - - - - - - - - - - - - - - - The locale-encoding-mapping contains locale name and - encoding name. The locale name must be either "Language-code", - such as "ja", defined by ISO-639 or "Language-code_Country-code", - such as "ja_JP". "Country code" is defined by ISO-3166. - - - - - - - - - - - - - - - - - - This element indicates that the ordering sub-element in which - it was placed should take special action regarding the ordering - of this application resource relative to other application - configuration resources. - See section 8.2.2 of the specification for details. - - - - - - - - - - - - - - Please see section 8.2.2 of the specification for details. - - - - - - - - - - - - - - - - - Please see section 8.2.2 of the specification for details. - - - - - - - - - - - - - - - - - This element contains a sequence of "name" elements, each of - which - refers to an application configuration resource by the "name" - declared on its web.xml fragment. This element can also contain - a single "others" element which specifies that this document - comes - before or after other documents within the application. - See section 8.2.2 of the specification for details. - - - - - - - - - - - - - - - - - This element specifies configuration information related to the - handling of multipart/form-data requests. - - - - - - - - - The directory location where uploaded files will be stored - - - - - - - - - The maximum size limit of uploaded files - - - - - - - - - The maximum size limit of multipart/form-data requests - - - - - - - - - The size threshold after which an uploaded file will be - written to disk - - - - - - - - diff --git a/hapi-fhir-tutorial/jpaserver-example-with-custom/src/main/webapp/WEB-INF/xsd/xml.xsd b/hapi-fhir-tutorial/jpaserver-example-with-custom/src/main/webapp/WEB-INF/xsd/xml.xsd deleted file mode 100644 index aea7d0db0a4..00000000000 --- a/hapi-fhir-tutorial/jpaserver-example-with-custom/src/main/webapp/WEB-INF/xsd/xml.xsd +++ /dev/null @@ -1,287 +0,0 @@ - - - - - - -
-

About the XML namespace

- -
-

- This schema document describes the XML namespace, in a form - suitable for import by other schema documents. -

-

- See - http://www.w3.org/XML/1998/namespace.html and - - http://www.w3.org/TR/REC-xml for information - about this namespace. -

-

- Note that local names in this namespace are intended to be - defined only by the World Wide Web Consortium or its subgroups. - The names currently defined in this namespace are listed below. - They should not be used with conflicting semantics by any Working - Group, specification, or document instance. -

-

- See further below in this document for more information about how to refer to this schema document from your own - XSD schema documents and about the - namespace-versioning policy governing this schema document. -

-
-
- - - - - - -
- -

lang (as an attribute name)

-

- denotes an attribute whose value - is a language code for the natural language of the content of - any element; its value is inherited. This name is reserved - by virtue of its definition in the XML specification.

- -
-
-

Notes

-

- Attempting to install the relevant ISO 2- and 3-letter - codes as the enumerated possible values is probably never - going to be a realistic possibility. -

-

- See BCP 47 at - http://www.rfc-editor.org/rfc/bcp/bcp47.txt - and the IANA language subtag registry at - - http://www.iana.org/assignments/language-subtag-registry - for further information. -

-

- The union allows for the 'un-declaration' of xml:lang with - the empty string. -

-
- - - - - - - - - - - - - - - - -
- -

space (as an attribute name)

-

- denotes an attribute whose - value is a keyword indicating what whitespace processing - discipline is intended for the content of the element; its - value is inherited. This name is reserved by virtue of its - definition in the XML specification.

- -
- - - - - - - - - - - - -
- -

base (as an attribute name)

-

- denotes an attribute whose value - provides a URI to be used as the base for interpreting any - relative URIs in the scope of the element on which it - appears; its value is inherited. This name is reserved - by virtue of its definition in the XML Base specification.

- -

- See http://www.w3.org/TR/xmlbase/ - for information about this attribute. -

-
- - - - - - - -
- -

id (as an attribute name)

-

- denotes an attribute whose value - should be interpreted as if declared to be of type ID. - This name is reserved by virtue of its definition in the - xml:id specification.

- -

- See http://www.w3.org/TR/xml-id/ - for information about this attribute. -

-
- - - - - - - - - - - - - -
- -

Father (in any context at all)

- -
-

- denotes Jon Bosak, the chair of - the original XML Working Group. This name is reserved by - the following decision of the W3C XML Plenary and - XML Coordination groups: -

-
-

- In appreciation for his vision, leadership and - dedication the W3C XML Plenary on this 10th day of - February, 2000, reserves for Jon Bosak in perpetuity - the XML name "xml:Father". -

-
-
-
- - - - - -
-

About this schema document

- -
-

- This schema defines attributes and an attribute group suitable - for use by schemas wishing to allow xml:base, - xml:lang, xml:space or - xml:id attributes on elements they define. -

-

- To enable this, such a schema must import this schema for - the XML namespace, e.g. as follows: -

- 
-          <schema . . .>
-           . . .
-           <import namespace="http://www.w3.org/XML/1998/namespace"
-                      schemaLocation="http://www.w3.org/2001/xml.xsd"/>
-
-

- or -

- 
-           <import namespace="http://www.w3.org/XML/1998/namespace"
-                      schemaLocation="http://www.w3.org/2009/01/xml.xsd"/>
-
-

- Subsequently, qualified reference to any of the attributes or the - group defined below will have the desired effect, e.g. -

- 
-          <type . . .>
-           . . .
-           <attributeGroup ref="xml:specialAttrs"/>
-
-

- will define a type which will schema-validate an instance element - with any of those attributes. -

-
-
- - - - - -
-

Versioning policy for this schema document

-
-

- In keeping with the XML Schema WG's standard versioning - policy, this schema document will persist at - - http://www.w3.org/2009/01/xml.xsd. -

-

- At the date of issue it can also be found at - - http://www.w3.org/2001/xml.xsd. -

-

- The schema document at that URI may however change in the future, - in order to remain compatible with the latest version of XML - Schema itself, or with the XML namespace itself. In other words, - if the XML Schema or XML namespaces change, the version of this - document at - http://www.w3.org/2001/xml.xsd - - will change accordingly; the version at - - http://www.w3.org/2009/01/xml.xsd - - will not change. -

-

- Previous dated (and unchanging) versions of this schema - document are at: -

- -
-
- - - - - diff --git a/hapi-fhir-tutorial/jpaserver-example-with-custom/src/test/java/ca/uhn/fhir/jpa/demo/ServiceTest.java b/hapi-fhir-tutorial/jpaserver-example-with-custom/src/test/java/ca/uhn/fhir/jpa/demo/ServiceTest.java deleted file mode 100644 index 2b663ce1192..00000000000 --- a/hapi-fhir-tutorial/jpaserver-example-with-custom/src/test/java/ca/uhn/fhir/jpa/demo/ServiceTest.java +++ /dev/null @@ -1,32 +0,0 @@ -package ca.uhn.fhir.jpa.demo; - -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; -import org.springframework.context.support.FileSystemXmlApplicationContext; - -public class ServiceTest { - - private static FileSystemXmlApplicationContext ourAppCtx; - - @BeforeClass - public static void beforeClass() { - ourAppCtx = new FileSystemXmlApplicationContext( - "src/test/resources/test-hapi-fhir-server-database-config.xml", - "src/main/webapp/WEB-INF/hapi-fhir-server-config.xml", - "src/main/webapp/WEB-INF/non-fhir-services-config.xml" - ); - ourAppCtx.start(); - } - - @Test - public void testSomething() { - - } - - @AfterClass - public static void afterClass() { - ourAppCtx.stop(); - } -} - diff --git a/hapi-fhir-tutorial/jpaserver-example-with-custom/src/test/resources/test-hapi-fhir-server-config.xml b/hapi-fhir-tutorial/jpaserver-example-with-custom/src/test/resources/test-hapi-fhir-server-config.xml deleted file mode 100644 index 054e108e2e9..00000000000 --- a/hapi-fhir-tutorial/jpaserver-example-with-custom/src/test/resources/test-hapi-fhir-server-config.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/hapi-fhir-tutorial/jpaserver-example-with-custom/src/test/resources/test-hapi-fhir-server-database-config.xml b/hapi-fhir-tutorial/jpaserver-example-with-custom/src/test/resources/test-hapi-fhir-server-database-config.xml deleted file mode 100644 index 2b5d014caad..00000000000 --- a/hapi-fhir-tutorial/jpaserver-example-with-custom/src/test/resources/test-hapi-fhir-server-database-config.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - - - - - - - - - - - ca.uhn.fhir.jpa.entity - ca.uhn.fhir.jpa.model.entity - ca.uhn.fhir.jpa.demo.entity - - - - - - - - - - - - diff --git a/hapi-fhir-tutorial/jpaserver-example-with-custom/src/test/resources/test-non-fhir-services-config.xml b/hapi-fhir-tutorial/jpaserver-example-with-custom/src/test/resources/test-non-fhir-services-config.xml deleted file mode 100644 index a94a56f55ac..00000000000 --- a/hapi-fhir-tutorial/jpaserver-example-with-custom/src/test/resources/test-non-fhir-services-config.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/hapi-fhir-tutorial/simple-server/.gitignore b/hapi-fhir-tutorial/simple-server/.gitignore deleted file mode 100644 index 0ea395eea74..00000000000 --- a/hapi-fhir-tutorial/simple-server/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -.classpath -.project -/target/ -/bin/ diff --git a/hapi-fhir-tutorial/simple-server/pom.xml b/hapi-fhir-tutorial/simple-server/pom.xml deleted file mode 100644 index 939997b3c2d..00000000000 --- a/hapi-fhir-tutorial/simple-server/pom.xml +++ /dev/null @@ -1,121 +0,0 @@ - - 4.0.0 - - - - org.sonatype.oss - oss-parent - 7 - - - - ca.uhn.hapi.example - hapi-fhir-example-simple-server - 0.8 - war - - HAPI FHIR Example - Simple Server - - - - oss-snapshots - - true - - https://oss.sonatype.org/content/repositories/snapshots/ - - - - - - - - ca.uhn.hapi.fhir - hapi-fhir-base - 1.6 - - - ca.uhn.hapi.fhir - hapi-fhir-structures-dstu - 1.6 - - - - - ch.qos.logback - logback-classic - 1.1.2 - - - - - javax.servlet - javax.servlet-api - 3.0.1 - provided - - - - - - - - restful-server-example - - - - - - org.eclipse.jetty - jetty-maven-plugin - 9.1.1.v20140108 - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.1 - - 1.6 - 1.6 - - - - - - org.apache.maven.plugins - maven-deploy-plugin - - false - - - - - - - diff --git a/hapi-fhir-tutorial/simple-server/scripts/example3_create.txt b/hapi-fhir-tutorial/simple-server/scripts/example3_create.txt deleted file mode 100644 index f18d5ac3f81..00000000000 --- a/hapi-fhir-tutorial/simple-server/scripts/example3_create.txt +++ /dev/null @@ -1 +0,0 @@ -curl -H "Content-Type: application/xml+fhir" -X POST -d '' "http://localhost:8080/example03/Patient" diff --git a/hapi-fhir-tutorial/simple-server/src/main/java/ca/uhn/fhir/example/ex1/Example01_ResourceProviders.java b/hapi-fhir-tutorial/simple-server/src/main/java/ca/uhn/fhir/example/ex1/Example01_ResourceProviders.java deleted file mode 100644 index 880cc306d34..00000000000 --- a/hapi-fhir-tutorial/simple-server/src/main/java/ca/uhn/fhir/example/ex1/Example01_ResourceProviders.java +++ /dev/null @@ -1,46 +0,0 @@ -package ca.uhn.fhir.example.ex1; - -import java.util.List; - -import ca.uhn.fhir.model.api.IResource; -import ca.uhn.fhir.model.dstu.resource.Patient; -import ca.uhn.fhir.model.primitive.IdDt; -import ca.uhn.fhir.rest.annotation.Create; -import ca.uhn.fhir.rest.annotation.IdParam; -import ca.uhn.fhir.rest.annotation.OptionalParam; -import ca.uhn.fhir.rest.annotation.Read; -import ca.uhn.fhir.rest.annotation.ResourceParam; -import ca.uhn.fhir.rest.annotation.Search; -import ca.uhn.fhir.rest.param.StringParam; -import ca.uhn.fhir.rest.server.IResourceProvider; - -/** - * Note, this is an incomplete example of a resource provider. It does not - * do anything but is used as examples of methods that can be used. - */ -public class Example01_ResourceProviders implements IResourceProvider { - - @Override - public Class getResourceType() { - return Patient.class; - } - - @Read() - public Patient read(@IdParam IdDt theId) { - return null; // populate this - } - - @Create - void create(@ResourceParam Patient thePatient) { - // save the resource - } - - @Search - List search( - @OptionalParam(name="family") StringParam theFamily, - @OptionalParam(name="given") StringParam theGiven - ) { - return null; // populate this - } - -} diff --git a/hapi-fhir-tutorial/simple-server/src/main/java/ca/uhn/fhir/example/ex2/Example02_PatientResourceProvider.java b/hapi-fhir-tutorial/simple-server/src/main/java/ca/uhn/fhir/example/ex2/Example02_PatientResourceProvider.java deleted file mode 100644 index 576ae818a40..00000000000 --- a/hapi-fhir-tutorial/simple-server/src/main/java/ca/uhn/fhir/example/ex2/Example02_PatientResourceProvider.java +++ /dev/null @@ -1,46 +0,0 @@ -package ca.uhn.fhir.example.ex2; - -import java.util.HashMap; -import java.util.Map; - -import ca.uhn.fhir.model.api.IResource; -import ca.uhn.fhir.model.dstu.resource.Patient; -import ca.uhn.fhir.model.primitive.IdDt; -import ca.uhn.fhir.rest.annotation.IdParam; -import ca.uhn.fhir.rest.annotation.Read; -import ca.uhn.fhir.rest.server.IResourceProvider; -import ca.uhn.fhir.rest.server.exceptions.ResourceNotFoundException; - -/** - * This is the most basic resource provider, showing only a single - * read method on a resource provider - */ -public class Example02_PatientResourceProvider implements IResourceProvider { - - private Map myPatients = new HashMap(); - - /** Constructor */ - public Example02_PatientResourceProvider() { - Patient pat1 = new Patient(); - pat1.addIdentifier().setSystem("http://acme.com/MRNs").setValue("7000135"); - pat1.addName().addFamily("Simpson").addGiven("Homer").addGiven("J"); - myPatients.put(1L, pat1); - } - - /** All Resource Providers must implement this method */ - @Override - public Class getResourceType() { - return Patient.class; - } - - /** Simple implementation of the "read" method */ - @Read() - public Patient read(@IdParam IdDt theId) { - Patient retVal = myPatients.get(theId.getIdPartAsLong()); - if (retVal == null) { - throw new ResourceNotFoundException(theId); - } - return retVal; - } - -} diff --git a/hapi-fhir-tutorial/simple-server/src/main/java/ca/uhn/fhir/example/ex2/Example02_SimpleRestfulServer.java b/hapi-fhir-tutorial/simple-server/src/main/java/ca/uhn/fhir/example/ex2/Example02_SimpleRestfulServer.java deleted file mode 100644 index 7f541b722c5..00000000000 --- a/hapi-fhir-tutorial/simple-server/src/main/java/ca/uhn/fhir/example/ex2/Example02_SimpleRestfulServer.java +++ /dev/null @@ -1,27 +0,0 @@ -package ca.uhn.fhir.example.ex2; - -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; - -import ca.uhn.fhir.rest.server.RestfulServer; - -@WebServlet("/example02/*") -public class Example02_SimpleRestfulServer extends RestfulServer { - - private static final long serialVersionUID = 1L; - - @Override - protected void initialize() throws ServletException { - - // Set the resource providers used by this server - setResourceProviders(new Example02_PatientResourceProvider()); - - /* This just means to use Content-Types which are not technically - * FHIR compliant if a browser is detected (so that they display - * nicely for testing) */ - setUseBrowserFriendlyContentTypes(true); - - } - - -} diff --git a/hapi-fhir-tutorial/simple-server/src/main/java/ca/uhn/fhir/example/ex3/Example03_PatientResourceProvider.java b/hapi-fhir-tutorial/simple-server/src/main/java/ca/uhn/fhir/example/ex3/Example03_PatientResourceProvider.java deleted file mode 100644 index f04d266e674..00000000000 --- a/hapi-fhir-tutorial/simple-server/src/main/java/ca/uhn/fhir/example/ex3/Example03_PatientResourceProvider.java +++ /dev/null @@ -1,98 +0,0 @@ -package ca.uhn.fhir.example.ex3; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import ca.uhn.fhir.model.api.IResource; -import ca.uhn.fhir.model.dstu.resource.Patient; -import ca.uhn.fhir.model.primitive.IdDt; -import ca.uhn.fhir.rest.annotation.Create; -import ca.uhn.fhir.rest.annotation.IdParam; -import ca.uhn.fhir.rest.annotation.OptionalParam; -import ca.uhn.fhir.rest.annotation.Read; -import ca.uhn.fhir.rest.annotation.RequiredParam; -import ca.uhn.fhir.rest.annotation.ResourceParam; -import ca.uhn.fhir.rest.annotation.Search; -import ca.uhn.fhir.rest.api.MethodOutcome; -import ca.uhn.fhir.rest.param.StringParam; -import ca.uhn.fhir.rest.server.IResourceProvider; -import ca.uhn.fhir.rest.server.exceptions.ResourceNotFoundException; - -/** - * This is the most basic resource provider, showing only a single - * read method on a resource provider - */ -public class Example03_PatientResourceProvider implements IResourceProvider { - - private Map myPatients = new HashMap(); - private Long myNextId = 1L; - - /** Constructor */ - public Example03_PatientResourceProvider() { - Long id = myNextId++; - - Patient pat1 = new Patient(); - pat1.setId(new IdDt(id)); - pat1.addIdentifier().setSystem("http://acme.com/MRNs").setValue("7000135"); - pat1.addName().addFamily("Simpson").addGiven("Homer").addGiven("J"); - myPatients.put(id, pat1); - } - - /** All Resource Providers must implement this method */ - @Override - public Class getResourceType() { - return Patient.class; - } - - /** Simple implementation of the "read" method */ - @Read() - public Patient read(@IdParam IdDt theId) { - Patient retVal = myPatients.get(theId.getIdPartAsLong()); - if (retVal == null) { - throw new ResourceNotFoundException(theId); - } - return retVal; - } - - /** Create/save a new resource */ - @Create - public MethodOutcome create(@ResourceParam Patient thePatient) { - // Give the resource the next sequential ID - long id = myNextId++; - thePatient.setId(new IdDt(id)); - - // Store the resource in memory - myPatients.put(id, thePatient); - - // Inform the server of the ID for the newly stored resource - return new MethodOutcome(thePatient.getId()); - } - - /** Simple "search" implementation **/ - @Search - public List search() { - List retVal = new ArrayList(); - retVal.addAll(myPatients.values()); - return retVal; - } - - /** A search with a parameter */ - @Search - public List search(@RequiredParam(name="family") StringParam theParam) { - List retVal = new ArrayList(); - - // Loop through the patients looking for matches - for (Patient next : myPatients.values()) { - String familyName = next.getNameFirstRep().getFamilyAsSingleString().toLowerCase(); - if (familyName.contains(theParam.getValue().toLowerCase()) == false) { - continue; - } - retVal.add(next); - } - - return retVal; - } - -} diff --git a/hapi-fhir-tutorial/simple-server/src/main/java/ca/uhn/fhir/example/ex3/Example03_SimpleRestfulServer.java b/hapi-fhir-tutorial/simple-server/src/main/java/ca/uhn/fhir/example/ex3/Example03_SimpleRestfulServer.java deleted file mode 100644 index 1928f9c57ad..00000000000 --- a/hapi-fhir-tutorial/simple-server/src/main/java/ca/uhn/fhir/example/ex3/Example03_SimpleRestfulServer.java +++ /dev/null @@ -1,27 +0,0 @@ -package ca.uhn.fhir.example.ex3; - -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; - -import ca.uhn.fhir.rest.server.RestfulServer; - -@WebServlet("/example03/*") -public class Example03_SimpleRestfulServer extends RestfulServer { - - private static final long serialVersionUID = 1L; - - @Override - protected void initialize() throws ServletException { - - // Set the resource providers used by this server - setResourceProviders(new Example03_PatientResourceProvider()); - - /* This just means to use Content-Types which are not technically - * FHIR compliant if a browser is detected (so that they display - * nicely for testing) */ - setUseBrowserFriendlyContentTypes(true); - - } - - -} diff --git a/hapi-fhir-tutorial/simple-server/src/main/java/ca/uhn/fhir/example/ex4/Example04_PatientResourceProvider.java b/hapi-fhir-tutorial/simple-server/src/main/java/ca/uhn/fhir/example/ex4/Example04_PatientResourceProvider.java deleted file mode 100644 index 7d065f38c7b..00000000000 --- a/hapi-fhir-tutorial/simple-server/src/main/java/ca/uhn/fhir/example/ex4/Example04_PatientResourceProvider.java +++ /dev/null @@ -1,75 +0,0 @@ -package ca.uhn.fhir.example.ex4; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import ca.uhn.fhir.model.api.IResource; -import ca.uhn.fhir.model.dstu.resource.Patient; -import ca.uhn.fhir.model.primitive.IdDt; -import ca.uhn.fhir.rest.annotation.Create; -import ca.uhn.fhir.rest.annotation.IdParam; -import ca.uhn.fhir.rest.annotation.Read; -import ca.uhn.fhir.rest.annotation.ResourceParam; -import ca.uhn.fhir.rest.annotation.Search; -import ca.uhn.fhir.rest.api.MethodOutcome; -import ca.uhn.fhir.rest.server.IResourceProvider; -import ca.uhn.fhir.rest.server.exceptions.ResourceNotFoundException; - -/** - * This is the most basic resource provider, showing only a single - * read method on a resource provider - */ -public class Example04_PatientResourceProvider implements IResourceProvider { - - private Map myPatients = new HashMap(); - private Long myNextId = 1L; - - /** Constructor */ - public Example04_PatientResourceProvider() { - Patient pat1 = new Patient(); - pat1.addIdentifier().setSystem("http://acme.com/MRNs").setValue("7000135"); - pat1.addName().addFamily("Simpson").addGiven("Homer").addGiven("J"); - myPatients.put(myNextId++, pat1); - } - - /** All Resource Providers must implement this method */ - @Override - public Class getResourceType() { - return Patient.class; - } - - /** Simple implementation of the "read" method */ - @Read() - public Patient read(@IdParam IdDt theId) { - Patient retVal = myPatients.get(theId.getIdPartAsLong()); - if (retVal == null) { - throw new ResourceNotFoundException(theId); - } - return retVal; - } - - /** Create/save a new resource */ - @Create - public MethodOutcome create(@ResourceParam Patient thePatient) { - // Give the resource the next sequential ID - long id = myNextId++; - thePatient.setId(new IdDt(id)); - - // Store the resource in memory - myPatients.put(id, thePatient); - - // Inform the server of the ID for the newly stored resource - return new MethodOutcome(thePatient.getId()); - } - - /** Simple "search" implementation **/ - @Search - public List search() { - List retVal = new ArrayList(); - retVal.addAll(myPatients.values()); - return retVal; - } - -} diff --git a/hapi-fhir-tutorial/simple-server/src/main/java/ca/uhn/fhir/example/ex4/Example04_SimpleRestfulServer.java b/hapi-fhir-tutorial/simple-server/src/main/java/ca/uhn/fhir/example/ex4/Example04_SimpleRestfulServer.java deleted file mode 100644 index 9eda3dcb7fd..00000000000 --- a/hapi-fhir-tutorial/simple-server/src/main/java/ca/uhn/fhir/example/ex4/Example04_SimpleRestfulServer.java +++ /dev/null @@ -1,19 +0,0 @@ -package ca.uhn.fhir.example.ex4; - -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; - -import ca.uhn.fhir.rest.server.RestfulServer; - -@WebServlet("/example04/*") -public class Example04_SimpleRestfulServer extends RestfulServer { - - private static final long serialVersionUID = 1L; - - @Override - protected void initialize() throws ServletException { - setResourceProviders(new Example04_PatientResourceProvider()); - } - - -} diff --git a/hapi-fhir-tutorial/simple-server/src/main/webapp/WEB-INF/web.xml b/hapi-fhir-tutorial/simple-server/src/main/webapp/WEB-INF/web.xml deleted file mode 100644 index 97253d81fa3..00000000000 --- a/hapi-fhir-tutorial/simple-server/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/hapi-fhir-tutorial/skeleton-project/.gitignore b/hapi-fhir-tutorial/skeleton-project/.gitignore deleted file mode 100644 index a82f9459202..00000000000 --- a/hapi-fhir-tutorial/skeleton-project/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -.classpath -.project -/target/ diff --git a/hapi-fhir-tutorial/skeleton-project/pom.xml b/hapi-fhir-tutorial/skeleton-project/pom.xml deleted file mode 100644 index 164f5cc4200..00000000000 --- a/hapi-fhir-tutorial/skeleton-project/pom.xml +++ /dev/null @@ -1,126 +0,0 @@ - - 4.0.0 - - - - org.sonatype.oss - oss-parent - 7 - - - ca.uhn.hapi.example - hapi-fhir-example-skeleton-project - 0.7 - jar - - HAPI FHIR Example - Skeleton Project - - - - oss-snapshots - - true - - https://oss.sonatype.org/content/repositories/snapshots/ - - - - - - - - ca.uhn.hapi.fhir - hapi-fhir-base - 0.7 - - - - - - - ch.qos.logback - logback-classic - 1.1.2 - - - - - com.helger - ph-schematron - - - Saxon-HE - net.sf.saxon - - - - - com.helger - ph-commons - 4.3.3 - - - - - org.thymeleaf - thymeleaf - 2.1.3.RELEASE - - - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.1 - - 1.6 - 1.6 - - - - - - org.apache.maven.plugins - maven-deploy-plugin - - false - - - - - - - diff --git a/hapi-fhir-tutorial/skeleton-project/src/main/java/ca/uhn/fhir/example/Example01_CreateAPatient.java b/hapi-fhir-tutorial/skeleton-project/src/main/java/ca/uhn/fhir/example/Example01_CreateAPatient.java deleted file mode 100644 index 34155cb50ec..00000000000 --- a/hapi-fhir-tutorial/skeleton-project/src/main/java/ca/uhn/fhir/example/Example01_CreateAPatient.java +++ /dev/null @@ -1,27 +0,0 @@ -package ca.uhn.fhir.example; - -import ca.uhn.fhir.model.dstu.composite.HumanNameDt; -import ca.uhn.fhir.model.dstu.composite.IdentifierDt; -import ca.uhn.fhir.model.dstu.resource.Patient; - -public class Example01_CreateAPatient { - - public static void main(String[] theArgs) { - - // Create a resource instance - Patient pat = new Patient(); - - // Add a "name" element - HumanNameDt name = pat.addName(); - name.addFamily("Simpson").addGiven("Homer").addGiven("J"); - - // Add an "identifier" element - IdentifierDt identifier = pat.addIdentifier(); - identifier.setSystem("http://acme.org/MRNs").setValue("7000135"); - - // Model is designed to be chained - pat.addIdentifier().setLabel("Library Card 12345").setValue("12345"); - - } - -} diff --git a/hapi-fhir-tutorial/skeleton-project/src/main/java/ca/uhn/fhir/example/Example02_CreateAPatient.java b/hapi-fhir-tutorial/skeleton-project/src/main/java/ca/uhn/fhir/example/Example02_CreateAPatient.java deleted file mode 100644 index 460f5be9387..00000000000 --- a/hapi-fhir-tutorial/skeleton-project/src/main/java/ca/uhn/fhir/example/Example02_CreateAPatient.java +++ /dev/null @@ -1,27 +0,0 @@ -package ca.uhn.fhir.example; - -import ca.uhn.fhir.model.dstu.composite.ContactDt; -import ca.uhn.fhir.model.dstu.resource.Patient; -import ca.uhn.fhir.model.dstu.valueset.AdministrativeGenderCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ContactSystemEnum; -import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum; - -public class Example02_CreateAPatient { - public static void main(String[] theArgs) { - - Patient pat = new Patient(); - - pat.addName().addFamily("Simpson").addGiven("Homer").addGiven("J"); - pat.addIdentifier().setSystem("http://acme.org/MRNs").setValue("7000135"); - pat.addIdentifier().setLabel("Library Card 12345").setValue("12345"); - - // Enumerated types are provided for many coded elements - ContactDt contact = pat.addTelecom(); - contact.setUse(ContactUseEnum.HOME); - contact.setSystem(ContactSystemEnum.PHONE); - contact.setValue("1 (416) 340-4800"); - - pat.setGender(AdministrativeGenderCodesEnum.M); - - } -} diff --git a/hapi-fhir-tutorial/skeleton-project/src/main/java/ca/uhn/fhir/example/Example03_EncodeResource.java b/hapi-fhir-tutorial/skeleton-project/src/main/java/ca/uhn/fhir/example/Example03_EncodeResource.java deleted file mode 100644 index a2ca24a1665..00000000000 --- a/hapi-fhir-tutorial/skeleton-project/src/main/java/ca/uhn/fhir/example/Example03_EncodeResource.java +++ /dev/null @@ -1,32 +0,0 @@ -package ca.uhn.fhir.example; - -import ca.uhn.fhir.context.FhirContext; -import ca.uhn.fhir.model.dstu.resource.Patient; -import ca.uhn.fhir.model.dstu.valueset.AdministrativeGenderCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ContactSystemEnum; -import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum; -import ca.uhn.fhir.parser.IParser; - -public class Example03_EncodeResource { - public static void main(String[] theArgs) { - - // Create a Patient - Patient pat = new Patient(); - pat.addName().addFamily("Simpson").addGiven("Homer").addGiven("J"); - pat.addIdentifier().setSystem("http://acme.org/MRNs").setValue("7000135"); - pat.addIdentifier().setLabel("Library Card 12345").setValue("12345"); - pat.addTelecom().setUse(ContactUseEnum.HOME).setSystem(ContactSystemEnum.PHONE).setValue("1 (416) 340-4800"); - pat.setGender(AdministrativeGenderCodesEnum.M); - - // Create a context - FhirContext ctx = new FhirContext(); - - // Create a XML parser - IParser parser = ctx.newXmlParser(); - parser.setPrettyPrint(true); - - String encode = parser.encodeResourceToString(pat); - System.out.println(encode); - - } -} diff --git a/hapi-fhir-tutorial/skeleton-project/src/main/java/ca/uhn/fhir/example/Example04_ParseResource.java b/hapi-fhir-tutorial/skeleton-project/src/main/java/ca/uhn/fhir/example/Example04_ParseResource.java deleted file mode 100644 index 5ac35b8ef5d..00000000000 --- a/hapi-fhir-tutorial/skeleton-project/src/main/java/ca/uhn/fhir/example/Example04_ParseResource.java +++ /dev/null @@ -1,29 +0,0 @@ -package ca.uhn.fhir.example; - -import java.util.List; - -import ca.uhn.fhir.context.FhirContext; -import ca.uhn.fhir.model.dstu.composite.IdentifierDt; -import ca.uhn.fhir.model.dstu.resource.Patient; -import ca.uhn.fhir.parser.IParser; - -public class Example04_ParseResource { - public static void main(String[] theArgs) { - - String resourceBody = "{\"resourceType\":\"Patient\",\"identifier\":[{\"system\":\"http://acme.org/MRNs\",\"value\":\"7000135\"}],\"name\":[{\"family\":[\"Simpson\"],\"given\":[\"Homer\",\"J\"]}]}"; - - // Create a context - FhirContext ctx = new FhirContext(); - - // Create a JSON parser - IParser parser = ctx.newJsonParser(); - Patient pat = parser.parseResource(Patient.class, resourceBody); - - List identifiers = pat.getIdentifier(); - String idSystemString = identifiers.get(0).getSystem().getValueAsString(); - String idValueString = identifiers.get(0).getValue().getValueAsString(); - - System.out.println(idSystemString + " " + idValueString); - - } -} diff --git a/hapi-fhir-tutorial/skeleton-project/src/main/java/ca/uhn/fhir/example/Example05_ClientCreate.java b/hapi-fhir-tutorial/skeleton-project/src/main/java/ca/uhn/fhir/example/Example05_ClientCreate.java deleted file mode 100644 index e623289fd82..00000000000 --- a/hapi-fhir-tutorial/skeleton-project/src/main/java/ca/uhn/fhir/example/Example05_ClientCreate.java +++ /dev/null @@ -1,31 +0,0 @@ -package ca.uhn.fhir.example; - -import ca.uhn.fhir.context.FhirContext; -import ca.uhn.fhir.model.dstu.resource.Patient; -import ca.uhn.fhir.model.dstu.valueset.AdministrativeGenderCodesEnum; -import ca.uhn.fhir.rest.api.MethodOutcome; -import ca.uhn.fhir.rest.client.IGenericClient; - -public class Example05_ClientCreate { - public static void main(String[] theArgs) { - - Patient pat = new Patient(); - pat.addName().addFamily("Simpson").addGiven("Homer").addGiven("J"); - pat.addIdentifier().setSystem("http://acme.org/MRNs").setValue("7000135"); - pat.setGender(AdministrativeGenderCodesEnum.M); - - // Create a context - FhirContext ctx = new FhirContext(); - - // Create a client - String serverBaseUrl = "http://fhirtest.uhn.ca/base"; - IGenericClient client = ctx.newRestfulGenericClient(serverBaseUrl); - - // Use the client to store a new resource instance - MethodOutcome outcome = client.create().resource(pat).execute(); - - // Print the ID of the newly created resource - System.out.println(outcome.getId()); - - } -} diff --git a/hapi-fhir-tutorial/skeleton-project/src/main/java/ca/uhn/fhir/example/Example06_ClientReadAndUpdate.java b/hapi-fhir-tutorial/skeleton-project/src/main/java/ca/uhn/fhir/example/Example06_ClientReadAndUpdate.java deleted file mode 100644 index 1113ff88d9a..00000000000 --- a/hapi-fhir-tutorial/skeleton-project/src/main/java/ca/uhn/fhir/example/Example06_ClientReadAndUpdate.java +++ /dev/null @@ -1,39 +0,0 @@ -package ca.uhn.fhir.example; - -import ca.uhn.fhir.context.FhirContext; -import ca.uhn.fhir.model.api.Bundle; -import ca.uhn.fhir.model.dstu.resource.Patient; -import ca.uhn.fhir.model.primitive.IdDt; -import ca.uhn.fhir.rest.client.IGenericClient; -import ca.uhn.fhir.rest.client.interceptor.LoggingInterceptor; - -//@formatter:off -public class Example06_ClientReadAndUpdate { - public static void main(String[] theArgs) { - - // Create a client - FhirContext ctx = new FhirContext(); - String serverBaseUrl = "http://fhirtest.uhn.ca/base"; - IGenericClient client = ctx.newRestfulGenericClient(serverBaseUrl); - - // Log requests and responses - client.registerInterceptor(new LoggingInterceptor(true)); - - // Build a search and execute it - Bundle response = client.search() - .forResource(Patient.class) - .where(Patient.NAME.matches().value("Test")) - .and(Patient.BIRTHDATE.before().day("2014-01-01")) - .limitTo(100) - .execute(); - - // How many resources did we find? - System.out.println("Responses: " + response.size()); - - // Print the ID of the first one - IdDt firstResponseId = response.getEntries().get(0).getResource().getId(); - System.out.println(firstResponseId); - - } -} -//@formatter:on diff --git a/hapi-fhir-tutorial/skeleton-project/src/main/java/ca/uhn/fhir/example/Example07_ClientSearch.java b/hapi-fhir-tutorial/skeleton-project/src/main/java/ca/uhn/fhir/example/Example07_ClientSearch.java deleted file mode 100644 index 217849b0b06..00000000000 --- a/hapi-fhir-tutorial/skeleton-project/src/main/java/ca/uhn/fhir/example/Example07_ClientSearch.java +++ /dev/null @@ -1,31 +0,0 @@ -package ca.uhn.fhir.example; - -import ca.uhn.fhir.context.FhirContext; -import ca.uhn.fhir.model.dstu.resource.Patient; -import ca.uhn.fhir.model.dstu.valueset.AdministrativeGenderCodesEnum; -import ca.uhn.fhir.rest.api.MethodOutcome; -import ca.uhn.fhir.rest.client.IGenericClient; - -public class Example07_ClientSearch { - public static void main(String[] theArgs) { - - // Create a client - String serverBaseUrl = "http://fhirtest.uhn.ca/base"; - FhirContext ctx = new FhirContext(); - IGenericClient client = ctx.newRestfulGenericClient(serverBaseUrl); - - // Use the client to read back the new instance using the - // ID we retrieved from the read - Patient patient = client.read(Patient.class, "4529"); - - // Print the ID of the newly created resource - System.out.println("Found ID: " + patient.getId()); - - // Change the gender and send an update to the server - patient.setGender(AdministrativeGenderCodesEnum.F); - MethodOutcome outcome = client.update().resource(patient).execute(); - - System.out.println("Now have ID: " + outcome.getId()); - - } -} diff --git a/hapi-fhir-tutorial/skeleton-project/src/main/java/ca/uhn/fhir/example/Example08_ValidateResource.java b/hapi-fhir-tutorial/skeleton-project/src/main/java/ca/uhn/fhir/example/Example08_ValidateResource.java deleted file mode 100644 index 01a0963b7bc..00000000000 --- a/hapi-fhir-tutorial/skeleton-project/src/main/java/ca/uhn/fhir/example/Example08_ValidateResource.java +++ /dev/null @@ -1,34 +0,0 @@ -package ca.uhn.fhir.example; - -import ca.uhn.fhir.context.FhirContext; -import ca.uhn.fhir.model.dstu.resource.Encounter; -import ca.uhn.fhir.model.dstu.resource.OperationOutcome; -import ca.uhn.fhir.parser.IParser; -import ca.uhn.fhir.validation.FhirValidator; -import ca.uhn.fhir.validation.ValidationResult; - -public class Example08_ValidateResource { - - public static void main(String[] args) { - - // Create an encounter with an invalid status and no class - Encounter enc = new Encounter(); - enc.getStatus().setValueAsString("invalid_status"); - - // Create a new validator - FhirContext ctx = new FhirContext(); - FhirValidator validator = ctx.newValidator(); - - // Did we succeed? - ValidationResult result = validator.validateWithResult(enc); - System.out.println("Success: " + result.isSuccessful()); - - // What was the result - OperationOutcome outcome = result.getOperationOutcome(); - IParser parser = ctx.newXmlParser().setPrettyPrint(true); - System.out.println(parser.encodeResourceToString(outcome)); - - - } - -} diff --git a/hapi-fhir-tutorial/skeleton-project/src/main/java/ca/uhn/fhir/example/Example09_NarrativeGenerator.java b/hapi-fhir-tutorial/skeleton-project/src/main/java/ca/uhn/fhir/example/Example09_NarrativeGenerator.java deleted file mode 100644 index 07545899995..00000000000 --- a/hapi-fhir-tutorial/skeleton-project/src/main/java/ca/uhn/fhir/example/Example09_NarrativeGenerator.java +++ /dev/null @@ -1,30 +0,0 @@ -package ca.uhn.fhir.example; - -import ca.uhn.fhir.context.FhirContext; -import ca.uhn.fhir.model.dstu.resource.Encounter; -import ca.uhn.fhir.model.dstu.resource.OperationOutcome; -import ca.uhn.fhir.model.dstu.resource.Patient; -import ca.uhn.fhir.narrative.DefaultThymeleafNarrativeGenerator; -import ca.uhn.fhir.parser.IParser; -import ca.uhn.fhir.validation.FhirValidator; -import ca.uhn.fhir.validation.ValidationResult; - -public class Example09_NarrativeGenerator { - - public static void main(String[] args) { - - // Create an encounter with an invalid status and no class - Patient pat = new Patient(); - pat.addName().addFamily("Simpson").addGiven("Homer").addGiven("Jay"); - pat.addAddress().addLine("342 Evergreen Terrace").addLine("Springfield"); - pat.addIdentifier().setLabel("MRN: 12345"); - - // Create a new context and enable the narrative generator - FhirContext ctx = new FhirContext(); - ctx.setNarrativeGenerator(new DefaultThymeleafNarrativeGenerator()); - - String res = ctx.newJsonParser().setPrettyPrint(true).encodeResourceToString(pat); - System.out.println(res); - } - -} diff --git a/hapi-fhir-tutorial/skeleton-project/src/main/java/ca/uhn/fhir/example/Example10_Extensions.java b/hapi-fhir-tutorial/skeleton-project/src/main/java/ca/uhn/fhir/example/Example10_Extensions.java deleted file mode 100644 index c8cc39bd1b4..00000000000 --- a/hapi-fhir-tutorial/skeleton-project/src/main/java/ca/uhn/fhir/example/Example10_Extensions.java +++ /dev/null @@ -1,24 +0,0 @@ -package ca.uhn.fhir.example; - -import ca.uhn.fhir.context.FhirContext; -import ca.uhn.fhir.model.dstu.resource.Patient; -import ca.uhn.fhir.model.primitive.CodeDt; -import ca.uhn.fhir.parser.IParser; - -public class Example10_Extensions { - - public static void main(String[] args) { - Patient pat = new Patient(); - pat.addName().addFamily("Simpson").addGiven("Homer"); - - String url = "http://acme.org#eyeColour"; - boolean isModifier = false; - pat.addUndeclaredExtension(isModifier, url).setValue(new CodeDt("blue"));; - - IParser p = new FhirContext().newXmlParser().setPrettyPrint(true); - String encoded = p.encodeResourceToString(pat); - - System.out.println(encoded); - } - -} diff --git a/hapi-fhir-tutorial/skeleton-project/src/main/java/ca/uhn/fhir/example/Example11_ExtendedPatient.java b/hapi-fhir-tutorial/skeleton-project/src/main/java/ca/uhn/fhir/example/Example11_ExtendedPatient.java deleted file mode 100644 index 74c18fe4196..00000000000 --- a/hapi-fhir-tutorial/skeleton-project/src/main/java/ca/uhn/fhir/example/Example11_ExtendedPatient.java +++ /dev/null @@ -1,27 +0,0 @@ -package ca.uhn.fhir.example; - -import ca.uhn.fhir.model.api.annotation.Child; -import ca.uhn.fhir.model.api.annotation.Extension; -import ca.uhn.fhir.model.api.annotation.ResourceDef; -import ca.uhn.fhir.model.dstu.resource.Patient; -import ca.uhn.fhir.model.primitive.CodeDt; - -@ResourceDef(name="Patient") -public class Example11_ExtendedPatient extends Patient { - - @Child(name = "eyeColour") - @Extension(url="http://acme.org/#extpt", definedLocally = false, isModifier = false) - private CodeDt myEyeColour; - - public CodeDt getEyeColour() { - if (myEyeColour == null) { - myEyeColour = new CodeDt(); - } - return myEyeColour; - } - - public void setEyeColour(CodeDt theEyeColour) { - myEyeColour = theEyeColour; - } - -} diff --git a/hapi-fhir-tutorial/skeleton-project/src/main/java/ca/uhn/fhir/example/Example11_UseExtensions.java b/hapi-fhir-tutorial/skeleton-project/src/main/java/ca/uhn/fhir/example/Example11_UseExtensions.java deleted file mode 100644 index a69f7c539a2..00000000000 --- a/hapi-fhir-tutorial/skeleton-project/src/main/java/ca/uhn/fhir/example/Example11_UseExtensions.java +++ /dev/null @@ -1,22 +0,0 @@ -package ca.uhn.fhir.example; - -import ca.uhn.fhir.context.FhirContext; -import ca.uhn.fhir.model.primitive.CodeDt; -import ca.uhn.fhir.parser.IParser; - -public class Example11_UseExtensions { - - public static void main(String[] args) { - - Example11_ExtendedPatient pat = new Example11_ExtendedPatient(); - pat.addName().addFamily("Simpson").addGiven("Homer"); - pat.setEyeColour(new CodeDt("blue")); - - IParser p = new FhirContext().newXmlParser().setPrettyPrint(true); - String encoded = p.encodeResourceToString(pat); - - System.out.println(encoded); - - } - -} diff --git a/hapi-fhir-tutorial/skeleton-project/src/main/resources/logback.xml b/hapi-fhir-tutorial/skeleton-project/src/main/resources/logback.xml deleted file mode 100644 index 8347a5137e6..00000000000 --- a/hapi-fhir-tutorial/skeleton-project/src/main/resources/logback.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - INFO - - - %d{HH:mm:ss.SSS} %-5level %logger{36} %msg%n - - - - - - - - \ No newline at end of file diff --git a/pom.xml b/pom.xml index 7c5c8e109a8..96d277a7f02 100755 --- a/pom.xml +++ b/pom.xml @@ -555,9 +555,9 @@ 1.2 2.7.0 1.12 - 1.6 + 1.7 2.6 - 3.8.1 + 3.9 10.14.2.0 2.3.3 @@ -581,6 +581,7 @@ 4.4.11 4.5.8 2.9.9 + 2.9.9.1 3.1.0 1.8 4.0.0.Beta3 @@ -639,7 +640,7 @@ com.fasterxml.jackson.core jackson-databind - ${jackson_version} + ${jackson_databind_version} com.fasterxml.jackson.datatype @@ -739,7 +740,7 @@ org.apache.commons commons-collections4 - 4.1 + 4.3 org.apache.commons @@ -908,7 +909,7 @@ org.apache.commons commons-dbcp2 - 2.5.0 + 2.6.0 org.apache.commons diff --git a/src/changes/changes.xml b/src/changes/changes.xml index b1fb593b3b7..328a01f0f1a 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -20,6 +20,11 @@
  • JANSI (CLI): 1.17.1 -> 1.18
  • json-patch (JPA): 1.10 -> 1.15 (see changelog entry about this change)
    • +
  • Jackson-Databind (JPA): 2.9.9 -> 2.9.9.1 (due to a Jackson vulnerability CVE-2019-12384)
    • +
  • commons-collections4 (Server/JPA): 4.1 -> 4.3
    • +
  • commons-dbcp2 (JPA): 2.5.0 -> 2.6.0
    • +
  • commons-lang3 (Core): 3.8.1 -> 3.9
    • +
  • commons-text (Core): 1.6 -> 1.7
    • ]]>