SHRINE
  1. SHRINE

shrine

Public
  1. SHRINE
  2. shrine

All Branches Graph  

        
AuthorCommitMessageCommit dateBuilds
David WalendDavid Walend
e2203220561Pull request #1368: Feature/SHRINE2020 1352 Merge in SHRINE/shrine from feature/SHRINE2020-1352 to develop * commit...
XavXav
ebf49e3e911rename aggregateOperator* to eventAnchor*
XavXav
32f6193cca4rename fromStartOrEnd to boundary
XavXav
56cbad26366rename fromStartOrEnd to boundary
XavXav
fdf4dfeff95Merge branch 'feature/SHRINE2020-1262' into feature/SHRINE2020-1263
XavXav
f4bf7b453c4Merge branch 'develop' into feature/SHRINE2020-1262
David WalendDavid Walend
0ff0b5fe071Pull request #1365: Feature/SHRINE2020 1350 Merge in SHRINE/shrine from feature/SHRINE2020-1350 to develop * commit...
XavXav
3aed61581ddminor clean-up
XavXav
39cd0121fd0merge 1262 (and hence recent changes to 1350) with conflicts
XavXav
2d99cb6073fresolve merge conflicts (merging 1350 into 1262)
dwalenddwalend
e54c7382c57Cleanup for SHRINE2020-1360
XavXav
8e3260be725add "Last" option to Event Anchor drop-down and b/e
dwalenddwalend
e0c5db99597Rename and new json encoder for query and result states for SHRINE2020-1360
dwalenddwalend
57264a77574Big move before redefining the json for SHRINE2020-1360
dwalenddwalend
0d601a9b334Last easy case object update I see for SHRINE2020-1360
dwalenddwalend
5be0593fff8Merged
dwalenddwalend
104424d5c9aAnupama's words for SHRINE2020-1352
dwalenddwalend
d305798ca74Merging
dwalenddwalend
cc0b6507004Renamed BookEnd to EventBoundary for SHRINE2020-1350
dwalenddwalend
b997b720589A first pass of SHRINE2020-1360 - better json for case objects
XavXav
7d59336260eMerge branch 'feature/SHRINE2020-1350' into feature/SHRINE2020-1262
dwalenddwalend
febbb977a30Merge branch 'feature/SHRINE2020-1350' into feature/SHRINE2020-1352
dwalenddwalend
8fcfe3666cfMerge remote-tracking branch 'origin/develop' into feature/SHRINE2020-1350
dwalenddwalend
82e7a48edfdMix of library dependencies was not playing nice with case objects for SHRINE2020-1350
David WalendDavid Walend
fa832150ed1Pull request #1369: Updated the help link and wiki page for SHRINE 4.2 for SHRINE2020-1346 Merge in SHRINE/shrine fr...
XavXav
e55a7ce652badd unit test for time link with book ends
XavXav
d8525cf31a7Merge 1350 into this branch; correct query sent to b/e, but b/e times out
XavXav
1cb3946e022Modify the query data structure sent by the f/e to the b/e, which fixes the communication bug between the two
XavXav
30cecd9fa95take a step back to make the f/e work, without fromStartOrEnd object. Breaks the b/e because of that change.
XavXav
3ed9bcb61d7add BookEnd instance as a member of EventConstraint; make bookends non-Optional; update unit tests to handle book-ends,
dwalenddwalend
22008147fe8Nicer json for the new field for SHRINE2020-1352
dwalenddwalend
d81e9a0e8a3merging
dwalenddwalend
9ddc9932607Found a very clean way to have case objects in the protocol for BookEnds for SHRINE2020-1350
dwalenddwalend
d77f9473319Updated the help link and wiki page for SHRINE 4.2 for SHRINE2020-1346
XavXav
0bd2251caadclean up js code
dwalenddwalend
8949afc3669Getting things lined up just right with the bookend branch for SHRINE2020-1352
dwalenddwalend
447554ddb1bmerging
XavXav
10344188c1eMerge branch 'feature/SHRINE2020-1350' into feature/SHRINE2020-1262
dwalenddwalend
71ebddfaf80Needs an example for the javascript end SHRINE2020-1350
Ansible DeployAnsible Deploy
bdbb15a0e4fMerge release branch release/4.1.0 into master.
Ansible DeployAnsible Deploy
e21ee7bb314Update POMs with release version 4.1.0.
dwalenddwalend
5bc049cd170I think I've got a full pass for SHRINE2020-1352 caveat a good name for this feature
XavXav
e00f92e36b3made new drop-downs stateful
dwalenddwalend
590c2882ad4Missed an import for SHRINE2020-1352
dwalenddwalend
393f9ca3efbPlanned work for SHRINE2020-1352
dwalenddwalend
8bd692323a6Merge remote-tracking branch 'origin/develop' into feature/SHRINE2020-1350
dwalenddwalend
ff461cbc6bbMerge remote-tracking branch 'origin/develop' into feature/SHRINE2020-1352
David WalendDavid Walend
d0fa05f5ed2Pull request #1366: Feature/SHRINE2020 1353 Merge in SHRINE/shrine from feature/SHRINE2020-1353 to develop * commit...
XavXav
a4e84fd5e06very first cut at the UI
XavXav
b96025fee46add instructions for pushing front-end and back-end code to a local docker instance
dwalenddwalend
78b85a5b9dbOne last easy upgrade and a sad note about circe for SHRINE2020-1353
dwalenddwalend
7d1f187564aMore easy library upgrades for SHRINE2020-1353
dwalenddwalend
b766f8427b7Updated maven parts for SHRINE2020-1353
XavXav
da07521426fMerge remote-tracking branch 'origin/develop' into develop
XavXav
9af24577f08modifications/fixes to README.md for docker
dwalenddwalend
3f9291523ccCleaned out some yellow flags for SHRINE2020-1350
dwalenddwalend
59e77c9ebeeMarking future work in SHRINE2020-1350
dwalenddwalend
d8f98863ec3Fixed some tests for SHRINE2020-1350
dwalenddwalend
20d15994485Intermediate check of SHRINE2020-1350
David WalendDavid Walend
0d8f7464e9fPull request #1364: More updates to jmeter tests for SHRINE2020-1148 Merge in SHRINE/shrine from SHRINE2020-1148-mor...
dwalenddwalend
383d06bd6dfNotes for how to fix SHRINE2020-1305
dwalenddwalend
324258e179eMerging
dwalenddwalend
763a6365e5fMerging
dwalenddwalend
229385a263aMore updates to jmeter tests for SHRINE2020-1148
dwalenddwalend
c3f797c4892Roll back the RC business in the pom.xml
dwalenddwalend
c4b67f1c581Move develop to shrine 4.2.0
dwalenddwalend
df03d729a9aStart the 4.1.0 release branch with RC1
dwalenddwalend
5621992c85eCleanup of found files for SHRINE2020-1334
dwalenddwalend
7bdfa51d374Initial state of shrine-dev config files for SHRINE2020-1334
David WalendDavid Walend
b5d17ec3b5dPull request #1363: For Kafka - queueusIO should only return the queues used by this shrine networks, not all the que...
David WalendDavid Walend
a975cc1f780Pull request #1362: Feature/SHRINE2020 988 Merge in SHRINE/shrine from feature/SHRINE2020-988 to develop * commit '...
dwalenddwalend
b7020ddfa84For Kafka - queueusIO should only return the queues used by this shrine networks, not all the queues in Kafka SHRINE2...
dwalenddwalend
aec11385c7eBetter logging for picking a MOM system for SHRINE2020-988
XavXav
3c976f36a6aset revision back to 4.1.0 in top-level POM file
XavXav
7d6461db235Merge branch 'develop' into sso-phase2
dwalenddwalend
f4ba50c5b25Adding the jmeter files used for SHRINE2020-988
dwalenddwalend
33f17e6284fClearing an out-dated error in the log found during SHRINE2020-988
dwalenddwalend
967d0969017merging
XavXav
cc32bfcf468remove commented-out setting in sample Tomcat config file
XavXav
fdcec03ad05Revert "Revert "remove stale @param's and @throws's from AuthorizationFilter; remove unused maven-compiler-plugin and...
XavXav
2bc3be26389Revert "remove stale @param's and @throws's from AuthorizationFilter; remove unused maven-compiler-plugin and junit d...
XavXav
f44d8a0b8a9remove stale @param's and @throws's from AuthorizationFilter; remove unused maven-compiler-plugin and junit dependency
XavXav
d8640ce3c70PR feedback : create more tickets for postponed work and include their # + summary in the code; more comments
Carl WoolfCarl Woolf
b6b96d27fd7reduce free-standing vals
Carl WoolfCarl Woolf
c64f5330770more compact biz-logic in Filter
XavXav
2cfb5b62199remove shrineSP as a config source; add JIRA ticket numbers where changes have been postponed; remove back quotes fro...
XavXav
7aa6bf80a0cadd sample config for RegexAuthorizer
XavXav
d8129449134add sample config for RegexAuthorizer
XavXav
25426800de2move RegexAuthorization class to an example folder
XavXav
74cee947c11fix bug in new AuthorizationFilter
XavXav
5d4ce684858Add comment to explain how a user is authorized from calling Authorization.AuthorizationCoordinator
XavXav
d2da84c0640rename AuthorizationService to AuthorizationCoordinator so it is not mistaken to an HTTP end-point provider
XavXav
a01774f1282rewrite the authorization filter such that there is no return within its body nor is there a 'doChain' var to keep tr...
XavXav
133c0ff50bfremove fully qualified name where not necessary; move import
Carl WoolfCarl Woolf
0d310336f77simplify innerT assignment. More-descriptive names for helpers
David WalendDavid Walend
ac81509b99dPull request #1361: Bugfix/SHRINE2020 1309 queued queries poller runs forever, for a more even load on the i2b2 CRC ...
XavXav
1ca47069d56add more comments
dwalenddwalend
2b9729d5567Logging in ShrineMomClient for SHRINE2020-1305
dwalenddwalend
b8596a6e64cLogging around runTransactionIO for SHRINE2020-1305
dwalenddwalend
2fafae21703Logging around runTransactionIO for SHRINE2020-1305
dwalenddwalend
6d726de77f8Logging around runTransactionIO for SHRINE2020-1305
XavXav
8128e8256b1make SQL for creating BW list table more universal
dwalenddwalend
ac87996de2bTry not using blocking() for the database transaction. IO.fromFuture should handle the thread pool issues well. For S...
XavXav
7a2a2a1efb5create trait for authorizers which use the black/white list attributes provided by WhiteBlackListAttrProvider
XavXav
f0b631dc4c3straggler for previous commit : simplify SQL for black/white attribute provider so as to be compatible with Oracle. (...
XavXav
17b53b31ebbsimplify SQL for black/white attribute provider so as to be compatible with Oracle. (i.e. do not use AUTO_INCREMENT)
dwalenddwalend
1ca7e66743aEven more logging to bracket SHRINE2020-1305
dwalenddwalend
5258a27f923Yet more logging in the database to bracket SHRINE2020-1305
dwalenddwalend
a787510f409Even more logging in the database to bracket SHRINE2020-1305
dwalenddwalend
17be4212d36More logging in the database to bracket SHRINE2020-1305
XavXav
0afd620746dreinstate configuration of filters in web.xml instead of annotations
dwalenddwalend
76e25fce061More logging - trying to bracket for SHRINE2020-1305
XavXav
4919e898a44reinstate configuration of filters in web.xml instead of annotations
XavXav
327c1cbc91bMerge remote-tracking branch 'origin/sso-phase2' into sso-phase2
XavXav
93770b2314freinstate configuration of filters in web.xml instead of annotations
dwalenddwalend
36c944acddeA little more logging to try to bracket SHRINE2020-1305
David WalendDavid Walend
1088580c512Pull request #1360: Added a unit test to show - for duplicated keys in a typesafe config file - last in wins - SHRINE...
dwalenddwalend
16b56c1215eFix the config and expand the default CRC QUEUED query polling interval for SHRINE2020-1309
XavXav
fbc8a635eacsimplify name and return type of AuthorizationService.isUserAuthorized(), and modify AuthorizerFilter code accordingl...
XavXav
e6c31cacb82remove wildcard import
XavXav
406710cccb8remove wildcard import
XavXav
59dd962d481add comment to top of AuthorizationFilter class
XavXav
46eb9849cd7make thrown exception class more specific
XavXav
2dd55d8532eadd comment on purpose ot AttrProviderTrait
XavXav
1e410ef8fd9move import statement to just above where it's needed. But not able to figure out which specific cases need to be imp...
XavXav
298243ba99aalready imported Config. No need for a fully qualified class name.
XavXav
9204b38eadbremove "optimistic" var, moved "unauthorizedUrl" attribute fetching to the top of the if block for clarity
XavXav
18e87045d56get rid of "var doFilter" in AuthorizationFilter
XavXav
267a80e37e0remove unneeded comment
XavXav
7c1faf83414fix authz's POM.xml
XavXav
54939cb40d0update servlet api version; make it a POM file property
XavXav
61ca4217f3brename method, add comment
XavXav
4c7de3f0ddcMerge remote-tracking branch 'origin/sso-phase2' into sso-phase2
XavXav
45b74f80c83rename method, add comment
dwalenddwalend
d72006f9170A little more cleanup of SHRINE2020-1309 before review
dwalenddwalend
49f484783fbAdded a jmeter QUEUED query test while exploring SHRINE2020-1303
Carl WoolfCarl Woolf
29681e0cfaewb-DB no longer warms up
dwalenddwalend
10fabf63259Code cleanup to let the QueuedQueriesPoller just run all the time for SHRINE2020-1309
dwalenddwalend
92cce1b92d8See if just letting the queued queries poller go is better for SHRINE2020-1303
XavXav
567b02bfaferemove a line of dead code
dwalenddwalend
785058b0d59Revert "SHRINE2020-1303 - try not running the task at all if it is already stopped" This reverts commit 10000f1335fd...
XavXav
ee32976f4e0add comment describing the REMOTE_USER header remove a line of dead code
XavXav
615f0efd26cadd comment describing what AuthorizationService does
XavXav
f57ee29b867remove "future-proofing" code; modify shrine.config.authorizer.requireAuthorization to be a boolean
XavXav
8cc7fb7e411move fully qualified names for AttrProviderTrait and AuthorizerTrait to the import statements, instead of where in th...
XavXav
b112b63353frename AuthzHttp4sResource class to AuthzHttp4sService
XavXav
e00d3799163rename AuthzHttp4sResource class to AuthzHttp4sService
XavXav
90cbe7df9e0add comments to attribute provider classes
XavXav
fcb95915d39add comments to attribute provider classes
XavXav
47cf0ede21badd comments to attribute provider classes
dwalenddwalend
10000f1335fSHRINE2020-1303 - try not running the task at all if it is already stopped
dwalenddwalend
f1a9dafa90aExperiment for SHRINE2020-1309 - just start the QueuedQueriesPoller at the beginning
XavXav
c116c341efaadd comments; clean up imports
XavXav
2d4812a6c8fMerge remote-tracking branch 'origin/sso-phase2' into sso-phase2
XavXav
b6cf138fb5fadd comments; clean up imports
dwalenddwalend
00952cc4d46Aimed perfest jmeter test at perftest
Carl WoolfCarl Woolf
fba19a3462aRevert "cleaner (no redundant comment) tag of all {reference,shrine}.conf files in source and in resulting conf" Thi...
XavXav
24d5445e7a1add documentation to attribute providers and their usage to build the complete userInfo map
XavXav
d75ed14c1f5get rid of pairNameAndMap() method in AttrProviderTrait
XavXav
f8a19c2a74fRename class to reflect that it is a trait
XavXav
ceff39a74a6use trait instead of abstract class for Attribute Providers
XavXav
1df8ace02feuse trait instead of abstract class for Attribute Providers
XavXav
566173f6376use trait instead of abstract class
XavXav
5d816a9075ause trait instead of abstract class
XavXav
179aa6ac4ecuse trait instead of abstract class
XavXav
347239ef85bcoalesce WhiteBlackListAttrProvider and WhiteBlackListDb.scala
XavXav
7d944d7aea4add warning to log when authorization fails
XavXav
74d12ccb51cRevert "add warning to log when authorization fails" This reverts commit e49c44ab10ce48c02c4e1a79b08ff0b1e0686ed3.
XavXav
69ea15c3ec1Merge remote-tracking branch 'origin/feature/SHRINE2020-1308' into feature/SHRINE2020-1308
XavXav
e49c44ab10cadd warning to log when authorization fails
dwalenddwalend
8abb6cce3abAdded a unit test to show - for duplicated keys in a typesafe config file - last in wins - SHRINE2020-1308
Carl WoolfCarl Woolf
9a24efe1251cleaner (no redundant comment) tag of all {reference,shrine}.conf files in source and in resulting conf
Carl WoolfCarl Woolf
29fde75607bRevert "tag all {reference,shrine}.conf files in source and in resulting conf" This reverts commit 842cc097e19dae968...
Carl WoolfCarl Woolf
842cc097e19tag all {reference,shrine}.conf files in source and in resulting conf
Carl WoolfCarl Woolf
217114c9e5dadd back sorting of userInfo in its string-dump
Carl WoolfCarl Woolf
c097c51e6ffMerge remote-tracking branch 'origin/sso-phase2' into sso-phase2
Carl WoolfCarl Woolf
8efdea06773stop using StringBuilder. simplify 'syntax' of info that regex matches against
XavXav
1d09d4f5d7arefactor method getAuthorization() to isAuthorized()
XavXav
7c68dbc94d9Merge remote-tracking branch 'origin/sso-phase2' into sso-phase2
XavXav
a1de472bea8remove stale dependency
Carl WoolfCarl Woolf
e64faaa9f1cMerge remote-tracking branch 'origin/sso-phase2' into sso-phase2
Carl WoolfCarl Woolf
0f581e31fd9Remove Util.scala. allConfig and one method relocated / renamed
XavXav
90ea5c0f3bdclean up imports
XavXav
801a2163b0dremove stale dependency
XavXav
e3b61b35949make exception message more informative
XavXav
6b28c925a74Merge remote-tracking branch 'origin/sso-phase2' into sso-phase2
XavXav
22701d75edbremove stale dependency on AuthorizationService
Carl WoolfCarl Woolf
89fc54878ecMerge remote-tracking branch 'origin/sso-phase2' into sso-phase2
Next →