SHRINE
  1. SHRINE

shrine

Public
  1. SHRINE
  2. shrine

All Branches Graph  

        
AuthorCommitMessageCommit dateBuilds
David WalendDavid Walend
101e408c993Merge pull request #33 in SHRINE/shrine from feature/SHRINE-2148-define-the-statuses-to-be-used to release/1.23.5 * ...
David WalendDavid Walend
4355343779cYifan's review comments SHRINE-2148 and company
Yifan XingYifan Xing
91813248ee8Merge pull request #32 in SHRINE/shrine from ~YXING/shrine:blocking to release/1.23.5 * commit '1209317f9720422744da...
bendcarmenbendcarmen
9acd456a2f8compiled changes
bendcarmenbendcarmen
045520c3c64Removed the 5 seceond delay before re-polling, also replaced the RUNNING status with SUBMITTED status
David WalendDavid Walend
4a410adc392Merge branch 'release/1.23.5' into feature/SHRINE-2148-define-the-statuses-to-be-used
yifan xingyifan xing
1209317f972deleted extra blocking
bendcarmenbendcarmen
35fbdbf4ba4Bumped version from 1.23.5.2-SNAPSHOT to 1.23.5.3-SNAPSHOT
David WalendDavid Walend
5161c0b3513todo sweep at the end of SHRINE-2148
David WalendDavid Walend
785f3326339Created json envelope for all SHRINE 1.23 messages. Filled in isCompleted. Added two new states for query results, an...
bendcarmenbendcarmen
e54d1342f2ecode cleanup
bendcarmenbendcarmen
856f057c751Fix of SHRINE-2202
bendcarmenbendcarmen
6a59be26cfcFix of SHRINE-2205
David WalendDavid Walend
e6b3e31849eEnvelope for existing messages for SHRINE-2177
bendcarmenbendcarmen
462e0e35390Fix of SHRINE-2224
bendcarmenbendcarmen
3f4474c5252Fix of SHRINE-2227
bendcarmenbendcarmen
68686a80357Fix of SHRINE-2206
David WalendDavid Walend
1055499b8d4Merge branch 'release/1.23.5' into feature/SHRINE-2148-define-the-statuses-to-be-used
David WalendDavid Walend
d5100ce6fffPlans for statuses in SHRINE-2148 and the start of envelopes for SHRINE-2177
bendcarmenbendcarmen
e9aa58f63efFix of SHRINE-2219
bendcarmenbendcarmen
7639f3cd380Fix of SHRINE-22223
bendcarmenbendcarmen
fef2a2f814afix of SHRINE-2194
bendcarmenbendcarmen
e5228360392Fix of SHRINE-2207
bendcarmenbendcarmen
eca09173784Fix of SHRINE-2209
bendcarmenbendcarmen
bf78180c9f2Fixed error message pop-up
bendcarmenbendcarmen
465a002ef1bQuick Fix
bendcarmenbendcarmen
ad10d75c130Merge branch 'release/1.23.5' of https://open.med.harvard.edu/stash/scm/shrine/shrine into release/1.23.5
bendcarmenbendcarmen
da8e1880880Test of new error message
David WalendDavid Walend
2d1da03e78dMerge pull request #30 in SHRINE/shrine from feature/SHRINE-2195-use-a-pool-of-actors-in-the-dashboard to release/1.2...
David WalendDavid Walend
477335f26e2Merge pull request #29 in SHRINE/shrine from feature/SHRINE-2184-start-messaging-later to release/1.23.5 At last! Do...
David WalendDavid Walend
41b5bfe8187Added an actor pool to the dashboard. SHRINE-2195
David WalendDavid Walend
01304bf0c75Merge branch 'release/1.23.5' into feature/SHRINE-2184-start-messaging-later
bendcarmenbendcarmen
d81a0716ff3bumped version from 1.23.5.1-SNAPSHOT to 1.23.5.2-SNAPSHOT
David WalendDavid Walend
d646aebe6ddFix for SHRINE-2149 - no longer writing the hub's web API reply to the QEP's database
bendcarmenbendcarmen
bef74fe1be8Bumped the develop version from 1.23.5.1-SNAPSHOT to 1.24.1.1-SNAPSHOT
David WalendDavid Walend
f96dcf168c9Merged with develop
David WalendDavid Walend
279477e3ac9Todo sweep
David WalendDavid Walend
d0760f53316Got messages flowing for SHRINE-2120 at last. Still some falling action and cleanup for Tuesday.
bendcarmenbendcarmen
d55155bbc93Fix of CSV export for Firefox
bendcarmenbendcarmen
7f2647d2969Fix of SHRINE-2201
bendcarmenbendcarmen
5ca5a37922aFix of SHRINE-2199
David WalendDavid Walend
5b4194f2a7aAdded contents to the message json for SHRINE-2120
Yifan XingYifan Xing
133690d7617Merge pull request #27 in SHRINE/shrine from ~YXING/shrine:vagrant to develop * commit 'cb3d0a42b4c40ac1d5d005753a64...
yifan xingyifan xing
cb3d0a42b4ccleaned up unnecessary comments
David WalendDavid Walend
a62acb63d08Lots of debug log statements to track down a fix for SHRINE-2120
David WalendDavid Walend
01b3b688c69Got things working again after the merge, rework of QepReceiver, some handling of http status codes in the hornetq cl...
yifan xingyifan xing
7315da34d6eremoved comments
yifan xingyifan xing
8880a8df739implemented context listerner for shutting down hornetq
yifan xingyifan xing
3a9c207cfb5added shrine-hub back
yifan xingyifan xing
447d3790577renamed shrine-cell.war to shrine.war
yifan xingyifan xing
e9142cd6b3bimplemented return value check
David WalendDavid Walend
21d872932e0Merge branch 'develop' into feature/SHRINE-2184-start-messaging-later
David WalendDavid Walend
3fc42fbd05aCleaned up some logging for SHRINE-2120
bendcarmenbendcarmen
5e63982827fMerge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into develop
David WalendDavid Walend
844fd945707Got messages flowing. Added a round-robbin pool of akka actors to handle multiple blocking connections. Lots of error...
bendcarmenbendcarmen
4cfc8be76a9Logic for resetting the check boxes
bendcarmenbendcarmen
75e5f49dd13Separated breakdowns into 2 columns, Sorted Breakdowns Alphabetically, Changed -1 to 0 for result counts, used the te...
Yifan XingYifan Xing
f3d6d1faf56Merge pull request #23 in SHRINE/shrine from ~YXING/shrine:config to develop * commit '987290cd937e327dd5e5f0e8c6873...
yifan xingyifan xing
987290cd937changed default config to be false and modified tests to pass, added ProblemHandler in test config file to avoid exce...
David WalendDavid Walend
0dddb2fd500First attempt at sending messages for SHRINE-2120 and SHRINE-2121
yifan xingyifan xing
47bf2123637clean up
yifan xingyifan xing
aa151983081implemented code reviews: created and logged a Problem
yifan xingyifan xing
95eddaa0276used if/else instead of require, implemented unit test for configuration
yifan xingyifan xing
85175be6ee1implemented momRoute configuration requirement, haven't found a good way to test
yifan xingyifan xing
51135cbe872added enable property
yifan xingyifan xing
0a2c1a6679cimplementing config momRoute
yifan xingyifan xing
b54ac2a7f93added default hornetqmomwebapi config
Yifan XingYifan Xing
dc40ff5cc2bMerge pull request #28 in SHRINE/shrine from ~YXING/shrine:detach to develop * commit '21a241c635f7b8fa7f2b6f1fac054...
yifan xingyifan xing
21a241c635fcleaned up unnecessary blocking in qepService
Yifan XingYifan Xing
72605fffea9Merge pull request #26 in SHRINE/shrine from ~YXING/shrine:detach to develop * commit '88ae2424005df29a7690d32f9687b...
yifan xingyifan xing
88ae2424005cleaned up unnecessary blocking
David WalendDavid Walend
77f1e73af4cMerged from develop
Yifan XingYifan Xing
544e437d7b9Merge pull request #25 in SHRINE/shrine from ~YXING/shrine:usetry to develop * commit 'f505a5336b7b449dbd41c4e2178ac...
yifan xingyifan xing
f505a5336b7stop returns Unit instead of Try[Unit]
David WalendDavid Walend
ad6fddd3c32Merge branch 'develop' into feature/SHRINE-2184-start-messaging-later
David WalendDavid Walend
ae83166cd55Starting the QepReceiver on a daemon thread, using a configurable MessageQueueService. SHRINE-2184
yifan xingyifan xing
db6c00e41adSHRINE-2182: send message as HttpEntity, SHRINE-2181: clean up human readable names for queue names
yifan xingyifan xing
64f4d14d0ceimplemented code review comments
bendcarmenbendcarmen
a3ada9038e7Possible solution for populating the query builder by network id
bendcarmenbendcarmen
98383dfbb46Fix of mis-named variable
bendcarmenbendcarmen
88e743af3b9Removed node sort
bendcarmenbendcarmen
1f9622dc1acRemoved nested Promise
bendcarmenbendcarmen
44776814cc0Logging network id
yifan xingyifan xing
0019c0a67efimplemented code reviews
bendcarmenbendcarmen
70a30b5a11dAnother attempt at right click and running previous queries
yifan xingyifan xing
465c4f43d05implemented code review comments
bendcarmenbendcarmen
7d8d4e5d974Fix of parsing network id handler
bendcarmenbendcarmen
310aa7bb99ePossible solution for running a previous query in the status viewer
bendcarmenbendcarmen
d8ba09c7a94Fixes to UI and right click to run infrastructure. Still need to marshall the calls to the server by rejecting any p...
bendcarmenbendcarmen
ce238252e22Updates for UI to be in line with wireframe
bendcarmenbendcarmen
a780db3cb62Fix of logic for determining if a query has completed
yifan xingyifan xing
3b94865772aimplemented more tests for LocalHornetQMom SHRINE-2156, and HornetQMomWebApi SHRINE-2158
yifan xingyifan xing
7bd368308cffixed conflicts
yifan xingyifan xing
5f23b0ce384the libraries return Try[] and the api handles success and failure
yifan xingyifan xing
018c4a7525duse Try and for-comprehension for all the methods that talk with HornetQ server
yifan xingyifan xing
2cad61a2fe6added one more blocking in stewardDatabase
yifan xingyifan xing
df369c51a0eadded detach and blocking
bendcarmenbendcarmen
e5a2fc90979Fix of click event attached to parent item instead of intended child
bendcarmenbendcarmen
14a8d28ffedWorking version of the csv export
yifan xingyifan xing
4414cf519e3added detach() and blocking
bendcarmenbendcarmen
0c6aea08969Working logic for formatting data for export
yifan xingyifan xing
ccb5cee04e9use Try and for-comprehension for all the methods that talk with HornetQ server
yifan xingyifan xing
2108fa35f8amodified pom files for fixing dependencies
Yifan XingYifan Xing
df5137bb039Merge pull request #21 in SHRINE/shrine from ~YXING/shrine:organize to develop * commit 'f7e719286f88b15fe1ef8bbbd54...
yifan xingyifan xing
f7e719286f8added todos for extracting actor system, deleted unsued config files
bendcarmenbendcarmen
748c6969aa8forgot to check in updated query-status.model.js
bendcarmenbendcarmen
e2105c90478Hopefully a fix for polling on my end
yifan xingyifan xing
bcc2df45e02re-organized client, api, and the trait
yifan xingyifan xing
a1ab506fde7cleaned up unused dependencies
David WalendDavid Walend
286777aea8bFix for SHRINE-2179. spray.can.server.request-timeout is a Duration string, not a Long.
David WalendDavid Walend
bee70d77017Merge pull request #22 in SHRINE/shrine from feature/SHRINE-2174-add-nodeid-to-runqueryrequest to develop * commit '...
yifan xingyifan xing
88046a6b40bremoved mom package, updated pom files and dependencies
David WalendDavid Walend
9abf632844fClean up some neglected code for SHRINE-2120
David WalendDavid Walend
eee58e61940Clean up some neglected code for SHRINE-2120
David WalendDavid Walend
f604a1f2b22Rename to save some confusion for SHRINE-2120
David WalendDavid Walend
a1087e6ab11Got the name of the QEP node to ride in on the RunQueryRequest for SHRINE-2174.
bendcarmenbendcarmen
027c265e646Addition of parameters for requesting query by id/version/timeout
yifan xingyifan xing
46269b9a5afreorganized mom package
David WalendDavid Walend
d86c95a0ebfPut NodeId into the QEP and into every RunQueryRequest it sends for SHRINE-2174
David WalendDavid Walend
203eb22a31aLots of comments to support SHRINE-2120 and SHRINE-2174
yifan xingyifan xing
e3c1d8bd0fdfixed build failure by adding system in hornetQActorSystem
yifan xingyifan xing
54f8ea09dc5commented out failed tests, created a jira to fix them->TODO
yifan xingyifan xing
e61b22f18a0fixed build failure by adding system in hornetQActorSystem
Yifan XingYifan Xing
3588b37d9efMerge pull request #18 in SHRINE/shrine from ~YXING/shrine:clientMom to develop * commit 'f67bba0174f09290f939729f03...
yifan xingyifan xing
f67bba0174fclean up test
yifan xingyifan xing
33ff9386ca4used Try for-comprehension in hornetQWebClient
David WalendDavid Walend
53aedb904d5Some simple review comments for SHRINE-2145
David WalendDavid Walend
1f26074be1dMerge pull request #19 in SHRINE/shrine from feature/SHRINE-2145-add-an-optional-changes-since to develop * commit '...
bendcarmenbendcarmen
dbe1ae9cca3Fix of layout bugs, potential fix of Run Query button bug
bendcarmenbendcarmen
c87d000632cFix of Run/Cancel query button text bug
yifan xingyifan xing
b7bc8f69e3aimplemented some of the code reviews
bendcarmenbendcarmen
bf9feb4a5f7Fix of incorrect statuses at top of query status
David WalendDavid Walend
659b4c45c60Merge pull request #20 in SHRINE/shrine from feature/SHRINE-2162-add-a-config-parameter-to-the to develop * commit '...
yifan xingyifan xing
ee67d4b1f14Implemented Scala script to test HornetQMomWebClient
yifan xingyifan xing
4e60630de9eImplemented Scala script to test HornetQMomWebClient
David WalendDavid Walend
c9af021cdeccannonical shrine.conf changes for SHRINE-2167
David WalendDavid Walend
5ec683de927Couple of changes I decided to hold on to while testing SHRINE-2162
bendcarmenbendcarmen
946ac0a67daFix of unresponsiveness in Query Status
David WalendDavid Walend
bab2dd2d4a5Added a shrine.adapter.delayResponse config paramter to support SHRINE-2162
David WalendDavid Walend
eac4b3a8a8aMerging for SHRINE-2145
bendcarmenbendcarmen
4d2b27ca660fix of bug introduced by refactor
David WalendDavid Walend
6c63fbebc7bAdded some debug logging in case we need to diagnose in the field.
David WalendDavid Walend
ddea3cda4c1Some improved error messages for SHRINE-2145
David WalendDavid Walend
c9971aae285Added some logic to be sure that (if everything is working) spray won't give up on the request before the timeout res...
yifan xingyifan xing
0f397d5f865implemented code review comments
David WalendDavid Walend
49e53dfd49aAdded a scheduled cleanup of the notification Map every 5 minutes. SHRINE-2145
bendcarmenbendcarmen
eca967fb63bAdded logic for dev environment
bendcarmenbendcarmen
1485b76018elatest version
David WalendDavid Walend
b1977c6de01Extracted QepQueryDbChangeNotifier into a singleton where other parts of SHRINE can trigger changes for SHRINE-2145
David WalendDavid Walend
83caf38d2e9Added version and isComplete fields to ResultsRow for SHRINE-2145
David WalendDavid Walend
c014fca3081Yifan is right. map...getOrElse does put all the error bits in the same spot.
David WalendDavid Walend
5cbe1020a73Got rid of Unit vs method name warning for SHRINE-2145
David WalendDavid Walend
91657c900faSwitched to timeoutSeconds for SHRINE-2145
David WalendDavid Walend
dff4c1dc168Changed Promises to be Promise[Unit] for identifying requests for SHRINE-2145
David WalendDavid Walend
5040afd83a2Switched to UUIDs for identifying requests for SHRINE-2145
David WalendDavid Walend
e3dff6497d0Test of trigger to change data for SHRINE-2145
David WalendDavid Walend
f413d3a49daAllow trigger to change data, plus some updated comments for SHRINE-2145
bendcarmenbendcarmen
5eff32db4c5Changed folder structure
David WalendDavid Walend
7d20a4514aaMaking the right Promises, and fulfilling one of them. SHRINE-2145
David WalendDavid Walend
dd75262b267A little code rearranging for SHRINE-2145
David WalendDavid Walend
8f5edb5081bGot the delayed-to-timeout path working for SHRINE-2145
David WalendDavid Walend
ede3d6f8636Added a test to make sure a result came back eventually for SHRINE-2145
yifan xingyifan xing
6ad80ab1281implemented client side of hornetQMom api
David WalendDavid Walend
7f4c8d21988Concurrent structures for SHRINE-2145
David WalendDavid Walend
3a4f43aa31cNotes for for SHRINE-2145
David WalendDavid Walend
47f7e6d0bcaAdded a detatch() for SHRINE-2145
bendcarmenbendcarmen
c430dda9078Fix of minor bug
David WalendDavid Walend
81859ca9c0eFactored out respondOrWait for SHRINE-2145
bendcarmenbendcarmen
617f2266825Added status column
Yifan XingYifan Xing
aad67530a0aMerge pull request #13 in SHRINE/shrine from ~YXING/shrine:mom to develop SHRINE-2119: Implemented Web API for Horne...
yifan xingyifan xing
05fe186c008implemented review comments
yifan xingyifan xing
a0b5b74b4cfclean up api test
yifan xingyifan xing
9f9d5365452merging pr with develop
yifan xingyifan xing
b0537f79139merged Dave's pr-2155 with HornetQMom
yifan xingyifan xing
eaab1f9542eplugged hronetQMomWebApi in MetaDataService
yifan xingyifan xing
5bc905daa6bserialized message to json
yifan xingyifan xing
ee08784a03fmodified many methods in HornetQMomWebApi
yifan xingyifan xing
78eba9e74c8implementing code reviews
yifan xingyifan xing
4f67af37795implemented unit tests for RemoteHornetQMom
yifan xingyifan xing
666a741ede0implementing unit tests for RemoteHornetQMom
yifan xingyifan xing
ce6f4bf6798implementing unit tests for remoteHornetQMom
yifan xingyifan xing
b24df900ac5Implementing remoteHornetQMom
yifan xingyifan xing
83c3ef2970fimplemented unit tests for RemoteHornetQMom
yifan xingyifan xing
04d323ccc81implementing unit tests for RemoteHornetQMom
yifan xingyifan xing
de691509e77implementing unit tests for remoteHornetQMom
yifan xingyifan xing
4d22f2b5f81cleaning conflicts in HornetQMom
David WalendDavid Walend
32b569f1189Separated out the logical decision about if it should respond right now or wait and see if something happens for SHRI...
David WalendDavid Walend
ecc5950fa3dIsolating the ResultsRow for SHRINE-2145
Next →