honeymoose
/
hapi-fhir
mirror of https://github.com/hapifhir/hapi-fhir.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix compile issues

This commit is contained in:
James Agnew 2015-02-06 16:41:34 -05:00
parent f4805f83d1
commit 0b726c3564
30 changed files with 33 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hapi-fhir-structures-dstu/src/main/java/ca/uhn/fhir/model/dstu/FhirDstu1.java
View File

@ -2,7 +2,7 @@ package ca.uhn.fhir.model.dstu;
/* /*
* #%L * #%L
* HAPI FHIR Structures - DSTU (FHIR 0.80) * HAPI FHIR Structures - DSTU1 (FHIR v0.80)
* %% * %%
* Copyright (C) 2014 - 2015 University Health Network * Copyright (C) 2014 - 2015 University Health Network
* %% * %%

2
hapi-fhir-structures-dstu/src/main/java/ca/uhn/fhir/model/dstu/api/BaseResourceDstu.java
View File

@ -2,7 +2,7 @@ package ca.uhn.fhir.model.dstu.api;
/* /*
* #%L * #%L
* HAPI FHIR Structures - DSTU (FHIR 0.80) * HAPI FHIR Structures - DSTU1 (FHIR v0.80)
* %% * %%
* Copyright (C) 2014 - 2015 University Health Network * Copyright (C) 2014 - 2015 University Health Network
* %% * %%

2
hapi-fhir-structures-dstu/src/main/java/ca/uhn/fhir/model/dstu/composite/AgeDt.java
View File

@ -4,7 +4,7 @@ import ca.uhn.fhir.model.api.annotation.DatatypeDef;
/* /*
* #%L * #%L
* HAPI FHIR Structures - DSTU (FHIR 0.80) * HAPI FHIR Structures - DSTU1 (FHIR v0.80)
* %% * %%
* Copyright (C) 2014 - 2015 University Health Network * Copyright (C) 2014 - 2015 University Health Network
* %% * %%

2
hapi-fhir-structures-dstu/src/main/java/ca/uhn/fhir/model/dstu/composite/DurationDt.java
View File

@ -2,7 +2,7 @@ package ca.uhn.fhir.model.dstu.composite;
/* /*
* #%L * #%L
* HAPI FHIR Structures - DSTU (FHIR 0.80) * HAPI FHIR Structures - DSTU1 (FHIR v0.80)
* %% * %%
* Copyright (C) 2014 - 2015 University Health Network * Copyright (C) 2014 - 2015 University Health Network
* %% * %%

2
hapi-fhir-structures-dstu/src/main/java/ca/uhn/fhir/model/primitive/BoundCodeableConceptDt.java
View File

@ -2,7 +2,7 @@ package ca.uhn.fhir.model.primitive;
/* /*
* #%L * #%L
* HAPI FHIR Structures - DSTU (FHIR 0.80) * HAPI FHIR Structures - DSTU1 (FHIR v0.80)
* %% * %%
* Copyright (C) 2014 - 2015 University Health Network * Copyright (C) 2014 - 2015 University Health Network
* %% * %%

2
hapi-fhir-structures-dstu/src/main/java/ca/uhn/fhir/rest/server/audit/AdverseReactionAuditor.java
View File

@ -2,7 +2,7 @@ package ca.uhn.fhir.rest.server.audit;
/* /*
* #%L * #%L
* HAPI FHIR Structures - DSTU (FHIR 0.80) * HAPI FHIR Structures - DSTU1 (FHIR v0.80)
* %% * %%
* Copyright (C) 2014 - 2015 University Health Network * Copyright (C) 2014 - 2015 University Health Network
* %% * %%

2
hapi-fhir-structures-dstu/src/main/java/ca/uhn/fhir/rest/server/audit/DiagnosticReportAuditor.java
View File

@ -2,7 +2,7 @@ package ca.uhn.fhir.rest.server.audit;
/* /*
* #%L * #%L
* HAPI FHIR Structures - DSTU (FHIR 0.80) * HAPI FHIR Structures - DSTU1 (FHIR v0.80)
* %% * %%
* Copyright (C) 2014 - 2015 University Health Network * Copyright (C) 2014 - 2015 University Health Network
* %% * %%

2
hapi-fhir-structures-dstu/src/main/java/ca/uhn/fhir/rest/server/audit/EncounterAuditor.java
View File

@ -2,7 +2,7 @@ package ca.uhn.fhir.rest.server.audit;
/* /*
* #%L * #%L
* HAPI FHIR Structures - DSTU (FHIR 0.80) * HAPI FHIR Structures - DSTU1 (FHIR v0.80)
* %% * %%
* Copyright (C) 2014 - 2015 University Health Network * Copyright (C) 2014 - 2015 University Health Network
* %% * %%

2
hapi-fhir-structures-dstu/src/main/java/ca/uhn/fhir/rest/server/audit/MedicationPrescriptionAuditor.java
View File

@ -2,7 +2,7 @@ package ca.uhn.fhir.rest.server.audit;
/* /*
* #%L * #%L
* HAPI FHIR Structures - DSTU (FHIR 0.80) * HAPI FHIR Structures - DSTU1 (FHIR v0.80)
* %% * %%
* Copyright (C) 2014 - 2015 University Health Network * Copyright (C) 2014 - 2015 University Health Network
* %% * %%

2
hapi-fhir-structures-dstu/src/main/java/ca/uhn/fhir/rest/server/audit/MedicationStatementAuditor.java
View File

@ -2,7 +2,7 @@ package ca.uhn.fhir.rest.server.audit;
/* /*
* #%L * #%L
* HAPI FHIR Structures - DSTU (FHIR 0.80) * HAPI FHIR Structures - DSTU1 (FHIR v0.80)
* %% * %%
* Copyright (C) 2014 - 2015 University Health Network * Copyright (C) 2014 - 2015 University Health Network
* %% * %%

2
hapi-fhir-structures-dstu/src/main/java/ca/uhn/fhir/rest/server/audit/ObservationAuditor.java
View File

@ -2,7 +2,7 @@ package ca.uhn.fhir.rest.server.audit;
/* /*
* #%L * #%L
* HAPI FHIR Structures - DSTU (FHIR 0.80) * HAPI FHIR Structures - DSTU1 (FHIR v0.80)
* %% * %%
* Copyright (C) 2014 - 2015 University Health Network * Copyright (C) 2014 - 2015 University Health Network
* %% * %%

2
hapi-fhir-structures-dstu/src/main/java/ca/uhn/fhir/rest/server/audit/PatientAuditor.java
View File

@ -2,7 +2,7 @@ package ca.uhn.fhir.rest.server.audit;
/* /*
* #%L * #%L
* HAPI FHIR Structures - DSTU (FHIR 0.80) * HAPI FHIR Structures - DSTU1 (FHIR v0.80)
* %% * %%
* Copyright (C) 2014 - 2015 University Health Network * Copyright (C) 2014 - 2015 University Health Network
* %% * %%

2
hapi-fhir-structures-dstu/src/main/java/ca/uhn/fhir/rest/server/audit/ProcedureAuditor.java
View File

@ -2,7 +2,7 @@ package ca.uhn.fhir.rest.server.audit;
/* /*
* #%L * #%L
* HAPI FHIR Structures - DSTU (FHIR 0.80) * HAPI FHIR Structures - DSTU1 (FHIR v0.80)
* %% * %%
* Copyright (C) 2014 - 2015 University Health Network * Copyright (C) 2014 - 2015 University Health Network
* %% * %%

2
hapi-fhir-structures-dstu/src/main/java/ca/uhn/fhir/rest/server/interceptor/AuditingInterceptor.java
View File

@ -2,7 +2,7 @@
/* /*
* #%L * #%L
* HAPI FHIR Structures - DSTU (FHIR 0.80) * HAPI FHIR Structures - DSTU1 (FHIR v0.80)
* %% * %%
* Copyright (C) 2014 - 2015 University Health Network * Copyright (C) 2014 - 2015 University Health Network
* %% * %%

2
hapi-fhir-structures-dstu/src/main/java/ca/uhn/fhir/rest/server/provider/ServerConformanceProvider.java
View File

@ -2,7 +2,7 @@ package ca.uhn.fhir.rest.server.provider;
/* /*
* #%L * #%L
* HAPI FHIR Structures - DSTU (FHIR 0.80) * HAPI FHIR Structures - DSTU1 (FHIR v0.80)
* %% * %%
* Copyright (C) 2014 - 2015 University Health Network * Copyright (C) 2014 - 2015 University Health Network
* %% * %%

2
hapi-fhir-structures-dstu/src/main/java/ca/uhn/fhir/rest/server/provider/ServerProfileProvider.java
View File

@ -2,7 +2,7 @@ package ca.uhn.fhir.rest.server.provider;
/* /*
* #%L * #%L
* HAPI FHIR Structures - DSTU (FHIR 0.80) * HAPI FHIR Structures - DSTU1 (FHIR v0.80)
* %% * %%
* Copyright (C) 2014 - 2015 University Health Network * Copyright (C) 2014 - 2015 University Health Network
* %% * %%

2
hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/FhirDstu2.java
View File

@ -2,7 +2,7 @@ package ca.uhn.fhir.model.dstu2;
/* /*
* #%L * #%L
* HAPI FHIR Structures - DEV (FHIR Latest) * HAPI FHIR Structures - DSTU2 (FHIR v0.4.0)
* %% * %%
* Copyright (C) 2014 - 2015 University Health Network * Copyright (C) 2014 - 2015 University Health Network
* %% * %%

2
hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/api/BaseResourceDev.java
View File

@ -2,7 +2,7 @@ package ca.uhn.fhir.model.dstu2.api;
/* /*
* #%L * #%L
* HAPI FHIR Structures - DEV (FHIR Latest) * HAPI FHIR Structures - DSTU2 (FHIR v0.4.0)
* %% * %%
* Copyright (C) 2014 - 2015 University Health Network * Copyright (C) 2014 - 2015 University Health Network
* %% * %%

2
hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/composite/AgeDt.java
View File

@ -5,7 +5,7 @@ import ca.uhn.fhir.model.dstu2.composite.QuantityDt;
/* /*
* #%L * #%L
* HAPI FHIR Structures - DEV (FHIR Latest) * HAPI FHIR Structures - DSTU2 (FHIR v0.4.0)
* %% * %%
* Copyright (C) 2014 - 2015 University Health Network * Copyright (C) 2014 - 2015 University Health Network
* %% * %%

2
hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/composite/BoundCodeableConceptDt.java
View File

@ -2,7 +2,7 @@ package ca.uhn.fhir.model.dstu2.composite;
/* /*
* #%L * #%L
* HAPI FHIR Structures - DEV (FHIR Latest) * HAPI FHIR Structures - DSTU2 (FHIR v0.4.0)
* %% * %%
* Copyright (C) 2014 - 2015 University Health Network * Copyright (C) 2014 - 2015 University Health Network
* %% * %%

2
hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/composite/CountDt.java
View File

@ -5,7 +5,7 @@ import ca.uhn.fhir.model.dstu2.composite.QuantityDt;
/* /*
* #%L * #%L
* HAPI FHIR Structures - DEV (FHIR Latest) * HAPI FHIR Structures - DSTU2 (FHIR v0.4.0)
* %% * %%
* Copyright (C) 2014 - 2015 University Health Network * Copyright (C) 2014 - 2015 University Health Network
* %% * %%

2
hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/composite/DistanceDt.java
View File

@ -5,7 +5,7 @@ import ca.uhn.fhir.model.dstu2.composite.QuantityDt;
/* /*
* #%L * #%L
* HAPI FHIR Structures - DEV (FHIR Latest) * HAPI FHIR Structures - DSTU2 (FHIR v0.4.0)
* %% * %%
* Copyright (C) 2014 - 2015 University Health Network * Copyright (C) 2014 - 2015 University Health Network
* %% * %%

2
hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/composite/DurationDt.java
View File

@ -5,7 +5,7 @@ import ca.uhn.fhir.model.dstu2.composite.QuantityDt;
/* /*
* #%L * #%L
* HAPI FHIR Structures - DEV (FHIR Latest) * HAPI FHIR Structures - DSTU2 (FHIR v0.4.0)
* %% * %%
* Copyright (C) 2014 - 2015 University Health Network * Copyright (C) 2014 - 2015 University Health Network
* %% * %%

2
hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/composite/MoneyDt.java
View File

@ -5,7 +5,7 @@ import ca.uhn.fhir.model.dstu2.composite.QuantityDt;
/* /*
* #%L * #%L
* HAPI FHIR Structures - DEV (FHIR Latest) * HAPI FHIR Structures - DSTU2 (FHIR v0.4.0)
* %% * %%
* Copyright (C) 2014 - 2015 University Health Network * Copyright (C) 2014 - 2015 University Health Network
* %% * %%

2
hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/rest/server/provider/dstu2/ServerConformanceProvider.java
View File

@ -2,7 +2,7 @@ package ca.uhn.fhir.rest.server.provider.dstu2;
/* /*
* #%L * #%L
* HAPI FHIR Structures - DEV (FHIR Latest) * HAPI FHIR Structures - DSTU2 (FHIR v0.4.0)
* %% * %%
* Copyright (C) 2014 - 2015 University Health Network * Copyright (C) 2014 - 2015 University Health Network
* %% * %%

2
hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/rest/server/provider/dstu2/ServerProfileProvider.java
View File

@ -2,7 +2,7 @@ package ca.uhn.fhir.rest.server.provider.dstu2;
/* /*
* #%L * #%L
* HAPI FHIR Structures - DEV (FHIR Latest) * HAPI FHIR Structures - DSTU2 (FHIR v0.4.0)
* %% * %%
* Copyright (C) 2014 - 2015 University Health Network * Copyright (C) 2014 - 2015 University Health Network
* %% * %%

1
hapi-fhir-testpage-overlay/.classpath
View File

@ -15,7 +15,6 @@
</classpathentry> </classpathentry>
<classpathentry excluding="**/*.java" including="**/*.java" kind="src" path="src/main/resources"/> <classpathentry excluding="**/*.java" including="**/*.java" kind="src" path="src/main/resources"/>
<classpathentry kind="src" path="/hapi-fhir-jpaserver-base"/> <classpathentry kind="src" path="/hapi-fhir-jpaserver-base"/>
<classpathentry kind="src" path="/hapi-fhir-jpaserver-test"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
<attributes> <attributes>
<attribute name="maven.pomderived" value="true"/> <attribute name="maven.pomderived" value="true"/>

10
hapi-fhir-testpage-overlay/src/test/java/ca/uhn/fhir/jpa/test/OverlayTestApp.java
View File

@ -15,10 +15,10 @@ import ca.uhn.fhir.jpa.dao.IFhirResourceDao;
import ca.uhn.fhir.jpa.dao.IFhirSystemDao; import ca.uhn.fhir.jpa.dao.IFhirSystemDao;
import ca.uhn.fhir.jpa.provider.JpaConformanceProviderDstu1; import ca.uhn.fhir.jpa.provider.JpaConformanceProviderDstu1;
import ca.uhn.fhir.jpa.provider.JpaSystemProvider; import ca.uhn.fhir.jpa.provider.JpaSystemProvider;
import ca.uhn.fhir.jpa.rp.dev.DiagnosticReportResourceProvider; import ca.uhn.fhir.jpa.rp.dstu2.DiagnosticReportResourceProvider;
import ca.uhn.fhir.jpa.rp.dev.ObservationResourceProvider; import ca.uhn.fhir.jpa.rp.dstu2.ObservationResourceProvider;
import ca.uhn.fhir.jpa.rp.dev.OrganizationResourceProvider; import ca.uhn.fhir.jpa.rp.dstu2.OrganizationResourceProvider;
import ca.uhn.fhir.jpa.rp.dev.PatientResourceProvider; import ca.uhn.fhir.jpa.rp.dstu2.PatientResourceProvider;
import ca.uhn.fhir.model.api.IResource; import ca.uhn.fhir.model.api.IResource;
import ca.uhn.fhir.model.api.Include; import ca.uhn.fhir.model.api.Include;
import ca.uhn.fhir.model.api.ResourceMetadataKeyEnum; import ca.uhn.fhir.model.api.ResourceMetadataKeyEnum;
@ -67,7 +67,7 @@ public class OverlayTestApp {
} }
ourAppCtx = new ClassPathXmlApplicationContext("hapi-fhir-server-resourceproviders-dev.xml", "hapi-fhir-server-resourceproviders-dstu1.xml", "fhir-spring-test-config.xml"); ourAppCtx = new ClassPathXmlApplicationContext("hapi-fhir-server-resourceproviders-dstu2.xml", "hapi-fhir-server-resourceproviders-dstu1.xml", "fhir-jpabase-spring-test-config.xml");
ServletContextHandler proxyHandler = new ServletContextHandler(); ServletContextHandler proxyHandler = new ServletContextHandler();
proxyHandler.setContextPath("/"); proxyHandler.setContextPath("/");