From 1f3991caf9674ea288362c0e912268b4e8b1654d Mon Sep 17 00:00:00 2001 From: jamesagnew Date: Wed, 17 Dec 2014 17:04:10 -0500 Subject: [PATCH] Bump version to 0.9-SNAPSHOT --- examples/pom.xml | 6 +- hapi-deployable-pom/pom.xml | 2 +- hapi-fhir-base/pom.xml | 4 +- .../ca/uhn/fhir/model/api/IFhirVersion.java | 10 +- .../uhn/fhir/model/api/IFhirVersion.java.orig | 53 ++++++++++ hapi-fhir-base/testmindeps/pom.xml | 6 +- hapi-fhir-dist/pom.xml | 14 +-- hapi-fhir-dist/pom.xml.versionsBackup | 100 ++++++++++++++++++ hapi-fhir-jpaserver-base/pom.xml | 6 +- hapi-fhir-jpaserver-test/pom.xml | 8 +- .../org.eclipse.wst.common.component | 8 +- hapi-fhir-jpaserver-uhnfhirtest/pom.xml | 14 +-- hapi-fhir-structures-dev/.classpath | 6 +- .../org.eclipse.core.resources.prefs | 3 + hapi-fhir-structures-dev/pom.xml | 6 +- hapi-fhir-structures-dstu/.gitignore | 1 + hapi-fhir-structures-dstu/pom.xml | 6 +- .../uhn/fhir/model/dstu/FhirDstu1.java.orig | 30 +++--- hapi-fhir-testpage-overlay/pom.xml | 8 +- hapi-tinder-plugin/pom.xml | 4 +- hapi-tinder-test/pom.xml | 10 +- pom.xml | 5 +- restful-server-example-test/pom.xml | 6 +- restful-server-example/pom.xml | 6 +- 24 files changed, 236 insertions(+), 86 deletions(-) create mode 100644 hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IFhirVersion.java.orig create mode 100644 hapi-fhir-dist/pom.xml.versionsBackup diff --git a/examples/pom.xml b/examples/pom.xml index c43a8bf80c4..5c13aa4f458 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -4,7 +4,7 @@ ca.uhn.hapi.fhir hapi-fhir - 0.8 + 0.9-SNAPSHOT ../pom.xml @@ -17,12 +17,12 @@ ca.uhn.hapi.fhir hapi-fhir-base - 0.8 + 0.9-SNAPSHOT ca.uhn.hapi.fhir hapi-fhir-structures-dstu - 0.8 + 0.9-SNAPSHOT javax.servlet diff --git a/hapi-deployable-pom/pom.xml b/hapi-deployable-pom/pom.xml index a939fe3fd45..004eb91647f 100644 --- a/hapi-deployable-pom/pom.xml +++ b/hapi-deployable-pom/pom.xml @@ -4,7 +4,7 @@ ca.uhn.hapi.fhir hapi-fhir - 0.8 + 0.9-SNAPSHOT ../pom.xml diff --git a/hapi-fhir-base/pom.xml b/hapi-fhir-base/pom.xml index df3204c4507..4c4c88ea089 100644 --- a/hapi-fhir-base/pom.xml +++ b/hapi-fhir-base/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir hapi-deployable-pom - 0.8 + 0.9-SNAPSHOT ../hapi-deployable-pom/pom.xml @@ -201,7 +201,7 @@ ca.uhn.hapi.fhir hapi-fhir-structures-dstu - 0.8 + 0.9-SNAPSHOT diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IFhirVersion.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IFhirVersion.java index f3f7f6b7be5..e9c20b959a6 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IFhirVersion.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IFhirVersion.java @@ -27,24 +27,16 @@ import ca.uhn.fhir.context.RuntimeResourceDefinition; import ca.uhn.fhir.rest.server.IResourceProvider; import ca.uhn.fhir.rest.server.RestfulServer; -import javax.servlet.http.HttpServletRequest; - public interface IFhirVersion { FhirVersionEnum getVersion(); - IResource generateProfile(RuntimeResourceDefinition theRuntimeResourceDefinition); - - Object createServerConformanceProvider(RestfulServer theServer); - IResourceProvider createServerProfilesProvider(RestfulServer theRestfulServer); InputStream getFhirVersionPropertiesFile(); IResource generateProfile(RuntimeResourceDefinition theRuntimeResourceDefinition, String theServerBase); - Object createServerConformanceProvider(RestfulServer theServer); - - IResourceProvider createServerProfilesProvider(RestfulServer theRestfulServer); + Object createServerConformanceProvider(RestfulServer theRestfulServer); } diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IFhirVersion.java.orig b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IFhirVersion.java.orig new file mode 100644 index 00000000000..8074b931420 --- /dev/null +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/IFhirVersion.java.orig @@ -0,0 +1,53 @@ +package ca.uhn.fhir.model.api; + +/* + * #%L + * HAPI FHIR - Core Library + * %% + * Copyright (C) 2014 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.InputStream; + +import ca.uhn.fhir.context.FhirVersionEnum; +import ca.uhn.fhir.context.RuntimeResourceDefinition; +import ca.uhn.fhir.rest.server.IResourceProvider; +import ca.uhn.fhir.rest.server.RestfulServer; + +import javax.servlet.http.HttpServletRequest; + +public interface IFhirVersion { + +<<<<<<< HEAD + FhirVersionEnum getVersion(); + + IResource generateProfile(RuntimeResourceDefinition theRuntimeResourceDefinition); + + Object createServerConformanceProvider(RestfulServer theServer); + + IResourceProvider createServerProfilesProvider(RestfulServer theRestfulServer); + + InputStream getFhirVersionPropertiesFile(); + +======= + IResource generateProfile(RuntimeResourceDefinition theRuntimeResourceDefinition, String theServerBase); + + Object createServerConformanceProvider(RestfulServer theServer); + + IResourceProvider createServerProfilesProvider(RestfulServer theRestfulServer); + +>>>>>>> origin/master +} diff --git a/hapi-fhir-base/testmindeps/pom.xml b/hapi-fhir-base/testmindeps/pom.xml index abf236e0aff..37f30181671 100644 --- a/hapi-fhir-base/testmindeps/pom.xml +++ b/hapi-fhir-base/testmindeps/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir hapi-fhir - 0.8 + 0.9-SNAPSHOT ../../pom.xml @@ -40,12 +40,12 @@ ca.uhn.hapi.fhir hapi-fhir-base - 0.8 + 0.9-SNAPSHOT ca.uhn.hapi.fhir hapi-fhir-structures-dstu - 0.8 + 0.9-SNAPSHOT diff --git a/hapi-fhir-dist/pom.xml b/hapi-fhir-dist/pom.xml index d67816e0dd6..b6a845c2308 100644 --- a/hapi-fhir-dist/pom.xml +++ b/hapi-fhir-dist/pom.xml @@ -4,31 +4,31 @@ ca.uhn.hapi.fhir - hapi-deployable-pom - 0.8 + hapi-fhir + 0.9-SNAPSHOT ../pom.xml - hapi-fhir-structures-dstu + hapi-fhir-dist pom - HAPI FHIR Structures - DSTU (FHIR 0.80) + HAPI FHIR - Distribution Archive ca.uhn.hapi.fhir hapi-fhir-base - 0.8 + 0.9-SNAPSHOT ca.uhn.hapi.fhir hapi-fhir-structures-dstu - 0.8 + 0.9-SNAPSHOT ca.uhn.hapi.fhir hapi-fhir-structures-dev - 0.8 + 0.9-SNAPSHOT ch.qos.logback diff --git a/hapi-fhir-dist/pom.xml.versionsBackup b/hapi-fhir-dist/pom.xml.versionsBackup new file mode 100644 index 00000000000..fea95b88f62 --- /dev/null +++ b/hapi-fhir-dist/pom.xml.versionsBackup @@ -0,0 +1,100 @@ + + 4.0.0 + + + ca.uhn.hapi.fhir + hapi-deployable-pom + 0.8 + ../pom.xml + + + hapi-fhir-dist + pom + + HAPI FHIR - Distribution Archive + + + + ca.uhn.hapi.fhir + hapi-fhir-base + 0.8 + + + ca.uhn.hapi.fhir + hapi-fhir-structures-dstu + 0.8 + + + ca.uhn.hapi.fhir + hapi-fhir-structures-dev + 0.8 + + + ch.qos.logback + logback-classic + ${logback_version} + + + org.ebaysf.web + cors-filter + ${ebay_cors_filter_version} + + + org.thymeleaf + thymeleaf + ${thymeleaf-version} + + + com.phloc + phloc-schematron + ${phloc_schematron_version} + + + com.phloc + phloc-commons + ${phloc_commons_version} + + + + + + + org.apache.maven.plugins + maven-deploy-plugin + + true + + + + + + + + DIST + + + + maven-assembly-plugin + ${maven_assembly_plugin_version} + + + package + + single + + + false + + ${project.basedir}/src/assembly/hapi-fhir-all.xml + + + + + + + + + + + diff --git a/hapi-fhir-jpaserver-base/pom.xml b/hapi-fhir-jpaserver-base/pom.xml index b8cebb3b1a9..c3b3a9c565c 100644 --- a/hapi-fhir-jpaserver-base/pom.xml +++ b/hapi-fhir-jpaserver-base/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir hapi-fhir - 0.8 + 0.9-SNAPSHOT ../pom.xml @@ -35,7 +35,7 @@ ca.uhn.hapi.fhir hapi-fhir-base - 0.8 + 0.9-SNAPSHOT commons-logging @@ -46,7 +46,7 @@ ca.uhn.hapi.fhir hapi-fhir-structures-dstu - 0.8 + 0.9-SNAPSHOT diff --git a/hapi-fhir-jpaserver-test/pom.xml b/hapi-fhir-jpaserver-test/pom.xml index f9545a2c634..9cb0b8931dc 100644 --- a/hapi-fhir-jpaserver-test/pom.xml +++ b/hapi-fhir-jpaserver-test/pom.xml @@ -4,7 +4,7 @@ ca.uhn.hapi.fhir hapi-fhir - 0.8 + 0.9-SNAPSHOT ../pom.xml @@ -17,7 +17,7 @@ ca.uhn.hapi.fhir hapi-fhir-jpaserver-base - 0.8 + 0.9-SNAPSHOT org.thymeleaf @@ -127,7 +127,7 @@ ca.uhn.hapi.fhir hapi-tinder-plugin - 0.8 + 0.9-SNAPSHOT buildclient @@ -160,7 +160,7 @@ ca.uhn.hapi.fhir hapi-fhir-structures-dstu - 0.8 + 0.9-SNAPSHOT diff --git a/hapi-fhir-jpaserver-uhnfhirtest/.settings/org.eclipse.wst.common.component b/hapi-fhir-jpaserver-uhnfhirtest/.settings/org.eclipse.wst.common.component index 0a683f4735f..ea639cfa4d4 100644 --- a/hapi-fhir-jpaserver-uhnfhirtest/.settings/org.eclipse.wst.common.component +++ b/hapi-fhir-jpaserver-uhnfhirtest/.settings/org.eclipse.wst.common.component @@ -6,16 +6,16 @@ - + uses - + uses - + uses - + consumes diff --git a/hapi-fhir-jpaserver-uhnfhirtest/pom.xml b/hapi-fhir-jpaserver-uhnfhirtest/pom.xml index a50ded1314b..abd2265875d 100644 --- a/hapi-fhir-jpaserver-uhnfhirtest/pom.xml +++ b/hapi-fhir-jpaserver-uhnfhirtest/pom.xml @@ -4,7 +4,7 @@ ca.uhn.hapi.fhir hapi-fhir - 0.8 + 0.9-SNAPSHOT ../pom.xml @@ -16,17 +16,17 @@ ca.uhn.hapi.fhir hapi-fhir-jpaserver-base - 0.8 + 0.9-SNAPSHOT ca.uhn.hapi.fhir hapi-fhir-structures-dstu - 0.8 + 0.9-SNAPSHOT ca.uhn.hapi.fhir hapi-fhir-testpage-overlay - 0.8 + 0.9-SNAPSHOT war provided @@ -34,7 +34,7 @@ ca.uhn.hapi.fhir hapi-fhir-jpaserver-test - 0.8 + 0.9-SNAPSHOT test @@ -190,7 +190,7 @@ ca.uhn.hapi.fhir hapi-tinder-plugin - 0.8 + 0.9-SNAPSHOT buildclient @@ -274,7 +274,7 @@ ca.uhn.hapi.fhir hapi-fhir-structures-dstu - 0.8 + 0.9-SNAPSHOT diff --git a/hapi-fhir-structures-dev/.classpath b/hapi-fhir-structures-dev/.classpath index e10c4a412b2..49ac9b99910 100644 --- a/hapi-fhir-structures-dev/.classpath +++ b/hapi-fhir-structures-dev/.classpath @@ -6,9 +6,9 @@ - - - + + + diff --git a/hapi-fhir-structures-dev/.settings/org.eclipse.core.resources.prefs b/hapi-fhir-structures-dev/.settings/org.eclipse.core.resources.prefs index f9fe34593fc..a16325fe5a1 100644 --- a/hapi-fhir-structures-dev/.settings/org.eclipse.core.resources.prefs +++ b/hapi-fhir-structures-dev/.settings/org.eclipse.core.resources.prefs @@ -1,4 +1,7 @@ eclipse.preferences.version=1 encoding//src/main/java=UTF-8 encoding//src/test/java=UTF-8 +encoding//src/test/resources=UTF-8 +encoding//target/generated-resources/tinder=UTF-8 +encoding//target/generated-sources/tinder=UTF-8 encoding/=UTF-8 diff --git a/hapi-fhir-structures-dev/pom.xml b/hapi-fhir-structures-dev/pom.xml index d73850a9e6b..c255d9825c9 100644 --- a/hapi-fhir-structures-dev/pom.xml +++ b/hapi-fhir-structures-dev/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir hapi-deployable-pom - 0.8 + 0.9-SNAPSHOT ../hapi-deployable-pom/pom.xml @@ -18,7 +18,7 @@ ca.uhn.hapi.fhir hapi-fhir-base - 0.8 + 0.9-SNAPSHOT @@ -203,7 +203,7 @@ ca.uhn.hapi.fhir hapi-tinder-plugin - 0.8 + 0.9-SNAPSHOT diff --git a/hapi-fhir-structures-dstu/.gitignore b/hapi-fhir-structures-dstu/.gitignore index 7b36f696766..631a1a2575f 100644 --- a/hapi-fhir-structures-dstu/.gitignore +++ b/hapi-fhir-structures-dstu/.gitignore @@ -5,3 +5,4 @@ /.settings/ .classpath .project +/target/ diff --git a/hapi-fhir-structures-dstu/pom.xml b/hapi-fhir-structures-dstu/pom.xml index 15e1beb3ea5..881e2f20d5c 100644 --- a/hapi-fhir-structures-dstu/pom.xml +++ b/hapi-fhir-structures-dstu/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir hapi-deployable-pom - 0.8 + 0.9-SNAPSHOT ../hapi-deployable-pom/pom.xml @@ -18,7 +18,7 @@ ca.uhn.hapi.fhir hapi-fhir-base - 0.8 + 0.9-SNAPSHOT @@ -195,7 +195,7 @@ ca.uhn.hapi.fhir hapi-tinder-plugin - 0.8 + 0.9-SNAPSHOT diff --git a/hapi-fhir-structures-dstu/src/main/java/ca/uhn/fhir/model/dstu/FhirDstu1.java.orig b/hapi-fhir-structures-dstu/src/main/java/ca/uhn/fhir/model/dstu/FhirDstu1.java.orig index 3f599906d5a..f2b8c6e1042 100644 --- a/hapi-fhir-structures-dstu/src/main/java/ca/uhn/fhir/model/dstu/FhirDstu1.java.orig +++ b/hapi-fhir-structures-dstu/src/main/java/ca/uhn/fhir/model/dstu/FhirDstu1.java.orig @@ -31,12 +31,6 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; -<<<<<<< HEAD -import ca.uhn.fhir.context.*; -import ca.uhn.fhir.model.api.ICompositeDatatype; - -======= ->>>>>>> c294e1c064fcbf112edcbf4e10c341691c12a1a8 import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.text.WordUtils; import org.hl7.fhir.instance.model.IBaseResource; @@ -79,6 +73,8 @@ import ca.uhn.fhir.rest.server.RestfulServer; import ca.uhn.fhir.rest.server.provider.ServerConformanceProvider; import ca.uhn.fhir.rest.server.provider.ServerProfileProvider; +import javax.servlet.http.HttpServletRequest; + public class FhirDstu1 implements IFhirVersion { private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(FhirDstu1.class); @@ -152,7 +148,7 @@ public class FhirDstu1 implements IFhirVersion { } } - private void fillName(StructureElement elem, BaseRuntimeElementDefinition nextDef) { + private void fillName(StructureElement elem, BaseRuntimeElementDefinition nextDef, String theServerBase) { if (nextDef instanceof RuntimeResourceReferenceDefinition) { RuntimeResourceReferenceDefinition rr = (RuntimeResourceReferenceDefinition) nextDef; for (Class next : rr.getResourceTypes()) { @@ -160,9 +156,14 @@ public class FhirDstu1 implements IFhirVersion { type.getCode().setValue("ResourceReference"); if (next != IResource.class) { +<<<<<<< HEAD @SuppressWarnings("unchecked") RuntimeResourceDefinition resDef = rr.getDefinitionForResourceType((Class) next); type.getProfile().setValueAsString(resDef.getResourceProfile()); +======= + RuntimeResourceDefinition resDef = rr.getDefinitionForResourceType(next); + type.getProfile().setValueAsString(resDef.getResourceProfile(theServerBase)); +>>>>>>> origin/master } } @@ -178,7 +179,7 @@ public class FhirDstu1 implements IFhirVersion { type.setCode(fromCodeString); } - private void fillProfile(Structure theStruct, StructureElement theElement, BaseRuntimeElementDefinition def, LinkedList path, BaseRuntimeDeclaredChildDefinition theChild) { + private void fillProfile(Structure theStruct, StructureElement theElement, BaseRuntimeElementDefinition def, LinkedList path, BaseRuntimeDeclaredChildDefinition theChild, String theServerBase) { fillBasics(theElement, def, path, theChild); @@ -226,7 +227,7 @@ public class FhirDstu1 implements IFhirVersion { if (child instanceof RuntimeChildResourceBlockDefinition) { RuntimeResourceBlockDefinition nextDef = (RuntimeResourceBlockDefinition) child.getSingleChildOrThrow(); - fillProfile(theStruct, elem, nextDef, path, child); + fillProfile(theStruct, elem, nextDef, path, child, theServerBase); } else if (child instanceof RuntimeChildContainedResources) { // ignore } else if (child instanceof RuntimeChildDeclaredExtensionDefinition) { @@ -237,10 +238,10 @@ public class FhirDstu1 implements IFhirVersion { String nextName = childNamesIter.next(); BaseRuntimeElementDefinition nextDef = child.getChildByName(nextName); fillBasics(elem, nextDef, path, child); - fillName(elem, nextDef); + fillName(elem, nextDef, theServerBase); while (childNamesIter.hasNext()) { nextDef = child.getChildByName(childNamesIter.next()); - fillName(elem, nextDef); + fillName(elem, nextDef, theServerBase); } path.pollLast(); } else { @@ -256,7 +257,7 @@ public class FhirDstu1 implements IFhirVersion { } @Override - public IResource generateProfile(RuntimeResourceDefinition theRuntimeResourceDefinition) { + public IResource generateProfile(RuntimeResourceDefinition theRuntimeResourceDefinition, String theServerBase) { Profile retVal = new Profile(); RuntimeResourceDefinition def = theRuntimeResourceDefinition; @@ -285,8 +286,7 @@ public class FhirDstu1 implements IFhirVersion { StructureElement element = struct.addElement(); element.getDefinition().setMin(1); element.getDefinition().setMax("1"); - - fillProfile(struct, element, def, path, null); + fillProfile(struct, element, def, path, null, theServerBase); retVal.getStructure().get(0).getElement().get(0).getDefinition().addType().getCode().setValue("Resource"); @@ -343,7 +343,7 @@ public class FhirDstu1 implements IFhirVersion { @Override public IResourceProvider createServerProfilesProvider(RestfulServer theRestfulServer) { - return new ServerProfileProvider(theRestfulServer.getFhirContext()); + return new ServerProfileProvider(theRestfulServer); } @Override diff --git a/hapi-fhir-testpage-overlay/pom.xml b/hapi-fhir-testpage-overlay/pom.xml index cb63eb9394a..4b78e9e6424 100644 --- a/hapi-fhir-testpage-overlay/pom.xml +++ b/hapi-fhir-testpage-overlay/pom.xml @@ -4,7 +4,7 @@ ca.uhn.hapi.fhir hapi-fhir - 0.8 + 0.9-SNAPSHOT ../pom.xml @@ -27,12 +27,12 @@ ca.uhn.hapi.fhir hapi-fhir-base - 0.8 + 0.9-SNAPSHOT ca.uhn.hapi.fhir hapi-fhir-structures-dstu - 0.8 + 0.9-SNAPSHOT org.thymeleaf @@ -55,7 +55,7 @@ ca.uhn.hapi.fhir hapi-fhir-jpaserver-test - 0.8 + 0.9-SNAPSHOT test diff --git a/hapi-tinder-plugin/pom.xml b/hapi-tinder-plugin/pom.xml index 0d41091016f..e4406d41cb4 100644 --- a/hapi-tinder-plugin/pom.xml +++ b/hapi-tinder-plugin/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir hapi-fhir - 0.8 + 0.9-SNAPSHOT ../pom.xml @@ -19,7 +19,7 @@ ca.uhn.hapi.fhir hapi-fhir-base - 0.8 + 0.9-SNAPSHOT + --> diff --git a/restful-server-example-test/pom.xml b/restful-server-example-test/pom.xml index c91c93b1d5f..d71174d81d1 100644 --- a/restful-server-example-test/pom.xml +++ b/restful-server-example-test/pom.xml @@ -4,7 +4,7 @@ ca.uhn.hapi.fhir hapi-fhir - 0.8 + 0.9-SNAPSHOT ../pom.xml @@ -17,12 +17,12 @@ ca.uhn.hapi.fhir hapi-fhir-base - 0.8 + 0.9-SNAPSHOT ca.uhn.hapi.fhir hapi-fhir-structures-dstu - 0.8 + 0.9-SNAPSHOT test diff --git a/restful-server-example/pom.xml b/restful-server-example/pom.xml index e2234f6bb26..f7aec12b3c7 100644 --- a/restful-server-example/pom.xml +++ b/restful-server-example/pom.xml @@ -35,20 +35,20 @@ ca.uhn.hapi.fhir hapi-fhir-base - 0.8 + 0.9-SNAPSHOT ca.uhn.hapi.fhir hapi-fhir-structures-dstu - 0.8 + 0.9-SNAPSHOT ca.uhn.hapi.fhir hapi-fhir-testpage-overlay - 0.8 + 0.9-SNAPSHOT war provided