Tag 0.5

hapifhir · Jul 30, 2014 · 0a57647 · 0a57647
1 parent 67fb593
commit 0a57647
Show file tree

Hide file tree

Showing 8 changed files with 42 additions and 19 deletions.
diff --git a/hapi-fhir-base/src/changes/changes.xml b/hapi-fhir-base/src/changes/changes.xml
@@ -6,7 +6,7 @@
 		<title>HAPI FHIR Changelog</title>
 	</properties>
 	<body>
-		<release version="0.5" date="TBD">
+		<release version="0.5" date="2014-Jul-30">
 			<action type="add">
 				having multiple ways of accomplishing the same thing. This means that a number of existing classes
 				have been deprocated in favour of new naming schemes.

diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/base/composite/BaseHumanNameDt.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/base/composite/BaseHumanNameDt.java
@@ -38,7 +38,7 @@ public abstract class BaseHumanNameDt extends BaseIdentifiableElement {
 	public abstract java.util.List<StringDt> getFamily();
 
 	/**
-	 * Returns all repetitions of {@link $ hash}getFamily() family name} as a space separated string
+	 * Returns all repetitions of {@link #getFamily() family name} as a space separated string
 	 * 
 	 * @see DatatypeUtil${hash}joinStringsSpaceSeparated(List)
 	 */
@@ -56,7 +56,7 @@ public String getFamilyAsSingleString() {
 	public abstract java.util.List<StringDt> getGiven();
 
 	/**
-	 * Returns all repetitions of {@link $ hash}getGiven() given name} as a space separated string
+	 * Returns all repetitions of {@link #getGiven() given name} as a space separated string
 	 * 
 	 * @see DatatypeUtil${hash}joinStringsSpaceSeparated(List)
 	 */
@@ -74,7 +74,7 @@ public String getGivenAsSingleString() {
 	public abstract java.util.List<StringDt> getPrefix();
 
 	/**
-	 * Returns all repetitions of {@link $ hash}getPrefix() prefix name} as a space separated string
+	 * Returns all repetitions of {@link #getPrefix() prefix name} as a space separated string
 	 * 
 	 * @see DatatypeUtil${hash}joinStringsSpaceSeparated(List)
 	 */
@@ -92,7 +92,7 @@ public String getPrefixAsSingleString() {
 	public abstract java.util.List<StringDt> getSuffix();
 
 	/**
-	 * Returns all repetitions of {@link $ hash}Suffix() suffix} as a space separated string
+	 * Returns all repetitions of {@link #getSuffix() suffix} as a space separated string
 	 * 
 	 * @see DatatypeUtil${hash}joinStringsSpaceSeparated(List)
 	 */

diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/base/composite/BaseIdentifierDt.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/base/composite/BaseIdentifierDt.java
@@ -74,9 +74,9 @@ public String getValueAsQueryToken() {
 
 
 	/**
-	 * Returns true if <code>this</code> identifier has the same {@link IdentifierDt#[[#]]#getValue() value}
-	 * and {@link IdentifierDt#[[#]]#getSystem() system} (as compared by simple equals comparison).
-	 * Does not compare other values (e.g. {@link IdentifierDt#[[#]]#getUse() use}) or any extensions. 
+	 * Returns true if <code>this</code> identifier has the same {@link IdentifierDt#getValue() value}
+	 * and {@link IdentifierDt#getSystem() system} (as compared by simple equals comparison).
+	 * Does not compare other values (e.g. {@link IdentifierDt#getUse() use}) or any extensions. 
 	 */
 	public boolean matchesSystemAndValue(BaseIdentifierDt theIdentifier) {
 		if (theIdentifier == null) {

diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/RestfulServer.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/RestfulServer.java
@@ -20,7 +20,7 @@
  * #L%
  */
 
-import static org.apache.commons.lang3.StringUtils.isNotBlank;
+import static org.apache.commons.lang3.StringUtils.*;
 
 import java.io.IOException;
 import java.io.OutputStreamWriter;
@@ -66,7 +66,6 @@
 import ca.uhn.fhir.model.dstu.valueset.IssueSeverityEnum;
 import ca.uhn.fhir.model.primitive.IdDt;
 import ca.uhn.fhir.model.primitive.InstantDt;
-import ca.uhn.fhir.model.primitive.StringDt;
 import ca.uhn.fhir.parser.IParser;
 import ca.uhn.fhir.rest.method.BaseMethodBinding;
 import ca.uhn.fhir.rest.method.ConformanceMethodBinding;
@@ -334,7 +333,7 @@ public Object getServerConformanceProvider() {
 	/**
 	 * Gets the server's name, as exported in conformance profiles exported by the server. This is informational only, but can be helpful to set with something appropriate.
 	 * 
-	 * @see RestfulServer#setServerName(StringDt)
+	 * @see RestfulServer#setServerName(String)
 	 */
 	public String getServerName() {
 		return myServerName;
@@ -791,9 +790,7 @@ public void setServerConformanceProvider(Object theServerConformanceProvider) {
 	}
 
 	/**
-	 * Gets the server's name, as exported in conformance profiles exported by the server. This is informational only, but can be helpful to set with something appropriate.
-	 * 
-	 * @see RestfulServer#setServerName(StringDt)
+	 * Sets the server's name, as exported in conformance profiles exported by the server. This is informational only, but can be helpful to set with something appropriate.
 	 */
 	public void setServerName(String theServerName) {
 		myServerName = theServerName;

diff --git a/hapi-fhir-base/src/site/site.xml b/hapi-fhir-base/src/site/site.xml
@@ -52,6 +52,10 @@
 			<item name="Changelog" href="./changes-report.html" />
 		</menu>
 
+		<menu name="Test Server">
+			<item name="Public Test Server" href="http://fhirtest.uhn.ca"/>
+		</menu>
+
 		<menu name="Documentation">
 			<item name="Introduction" href="./doc_intro.html" />
 			<item name="The Data Model" href="./doc_fhirobjects.html" />

diff --git a/hapi-fhir-base/src/site/xdoc/index.xml b/hapi-fhir-base/src/site/xdoc/index.xml
@@ -21,12 +21,34 @@
 
 			<p>
 				Note that this is the home for the FHIR version of HAPI. If you are 
-				looking for HL7 v2 support, <a href="../">click here</a>.
+				looking for HL7 v2 support, <a href="http://hl7api.sourceforge.net">click here</a>.
 			</p>
 
+			<subsection name="Demonstration/Test Page">
+
+				<p>
+					A public test server is now operating at
+					<a href="http://fhirtest.uhn.ca">http://fhirtest.uhn.ca</a>. 
+					This server is built entirely using components of HAPI-FHIR
+					and demonstrates all of its capabilities.
+				</p>
+
+			</subsection>
+
 		</section>
 
 		<section name="Announcements">
+
+			<p>
+				<b>July 30, 2014 - HAPI FHIR 0.5 Released</b> - HAPI 0.5 has now been released.
+				This is surprisingly soon after the last release (and probably not a 
+				pace we will sustain) but we landed a number of big fixes and enhancements
+				over the last two weeks and it just didn't make sense to hold them.
+				See the <a href="./duc_upgrading.html">upgrading page</a> for information on 
+				API changes in this release.
+				<br/>
+				- <a href="mailto:[email protected]">James Agnew</a>
+			</p>
 
 			<p>
 				<b>July 14, 2014 - HAPI FHIR 0.4 Released</b> - The next release of HAPI has been
@@ -45,7 +67,7 @@
 				<br/>
 				- <a href="mailto:[email protected]">James Agnew</a>
 			</p>
-			
+
 		</section>
 
 		<section name="What is HAPI FHIR?">

diff --git a/hapi-fhir-jpaserver-uhnfhirtest/.settings/org.eclipse.wst.common.component b/hapi-fhir-jpaserver-uhnfhirtest/.settings/org.eclipse.wst.common.component
@@ -6,10 +6,10 @@
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
         <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
         <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
-        <dependent-module archiveName="hapi-fhir-jpaserver-base-0.5-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/hapi-fhir-jpaserver-base/hapi-fhir-jpaserver-base">
+        <dependent-module archiveName="hapi-fhir-jpaserver-base-0.5.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/hapi-fhir-jpaserver-base/hapi-fhir-jpaserver-base">
             <dependency-type>uses</dependency-type>
         </dependent-module>
-        <dependent-module archiveName="hapi-fhir-base-0.5-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/hapi-fhir-base/hapi-fhir-base">
+        <dependent-module archiveName="hapi-fhir-base-0.5.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/hapi-fhir-base/hapi-fhir-base">
             <dependency-type>uses</dependency-type>
         </dependent-module>
         <dependent-module deploy-path="/" handle="module:/overlay/prj/hapi-fhir-tester-overlay?includes=**/**&amp;excludes=META-INF/MANIFEST.MF">

diff --git a/restful-server-example/.settings/org.eclipse.wst.common.component b/restful-server-example/.settings/org.eclipse.wst.common.component
@@ -3,7 +3,7 @@
         <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
         <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
-        <dependent-module archiveName="hapi-fhir-base-0.5-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/hapi-fhir-base/hapi-fhir-base">
+        <dependent-module archiveName="hapi-fhir-base-0.5.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/hapi-fhir-base/hapi-fhir-base">
             <dependency-type>uses</dependency-type>
         </dependent-module>
         <dependent-module deploy-path="/" handle="module:/overlay/prj/hapi-fhir-tester-overlay?includes=**/**&amp;excludes=META-INF/MANIFEST.MF">