Work on 2.1 structures

hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/interceptor/GZipContentInterceptor.java

@@ -1,5 +1,25 @@
 package ca.uhn.fhir.rest.client.interceptor;
 
+/*
+ * #%L
+ * HAPI FHIR - Core Library
+ * %%
+ * 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.ByteArrayOutputStream;
 import java.io.IOException;
 import java.util.zip.GZIPOutputStream;

hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IDelete.java

@@ -3,8 +3,6 @@ package ca.uhn.fhir.rest.gclient;
 import org.hl7.fhir.instance.model.api.IBaseResource;
 import org.hl7.fhir.instance.model.api.IIdType;
 
-import ca.uhn.fhir.model.api.IResource;
-
 /*
  * #%L
  * HAPI FHIR - Core Library
@@ -27,7 +25,7 @@ import ca.uhn.fhir.model.api.IResource;
 
 public interface IDelete {
 
-	IDeleteTyped resource(IResource theResource);
+	IDeleteTyped resource(IBaseResource theResource);
 	
 	IDeleteTyped resourceById(IIdType theId);
 	

hapi-fhir-jaxrsserver-base/src/main/java/ca/uhn/fhir/jaxrs/server/AbstractJaxRsConformanceProvider.java

@@ -1,5 +1,25 @@
 package ca.uhn.fhir.jaxrs.server;
 
+/*
+ * #%L
+ * HAPI FHIR JAX-RS 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.IOException;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;

hapi-fhir-jaxrsserver-base/src/main/java/ca/uhn/fhir/jaxrs/server/AbstractJaxRsPageProvider.java

@@ -1,5 +1,25 @@
 package ca.uhn.fhir.jaxrs.server;
 
+/*
+ * #%L
+ * HAPI FHIR JAX-RS 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.IOException;
 import java.util.Collections;
 import java.util.List;

hapi-fhir-jaxrsserver-base/src/main/java/ca/uhn/fhir/jaxrs/server/AbstractJaxRsProvider.java

@@ -1,5 +1,25 @@
 package ca.uhn.fhir.jaxrs.server;
 
+/*
+ * #%L
+ * HAPI FHIR JAX-RS 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.util.HashMap;
 import java.util.List;
 import java.util.Map;

hapi-fhir-jaxrsserver-base/src/main/java/ca/uhn/fhir/jaxrs/server/AbstractJaxRsResourceProvider.java

@@ -1,5 +1,25 @@
 package ca.uhn.fhir.jaxrs.server;
 
+/*
+ * #%L
+ * HAPI FHIR JAX-RS 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.IOException;
 import java.net.URL;
 import java.util.Collections;

hapi-fhir-jaxrsserver-base/src/main/java/ca/uhn/fhir/jaxrs/server/interceptor/JaxRsExceptionInterceptor.java

@@ -1,5 +1,25 @@
 package ca.uhn.fhir.jaxrs.server.interceptor;
 
+/*
+ * #%L
+ * HAPI FHIR JAX-RS 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.IOException;
 
 import javax.interceptor.AroundInvoke;

hapi-fhir-jaxrsserver-base/src/main/java/ca/uhn/fhir/jaxrs/server/interceptor/JaxRsResponseException.java

@@ -1,5 +1,25 @@
 package ca.uhn.fhir.jaxrs.server.interceptor;
 
+/*
+ * #%L
+ * HAPI FHIR JAX-RS 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 javax.ejb.ApplicationException;
 
 import ca.uhn.fhir.rest.server.exceptions.BaseServerResponseException;

hapi-fhir-jaxrsserver-base/src/main/java/ca/uhn/fhir/jaxrs/server/util/JaxRsMethodBindings.java

@@ -1,5 +1,25 @@
 package ca.uhn.fhir.jaxrs.server.util;
 
+/*
+ * #%L
+ * HAPI FHIR JAX-RS 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.lang.reflect.Method;
 import java.util.concurrent.ConcurrentHashMap;
 

hapi-fhir-jaxrsserver-base/src/main/java/ca/uhn/fhir/jaxrs/server/util/JaxRsRequest.java

@@ -1,5 +1,25 @@
 package ca.uhn.fhir.jaxrs.server.util;
 
+/*
+ * #%L
+ * HAPI FHIR JAX-RS 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.IOException;
 import java.io.InputStream;
 import java.io.Reader;

hapi-fhir-jaxrsserver-base/src/main/java/ca/uhn/fhir/jaxrs/server/util/JaxRsResponse.java

@@ -1,5 +1,25 @@
 package ca.uhn.fhir.jaxrs.server.util;
 
+/*
+ * #%L
+ * HAPI FHIR JAX-RS 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.IOException;
 import java.io.StringWriter;
 import java.io.UnsupportedEncodingException;

hapi-fhir-jpaserver-base/pom.xml

@@ -436,6 +436,7 @@
 				<skip-hib4>true</skip-hib4>
 			</properties>
 		</profile>
+			<!-- 
 		<profile>
 			<id>DIST</id>
 			<build>
@@ -448,9 +449,13 @@
 							<target>SCRIPT</target>
 							<skip>${skip-hib4}</skip>
 						</configuration>
-						<!-- This needs to be uncommented in order for this plugin to work with Hibernate 4.3+ (as of hibernate4-maven-plugin version 1.0.5) -->
+						<dependencies>
-						<dependencies> <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-core</artifactId> 
+							<dependency>
-							<version>${hibernate_version}</version> </dependency> </dependencies>
+								<groupId>org.hibernate</groupId>
+								<artifactId>hibernate-core</artifactId>
+								<version>${hibernate_version}</version>
+							</dependency>
+						</dependencies>
 						<executions>
 							<execution>
 								<id>o10g</id>
@@ -501,6 +506,7 @@
 				</plugins>
 			</build>
 		</profile>
+		 -->
 	</profiles>
 
 </project>

hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/BaseHapiFhirDao.java

@@ -1079,13 +1079,15 @@ public abstract class BaseHapiFhirDao<T extends IBaseResource> implements IDao {
 		return retVal;
 	}
 
-	protected IBaseResource toResource(BaseHasResource theEntity, boolean theForHistoryOperation) {
+	@Override
+	public IBaseResource toResource(BaseHasResource theEntity, boolean theForHistoryOperation) {
 		RuntimeResourceDefinition type = myContext.getResourceDefinition(theEntity.getResourceType());
 		return toResource(type.getImplementingClass(), theEntity, theForHistoryOperation);
 	}
 
+	@Override
 	@SuppressWarnings("unchecked")
-	protected <R extends IBaseResource> R toResource(Class<R> theResourceType, BaseHasResource theEntity, boolean theForHistoryOperation) {
+	public <R extends IBaseResource> R toResource(Class<R> theResourceType, BaseHasResource theEntity, boolean theForHistoryOperation) {
 		String resourceText = null;
 		switch (theEntity.getEncoding()) {
 		case JSON:

hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/BaseHapiFhirResourceDao.java

@@ -33,10 +33,7 @@ import java.util.Map.Entry;
 import java.util.Set;
 
 import javax.annotation.PostConstruct;
-import javax.persistence.EntityManager;
 import javax.persistence.NoResultException;
-import javax.persistence.PersistenceContext;
-import javax.persistence.PersistenceContextType;
 import javax.persistence.TemporalType;
 import javax.persistence.TypedQuery;
 
@@ -97,9 +94,6 @@ public abstract class BaseHapiFhirResourceDao<T extends IResource> extends BaseH
 	@Autowired
 	private DaoConfig myDaoConfig;
 
-	@PersistenceContext(type = PersistenceContextType.TRANSACTION)
-	protected EntityManager myEntityManager;
-
 	@Autowired
 	protected PlatformTransactionManager myPlatformTransactionManager;
 

hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/FhirResourceDaoDstu21.java

@@ -1,5 +1,25 @@
 package ca.uhn.fhir.jpa.dao;
 
+/*
+ * #%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 static org.apache.commons.lang3.StringUtils.isNotBlank;
 
 import java.util.ArrayList;

hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/IDao.java

@@ -1,5 +1,8 @@
 package ca.uhn.fhir.jpa.dao;
 
+import org.hl7.fhir.instance.model.api.IBaseResource;
+
+import ca.uhn.fhir.jpa.entity.BaseHasResource;
 import ca.uhn.fhir.model.api.IResource;
 import ca.uhn.fhir.model.api.ResourceMetadataKeyEnum;
 
@@ -40,5 +43,9 @@ public interface IDao {
 		}
 	};
 
+	IBaseResource toResource(BaseHasResource theEntity, boolean theForHistoryOperation);
+
+	<R extends IBaseResource> R toResource(Class<R> theResourceType, BaseHasResource theEntity, boolean theForHistoryOperation);
+
 	
 }

hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/ServletSubRequestDetails.java

@@ -1,5 +1,25 @@
 package ca.uhn.fhir.jpa.provider;
 
+/*
+ * #%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.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;

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

@@ -1,5 +1,25 @@
 package ca.uhn.fhir.rest.server.provider;
 
+/*
+ * #%L
+ * HAPI FHIR Structures - DSTU1 (FHIR v0.80)
+ * %%
+ * 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.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;

hapi-fhir-structures-dstu2.1/src/main/java/ca/uhn/fhir/model/dstu21/FhirDstu21.java

@@ -2,7 +2,7 @@ package ca.uhn.fhir.model.dstu21;
 
 /*
  * #%L
- * HAPI FHIR Structures - DSTU2 (FHIR v1.0.0)
+ * HAPI FHIR Structures - DSTU2.1 (FHIR v1.1.x)
  * %%
  * Copyright (C) 2014 - 2015 University Health Network
  * %%

hapi-fhir-structures-dstu2.1/src/main/java/ca/uhn/fhir/model/dstu21/composite/AgeDt.java

@@ -6,7 +6,7 @@ import ca.uhn.fhir.model.primitive.IntegerDt;
 
 /*
  * #%L
- * HAPI FHIR Structures - DSTU2 (FHIR v1.0.0)
+ * HAPI FHIR Structures - DSTU2.1 (FHIR v1.1.x)
  * %%
  * Copyright (C) 2014 - 2015 University Health Network
  * %%

hapi-fhir-structures-dstu2.1/src/main/java/ca/uhn/fhir/model/dstu21/composite/BoundCodeableConceptDt.java

@@ -2,7 +2,7 @@ package ca.uhn.fhir.model.dstu21.composite;
 
 /*
  * #%L
- * HAPI FHIR Structures - DSTU2 (FHIR v1.0.0)
+ * HAPI FHIR Structures - DSTU2.1 (FHIR v1.1.x)
  * %%
  * Copyright (C) 2014 - 2015 University Health Network
  * %%

hapi-fhir-structures-dstu2.1/src/main/java/ca/uhn/fhir/model/dstu21/composite/ContainedDt.java

@@ -2,7 +2,7 @@ package ca.uhn.fhir.model.dstu21.composite;
 
 /*
  * #%L
- * HAPI FHIR Structures - DSTU2 (FHIR v1.0.0)
+ * HAPI FHIR Structures - DSTU2.1 (FHIR v1.1.x)
  * %%
  * Copyright (C) 2014 - 2015 University Health Network
  * %%

hapi-fhir-structures-dstu2.1/src/main/java/ca/uhn/fhir/model/dstu21/composite/CountDt.java

@@ -5,7 +5,7 @@ import ca.uhn.fhir.model.dstu21.composite.QuantityDt;
 
 /*
  * #%L
- * HAPI FHIR Structures - DSTU2 (FHIR v1.0.0)
+ * HAPI FHIR Structures - DSTU2.1 (FHIR v1.1.x)
  * %%
  * Copyright (C) 2014 - 2015 University Health Network
  * %%

hapi-fhir-structures-dstu2.1/src/main/java/ca/uhn/fhir/model/dstu21/composite/DistanceDt.java

@@ -6,7 +6,7 @@ import ca.uhn.fhir.model.primitive.IntegerDt;
 
 /*
  * #%L
- * HAPI FHIR Structures - DSTU2 (FHIR v1.0.0)
+ * HAPI FHIR Structures - DSTU2.1 (FHIR v1.1.x)
  * %%
  * Copyright (C) 2014 - 2015 University Health Network
  * %%

hapi-fhir-structures-dstu2.1/src/main/java/ca/uhn/fhir/model/dstu21/composite/DurationDt.java

@@ -5,7 +5,7 @@ import ca.uhn.fhir.model.dstu21.composite.QuantityDt;
 
 /*
  * #%L
- * HAPI FHIR Structures - DSTU2 (FHIR v1.0.0)
+ * HAPI FHIR Structures - DSTU2.1 (FHIR v1.1.x)
  * %%
  * Copyright (C) 2014 - 2015 University Health Network
  * %%

hapi-fhir-structures-dstu2.1/src/main/java/ca/uhn/fhir/model/dstu21/composite/MoneyDt.java

@@ -5,7 +5,7 @@ import ca.uhn.fhir.model.dstu21.composite.QuantityDt;
 
 /*
  * #%L
- * HAPI FHIR Structures - DSTU2 (FHIR v1.0.0)
+ * HAPI FHIR Structures - DSTU2.1 (FHIR v1.1.x)
  * %%
  * Copyright (C) 2014 - 2015 University Health Network
  * %%

hapi-fhir-structures-dstu2.1/src/main/java/ca/uhn/fhir/model/dstu21/composite/NarrativeDt.java

@@ -18,7 +18,7 @@ package ca.uhn.fhir.model.dstu21.composite;
 
 /*
  * #%L
- * HAPI FHIR Structures - DSTU2 (FHIR v1.0.0)
+ * HAPI FHIR Structures - DSTU2.1 (FHIR v1.1.x)
  * %%
  * Copyright (C) 2014 - 2015 University Health Network
  * %%

hapi-fhir-structures-dstu2.1/src/main/java/ca/uhn/fhir/model/dstu21/composite/ResourceReferenceDt.java

@@ -18,7 +18,7 @@ package ca.uhn.fhir.model.dstu21.composite;
 
 /*
  * #%L
- * HAPI FHIR Structures - DSTU2 (FHIR v1.0.0)
+ * HAPI FHIR Structures - DSTU2.1 (FHIR v1.1.x)
  * %%
  * Copyright (C) 2014 - 2015 University Health Network
  * %%

hapi-fhir-structures-dstu2.1/src/main/java/ca/uhn/fhir/model/dstu21/composite/SimpleQuantityDt.java

@@ -7,7 +7,7 @@ import ca.uhn.fhir.model.dstu21.valueset.QuantityComparatorEnum;
 
 /*
  * #%L
- * HAPI FHIR Structures - DSTU2 (FHIR v1.0.0)
+ * HAPI FHIR Structures - DSTU2.1 (FHIR v1.1.x)
  * %%
  * Copyright (C) 2014 - 2015 University Health Network
  * %%

hapi-fhir-structures-dstu2.1/src/main/java/ca/uhn/fhir/model/dstu21/resource/BaseResource.java

@@ -2,7 +2,7 @@ package ca.uhn.fhir.model.dstu21.resource;
 
 /*
  * #%L
- * HAPI FHIR Structures - DSTU2 (FHIR v1.0.0)
+ * HAPI FHIR Structures - DSTU2.1 (FHIR v1.1.x)
  * %%
  * Copyright (C) 2014 - 2015 University Health Network
  * %%

hapi-fhir-structures-dstu2.1/src/main/java/ca/uhn/fhir/rest/server/provider/dstu21/Dstu21BundleFactory.java

@@ -2,7 +2,7 @@ package ca.uhn.fhir.rest.server.provider.dstu21;
 
 /*
  * #%L
- * HAPI FHIR Structures - DSTU2 (FHIR v1.0.0)
+ * HAPI FHIR Structures - DSTU2.1 (FHIR v1.1.x)
  * %%
  * Copyright (C) 2014 - 2015 University Health Network
  * %%

hapi-fhir-structures-dstu2.1/src/main/java/ca/uhn/fhir/rest/server/provider/dstu21/ServerConformanceProvider.java

@@ -2,7 +2,7 @@ package ca.uhn.fhir.rest.server.provider.dstu21;
 
 /*
  * #%L
- * HAPI FHIR Structures - DSTU2 (FHIR v1.0.0)
+ * HAPI FHIR Structures - DSTU2.1 (FHIR v1.1.x)
  * %%
  * Copyright (C) 2014 - 2015 University Health Network
  * %%

hapi-fhir-structures-dstu2.1/src/main/java/ca/uhn/fhir/rest/server/provider/dstu21/ServerProfileProvider.java

@@ -2,7 +2,7 @@ package ca.uhn.fhir.rest.server.provider.dstu21;
 
 /*
  * #%L
- * HAPI FHIR Structures - DSTU2 (FHIR v1.0.0)
+ * HAPI FHIR Structures - DSTU2.1 (FHIR v1.1.x)
  * %%
  * Copyright (C) 2014 - 2015 University Health Network
  * %%