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

Fix unit test

This commit is contained in:
jamesagnew 2014-09-17 09:07:01 -04:00
parent 594b04d838
commit b316d556b7
3 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
hapi-fhir-base/src/changes/changes.xml.orig
View File

@ -6,16 +6,31 @@
<title>HAPI FHIR Changelog</title> <title>HAPI FHIR Changelog</title>
</properties> </properties>
<body> <body>
<<<<<<< HEAD
<release version="0.6" date="2014-Sep-08" description="This release brings a number of new features and bug fixes!">
=======
<release version="0.7" date="TBD"> <release version="0.7" date="TBD">
<action type="add"> <action type="add">
Documentation update, thanks to Suranga Nath Kasthurirathne of the OpenMRS project. Documentation update, thanks to Suranga Nath Kasthurirathne of the OpenMRS project.
</action> </action>
<action type="fix">
<<<<<<< HEAD
Server implementation was not correctly figuring out its own FHIR Base URL when deployed
on Amazon Web Service server. Thanks to Jeffrey Ting and Bill De Beaubien of
Systems Made Simple for their help in figuring out this issue!
</action>
<action type="fix">
XML Parser failed to encode fields with both a resource reference child and
a primitive type child. Thanks to Jeffrey Ting and Bill De Beaubien of
Systems Made Simple for their help in figuring out this issue!
=======
HAPI now runs successfully on Servlet 2.5 containers (such as Tomcat 6). Thanks to
Bernard Gitaadji for reporting and diagnosing the issue!
</action>
<action type="fix">
XHTML (in narratives) containing escapable characters (e.g. &lt; or &quot;) will now always have those characters
escaped properly in encoded messages.
>>>>>>> 83f9c1c6a992266de12f9076b733dffdaaf63203
</action>
</release> </release>
<release version="0.6" date="TBD"> <release version="0.6" date="2014-Sep-08" description="This release brings a number of new features and bug fixes!">
>>>>>>> cdd4b137fb40dd72f895c2bcb644d6e668e1015b
<!-- <!--
<action type="add"> <action type="add">
Allow generic client ... OAUTH Allow generic client ... OAUTH

1
restful-server-example-test/.settings/org.eclipse.core.resources.prefs
View File

@ -1,2 +1,3 @@
eclipse.preferences.version=1 eclipse.preferences.version=1
encoding//src/test/java=UTF-8
encoding/<project>=UTF-8 encoding/<project>=UTF-8

3
restful-server-example-test/src/test/java/ca/uhn/example/ExampleTest.java
View File

@ -47,7 +47,8 @@ public class ExampleTest {
System.setProperty("ca.uhn.fhir.to.TesterConfig_SYSPROP_FORCE_SERVERS", "example , Restful Server Example , " + base); System.setProperty("ca.uhn.fhir.to.TesterConfig_SYSPROP_FORCE_SERVERS", "example , Restful Server Example , " + base);
WebAppContext root = new WebAppContext(); WebAppContext root = new WebAppContext();
root.setAllowDuplicateFragmentNames(true);
root.setWar("file:../restful-server-example/target/restful-server-example.war"); root.setWar("file:../restful-server-example/target/restful-server-example.war");
root.setContextPath("/"); root.setContextPath("/");
root.setAttribute(WebAppContext.BASETEMPDIR, "target/tempextrtact"); root.setAttribute(WebAppContext.BASETEMPDIR, "target/tempextrtact");