diff --git a/hapi-fhir-base/pom.xml b/hapi-fhir-base/pom.xml index 50e3d7f9e83..18124263b0c 100644 --- a/hapi-fhir-base/pom.xml +++ b/hapi-fhir-base/pom.xml @@ -4,7 +4,7 @@ ca.uhn.hapi.fhir hapi-fhir - 0.1 + 0.3 ../pom.xml @@ -194,6 +194,31 @@ + + + + org.apache.maven.plugins + maven-changes-plugin + 2.10 + false + + + + changes-report + + + + + atom_1.0 + + http://sourceforge.net/support/tracker.php?aid=%ISSUE% + https://sourceforge.net/p/hl7api/bugs/%ISSUE%/ + https://sourceforge.net/p/hl7api/feature-requests/%ISSUE%/ + + false + + + maven-site-plugin 3.3 diff --git a/hapi-fhir-base/src/changes/changes.xml b/hapi-fhir-base/src/changes/changes.xml new file mode 100644 index 00000000000..687e6ff7149 --- /dev/null +++ b/hapi-fhir-base/src/changes/changes.xml @@ -0,0 +1,20 @@ + + + + James Agnew + HAPI FHIR Changelog + + + + + Make it easier to add HTTP Basic Authorization headers to RESTful client requests + and an example]]> + illustrating how it works + + + Correct a dependency on commons-io that was causing issues with the Tinder build + + + + diff --git a/hapi-fhir-base/src/changes/changes.xsd b/hapi-fhir-base/src/changes/changes.xsd new file mode 100644 index 00000000000..9478c44f0d8 --- /dev/null +++ b/hapi-fhir-base/src/changes/changes.xsd @@ -0,0 +1,263 @@ + + + + + 1.0.0 + + Record every release with their subsequent changes. + + + + + + 1.0.0 + + Record every release with their subsequent changes. + + + + + + 1.0.0 + + Contains the properties of this document. + + + + + + 1.0.0 + + Contains the releases of this project with the actions taken + for each of the releases. + + + + + + + + 1.0.0 + + + + + 1.0.0 + The list of releases for this project. + + + + + + + 1.0.0 + A single release of this project. + + + + + 1.0.0 + The list of actions taken for this release. + + + + + + 1.0.0 + + The version number associated with this release. + + + + + + 1.0.0 + + + <p>The date of this release.</p> + <p>This field can be any String, such as "in SVN" when the version isn't yet released. </p> + + + + + + + 1.0.0 + + A short description of this release. + + + + + + + 1.0.0 + + A single action done on the project, during this release. + + + + + + 1.0.0 + A list of fix issues. + + + + + 1.0.0 + A list of contibutors for this issue. + + + + + + 1.0.0 + + + <p>Name of developer who committed the change.</p> + <p>This <b>MUST</b> be the name of the developer as described in the developers section of the pom.xml file.</p> + + + + + + + 1.0.0 + + Name of the person to be credited for this change. This can be used when a patch is submitted by a non-committer. + + + + + + 1.0.0 + + Email of the person to be credited for this change. + + + + + + 1.0.0 + + + <p>Id of the issue related to this change. This is the id in your issue tracking system.</p> + <p>The Changes plugin will generate a URL out of this id. The URL is constructed using the value of the issueLinkTemplate parameter.</p> + <p>See the <a href="changes-report.html">changes-report mojo</a> for more details.</p> + + + + + + + 1.0.0 + + + Supported action types are the following: + <ul> + <li>add : added functionnality to the project.</li> + <li>fix : bug fix for the project.</li> + <li>update : updated some part of the project.</li> + <li>remove : removed some functionnality from the project.</li> + </ul> + + + + + + + 1.0.0 + + + <p>Id of issue tracking system. If empty 'default' value will be use.</p> + <p>The Changes plugin will generate a URL out of this id. The URL is constructed using the value of the issueLinkTemplatePerSystem parameter.</p> + <p>See the <a href="changes-report.html">changes-report mojo</a> for more details.</p> + + + + + + + 1.0.0 + fix date + + + + + + 1.0.0 + + A fixed issue. + + + + + 1.0.0 + + + <p>Id of the issue related to this change. This is the id in your issue tracking system.</p> + <p>The Changes plugin will generate a URL out of this id. The URL is constructed using the value of the issueLinkTemplate parameter.</p> + <p>See the <a href="changes-report.html">changes-report mojo</a> for more details.</p> + + + + + + + + 1.0.0 + + Name and Email of the person to be credited for this change. This can be used when a patch is submitted by a non-committer. + + + + + 1.0.0 + Name of the person to be credited for this change. + + + + + 1.0.0 + Email of the person to be credited for this change. + + + + + + 1.0.0 + + + + + 1.0.0 + Page Title. + + + + + 1.0.0 + Page Author + + + + + + + 1.0.0 + + A description of the author page. + + + + + + 1.0.0 + + The page author email. + + + + + \ No newline at end of file diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/method/ReadMethodBinding.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/method/ReadMethodBinding.java index 0c1812aaadc..1e43f2d6472 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/method/ReadMethodBinding.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/method/ReadMethodBinding.java @@ -87,11 +87,11 @@ public class ReadMethodBinding extends BaseResourceReturningMethodBinding { } @Override - public List invokeServer(Object theResourceProvider,Request theRequest) throws InvalidRequestException, InternalErrorException { + public List invokeServer(Object theResourceProvider, Request theRequest) throws InvalidRequestException, InternalErrorException { Object[] params = new Object[myParameterCount]; params[myIdIndex] = theRequest.getId(); if (myVersionIdIndex != null) { - params[myVersionIdIndex] = theRequest.getId(); + params[myVersionIdIndex] = theRequest.getVersion(); } Object response; diff --git a/hapi-fhir-base/src/test/java/ca/uhn/fhir/rest/server/ResfulServerMethodTest.java b/hapi-fhir-base/src/test/java/ca/uhn/fhir/rest/server/ResfulServerMethodTest.java index e6eb8641ed4..58a358b8332 100644 --- a/hapi-fhir-base/src/test/java/ca/uhn/fhir/rest/server/ResfulServerMethodTest.java +++ b/hapi-fhir-base/src/test/java/ca/uhn/fhir/rest/server/ResfulServerMethodTest.java @@ -682,7 +682,7 @@ public class ResfulServerMethodTest { responseContent = IOUtils.toString(status.getEntity().getContent()); ourLog.info("Response was:\n{}", responseContent); - assertEquals(404, status.getStatusLine().getStatusCode()); + assertEquals(200, status.getStatusLine().getStatusCode()); } diff --git a/hapi-fhir-structures-dstu/pom.xml b/hapi-fhir-structures-dstu/pom.xml index e08cea5db0c..76ae9c62592 100644 --- a/hapi-fhir-structures-dstu/pom.xml +++ b/hapi-fhir-structures-dstu/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir hapi-fhir - 0.1 + 0.3 ../pom.xml @@ -19,7 +19,7 @@ ca.uhn.hapi.fhir hapi-fhir-base - 0.1 + 0.3 @@ -28,7 +28,7 @@ ca.uhn.hapi.fhir hapi-tinder-plugin - 0.1 + 0.3 diff --git a/hapi-tinder-plugin/pom.xml b/hapi-tinder-plugin/pom.xml index 797f07e6dee..4ce15d4bf39 100644 --- a/hapi-tinder-plugin/pom.xml +++ b/hapi-tinder-plugin/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir hapi-fhir - 0.1 + 0.3 ../pom.xml @@ -20,7 +20,7 @@ ca.uhn.hapi.fhir hapi-fhir-base - 0.1 + 0.3 diff --git a/hapi-tinder-test/pom.xml b/hapi-tinder-test/pom.xml index 99d06544251..133ccc6c102 100644 --- a/hapi-tinder-test/pom.xml +++ b/hapi-tinder-test/pom.xml @@ -4,7 +4,7 @@ ca.uhn.hapi.fhir hapi-fhir - 0.1 + 0.3 ../pom.xml diff --git a/pom.xml b/pom.xml index a29417726fe..70fd2898579 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ ca.uhn.hapi.fhir hapi-fhir pom - 0.1 + 0.3 HAPI http://hl7api.sourceforge.net/ @@ -20,6 +20,22 @@ + + + James Agnew + + + Dmitri Sotnikov + + + Lisa Wong + + + Josh Mandel + + + + Apache Software License 2.0 @@ -30,10 +46,8 @@ hapi-fhir-base hapi-tinder-plugin - @@ -87,7 +101,7 @@ - +