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

36 lines
2.7 KiB
Bash
Raw Normal View History

Merge in HAPI 3.0.0 working branch! Squashed commit of the following: commit 12f89a423a1691fdbc360706fd94a03bd9144d17 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 14:38:51 2017 -0400 Minimize validation resources commit f6868cce5c73b34d5ecd53bf1a220fdccd6b4e09 Merge: 3b80779fd3 1e158311d8 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 14:05:34 2017 -0400 Forward port fix for #710 Merge branch 'master' into hapi3_refactor commit 3b80779fd3905cbf5322e6973334eb0ecb3d8426 Merge: 1f534985e8 356d9acaf7 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 12:31:09 2017 -0400 Forward port #705, #708, and #710 Merge branch 'master' into hapi3_refactor commit 1f534985e8106347d9cc9da2dd8145fdd869547f Merge: 7c39a47852 dedd3d635b Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 10:52:59 2017 -0400 Forward port #695 Merge branch 'master' into hapi3_refactor commit 7c39a47852142bee398101120678217ab0917c7e Merge: e0ffb84d21 6efafe62f1 Author: James <jamesagnew@gmail.com> Date: Sun Aug 13 09:53:17 2017 -0400 Forward port #688 Merge branch 'master' into hapi3_refactor commit e0ffb84d2129c209ccffc2611038592f37dddfd2 Merge: 52388c11c1 d19b00ff09 Author: James <jamesagnew@gmail.com> Date: Sat Aug 12 14:59:46 2017 -0400 Merge branch 'master' into hapi3_refactor commit 52388c11c17cf038591244548f2a592f6b655cee Author: James <jamesagnew@gmail.com> Date: Sat Aug 12 06:21:46 2017 -0400 Cleanup commit 209752cd638266b39574ae11c5989b624d5e85d3 Author: James <jamesagnew@gmail.com> Date: Thu Aug 10 11:18:19 2017 -0400 Fix tests commit 4543408dc8d63b5b9682a275e261d3168cdc2196 Author: James <jamesagnew@gmail.com> Date: Sat Aug 5 06:55:50 2017 -0400 Fix a potential deadlock commit ee360f537692672df473f94dae75c176b2287415 Author: James <jamesagnew@gmail.com> Date: Sat Aug 5 06:22:06 2017 -0400 Add R4 code to CLI commit 1a95ba3b6529afdaf81232b82cc303718c0187d6 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Aug 3 06:14:01 2017 -0400 More cleanup commit f0d88026817296edaa65132accd67d0c8ad8088c Author: James <jamesagnew@gmail.com> Date: Wed Aug 2 11:27:43 2017 -0400 Tests are working! commit a4cbda357e8e7d024f24e3ee9a660b5366983ca1 Author: James Agnew <jamesagnew@gmail.com> Date: Wed Aug 2 10:42:04 2017 -0400 Connection handling cleanup for new tests commit 0e2cecfbd0d7a546444a66e8411600040fd9a17b Author: James Agnew <jamesagnew@gmail.com> Date: Wed Aug 2 10:16:28 2017 -0400 Clean up R4 JPA tests commit 40317a650d72c86e2529d5179cffe63399301de5 Author: James <jamesagnew@gmail.com> Date: Wed Aug 2 09:12:38 2017 -0400 Work on R4 for JPA server commit e7f8f8c30d72ed30d739979964db38d41c5baec1 Author: James <jamesagnew@gmail.com> Date: Tue Aug 1 20:43:47 2017 -0400 More work on porting tests commit 43c9003258696ab33e7bb335e882ab1c66fb61aa Author: James <jamesagnew@gmail.com> Date: Tue Aug 1 07:09:29 2017 -0400 Work on porting DSTU1 tests commit 602857f1e26a69a2284e176b5e44a860d9b828ff Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 22:34:08 2017 -0400 More work on bring unit tests up to date commit e326a7b0cdb8368009119bba41886838a973e03e Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 17:36:38 2017 -0400 Credit for #686 and forward port the fix to R4 validator commit 96543c3992adcb406df3c8899dab79cf4bd5b4b4 Merge: 3fb75aa61a 9901b802c4 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 31 17:12:33 2017 -0400 Merge branch 'master' into hapi3_refactor commit 3fb75aa61ad29d9f3876a1c30c912627486147af Author: James <jamesagnew@gmail.com> Date: Mon Jul 31 15:21:30 2017 -0400 More work on cleanup commit b02fbb6804127e77c61c4792eefd9fc0d23d63d0 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 22:11:07 2017 -0400 Work on porting STU1 tests commit 1ae37b0db3929ea4f37955adf8f026e33ccf43b2 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 20:56:10 2017 -0400 Try to get coverage report working commit 72b88849b30a94a9ff08d3a1ab50a05b2acbdfdd Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 20:27:02 2017 -0400 Fix android tests commit e5f6c35aeab8bbc056870a038e1862181049a020 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 19:31:18 2017 -0400 More work on getting legacy code cleaned up commit 0b513b0845a082b5c20b0033dfab4e29f5e4a934 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 18:41:13 2017 -0400 Continue work on removing deprecated API commit defea69aa38a2e0f4137ed9c8527956872ff70bf Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 17:10:01 2017 -0400 More cleanup of legacy code commit 9ae7295705cb58f5edcf7ee1259f023cbbe2fe51 Author: James <jamesagnew@gmail.com> Date: Sun Jul 30 07:11:45 2017 -0400 More cleanup of legacy code commit ebd3eeb5ee793cf5805cc726db353f3def35ab00 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jul 30 06:43:25 2017 -0400 More work on removing legacy code commit 92224c2532faf70171473d64429c3ceaf3e3406c Author: James <jamesagnew@gmail.com> Date: Sat Jul 29 18:44:06 2017 -0400 Remove DSTU1 Bundle commit c52cacf71bae3f5c02ffae03881c21de1f3aba22 Author: James <jamesagnew@gmail.com> Date: Sat Jul 29 14:27:42 2017 -0400 Now compiling commit b405e51773baf4ab3a3c387458cdc59541394cd1 Merge: c3ddf04e25 cb2cea54d7 Author: James Agnew <jamesagnew@gmail.com> Date: Fri Jul 28 06:21:02 2017 -0400 Merge branch 'master' into hapi3_refactor commit c3ddf04e2598b8d6214975ab0ae795f850396811 Author: James <jamesagnew@gmail.com> Date: Thu Jul 27 11:06:06 2017 -0400 Sync R4 releases in commit b13333c3c03ddb9a5061c3b22bf011f4592104f8 Author: James <jamesagnew@gmail.com> Date: Fri Jul 14 05:52:33 2017 -0400 JPA server is now able to handle placeholder IDs (e.g. urn:uuid:00....000) being used in Bundle.entry.request.url as a part of the conditional URL within transactions. commit 2e60ff7521b42890a32b97c2dda88ab233f5c91e Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 20:02:46 2017 -0400 Fix imports commit a92ace2e0dac6e24f6dada53bf97d03861fd21a1 Merge: 3196db96d1 1a6b3ea867 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 12:02:27 2017 -0400 Merge branch 'master' into hapi3_refactor commit 3196db96d1c485310e746833df59c0e010b5b161 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 13 11:48:10 2017 -0400 Don't add false paging link to request commit bd4e1d338855a664045caa271d41616aed973a4d Author: James <jamesagnew@gmail.com> Date: Sun Jul 9 21:32:16 2017 -0400 Finally building correctly! commit 6464ce9304703cb3c5ecc58491282ddacc900853 Author: James <jamesagnew@gmail.com> Date: Sun Jul 9 16:38:28 2017 -0400 Work on refactor commit 0059f2e48e9d7c812c1d42a57c5b6059814f5155 Author: James <jamesagnew@gmail.com> Date: Sat Jul 8 07:16:20 2017 -0400 Keep working on refactor commit 6c2e87e8cc19863a811c11623d1c878c8b48f031 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 22:35:13 2017 -0400 Lots of work on refactor commit 11cab975047a0c28190e6533074fd3f11ddde240 Merge: 34ec6b8807 6c47bd4c51 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 21:43:57 2017 -0400 Merge branch 'master' into hapi3_refactor commit 34ec6b8807946aa6c97f0b5581dca9bd5f7b7a3e Merge: f8e647511b c520e60ac1 Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 21:43:49 2017 -0400 Merge branch 'hapi3_refactor' of github.com:jamesagnew/hapi-fhir into hapi3_refactor commit f8e647511b4a82e7fde71a8850b8800e3d698b1f Author: James Agnew <jamesagnew@gmail.com> Date: Thu Jul 6 18:46:55 2017 -0400 Work on hapi3 changes commit c520e60ac1198f340cfb9090a7a33f91aa2d1e61 Author: James <jamesagnew@gmail.com> Date: Wed Jul 5 08:08:40 2017 -0400 Keep working on refactor commit f1d2ee90926f7db900a5b3b4ab9a8948d18e49f2 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 3 22:10:59 2017 -0400 Continue refactor for HAPI 3 commit 9281ccafc32354222932c5a9f5ee8b0f206ebc05 Merge: ea1264cd8e 294d080bd3 Author: James Agnew <jamesagnew@gmail.com> Date: Mon Jul 3 20:34:16 2017 -0400 Merge branch 'master' into hapi3_refactor commit ea1264cd8e9b8c5297d218e91cf14bd48d0a92c7 Author: James <jamesagnew@gmail.com> Date: Wed Jun 28 10:26:01 2017 -0400 Continue work on refactor commit fbe2f98a0238f3d4e065db4550dd2ef1b460c0d8 Merge: b2bef47100 0a4dcc32ec Author: James <jamesagnew@gmail.com> Date: Wed Jun 28 06:21:22 2017 -0400 Merge branch 'master' into hapi3_refactor commit b2bef47100370e1248834523d73a630950032d7a Author: James <jamesagnew@gmail.com> Date: Tue Jun 27 21:13:23 2017 -0400 Work on refactor commit 8f76e4e46385daa9ce3442e2d9342453ce373ba3 Author: James Agnew <jamesagnew@gmail.com> Date: Sun Jun 25 21:55:35 2017 -0400 Lots of work on refactoring
2017-08-13 14:39:47 -04:00
#!/bin/bash
# RI Utilities
cp -R /home/james/workspace/fhir/trunk/build/implementations/java/org.hl7.fhir.utilities/src/org hapi-fhir-utilities/src/main/java/
cp -R ./hapi-fhir-utilities/src/main/java/org/hl7/fhir/utilities/tests/* ./hapi-fhir-utilities/src/test/java/org/hl7/fhir/utilities/tests/
rm -R ./hapi-fhir-utilities/src/main/java/org/hl7/fhir/utilities/tests
# RI Validation
cp -R /home/james/workspace/fhir/trunk/build/implementations/java/org.hl7.fhir.validation/src/org hapi-fhir-validation/src/main/java/
cp -R ./hapi-fhir-validation/src/main/java/org/hl7/fhir/validation/dstu3/tests/* ./hapi-fhir-validation/src/test/java/org/hl7/fhir/validation/dstu3/tests/
rm -R ./hapi-fhir-validation/src/main/java/org/hl7/fhir/validation/dstu3/tests
# Converter
cp -fvR ~/workspace/fhir/trunk/build/implementations/java/org.hl7.fhir.convertors/src/org ./hapi-fhir/hapi-fhir-converter/src/main/java/
# RI R4 Model
cp -R /home/james/workspace/fhir/trunk/build/implementations/java/org.hl7.fhir.r4/src/org hapi-fhir-structures-r4/src/main/java/
cp -R ./hapi-fhir-structures-r4/src/main/java/org/hl7/fhir/r4/test/* hapi-fhir-structures-r4/src/test/java/org/hl7/fhir/r4/test/
rm -R ./hapi-fhir-structures-r4/src/main/java/org/hl7/fhir/r4/test
# Resource Spreadsheets
mkdir -p hapi-tinder-plugin/src/main/resources/res/r4/
rm hapi-tinder-plugin/src/main/resources/res/r4/*.xml; cp ~/workspace/fhir/trunk/build/source/*/*-spreadsheet.xml hapi-tinder-plugin/src/main/resources/res/r4/; rm hapi-tinder-plugin/src/main/resources/res/r4/*-*-*.xml
# Copy Validation Resources
cp ~/workspace/fhir/trunk/build/publish/*.sch hapi-fhir-validation-resources-r4/src/main/resources/org/hl7/fhir/instance/model/r4/schema/
cp ~/workspace/fhir/trunk/build/publish/fhir-single.xsd hapi-fhir-validation-resources-r4/src/main/resources/org/hl7/fhir/instance/model/r4/schema/
cp ~/workspace/fhir/trunk/build/publish/fhir-xhtml.xsd hapi-fhir-validation-resources-r4/src/main/resources/org/hl7/fhir/instance/model/r4/schema/
cp ~/workspace/fhir/trunk/build/publish/xml.xsd hapi-fhir-validation-resources-r4/src/main/resources/org/hl7/fhir/instance/model/r4/schema/
cp ~/workspace/fhir/trunk/build/publish/profiles-*.xml hapi-fhir-validation-resources-r4/src/main/resources/org/hl7/fhir/instance/model/r4/profile/
cp ~/workspace/fhir/trunk/build/publish/v2-tables.xml hapi-fhir-validation-resources-r4/src/main/resources/org/hl7/fhir/instance/model/r4/valueset/
cp ~/workspace/fhir/trunk/build/publish/v3-codesystems.xml hapi-fhir-validation-resources-r4/src/main/resources/org/hl7/fhir/instance/model/r4/valueset/
cp ~/workspace/fhir/trunk/build/publish/valuesets.xml hapi-fhir-validation-resources-r4/src/main/resources/org/hl7/fhir/instance/model/r4/valueset/