SHRINE
  1. SHRINE

shrine

Public
  1. SHRINE
  2. shrine

All Branches Graph  

        
AuthorCommitMessageCommit dateBuilds
dwalenddwalend
e34216438a6Last easy case object update I see for SHRINE2020-1360
dwalenddwalend
706929b02aaMerged
dwalenddwalend
883c9afb7f6Anupama's words for SHRINE2020-1352
dwalenddwalend
5c5436bd213Merging
dwalenddwalend
6856a76cf2cRenamed BookEnd to EventBoundary for SHRINE2020-1350
dwalenddwalend
673678bfc22A first pass of SHRINE2020-1360 - better json for case objects
XavXav
49e58251552Merge branch 'feature/SHRINE2020-1350' into feature/SHRINE2020-1262
dwalenddwalend
3a111938804Merge branch 'feature/SHRINE2020-1350' into feature/SHRINE2020-1352
dwalenddwalend
818f86b4671Merge remote-tracking branch 'origin/develop' into feature/SHRINE2020-1350
dwalenddwalend
762b2cbc585Mix of library dependencies was not playing nice with case objects for SHRINE2020-1350
David WalendDavid Walend
80892dad4ecPull request #1369: Updated the help link and wiki page for SHRINE 4.2 for SHRINE2020-1346 Merge in SHRINE/shrine fr...
XavXav
b9d403021a1add unit test for time link with book ends
XavXav
5d49d8e14bcMerge 1350 into this branch; correct query sent to b/e, but b/e times out
XavXav
44e3b376c27Modify the query data structure sent by the f/e to the b/e, which fixes the communication bug between the two
XavXav
b76b4de8e3ftake a step back to make the f/e work, without fromStartOrEnd object. Breaks the b/e because of that change.
XavXav
fe13db012f4add BookEnd instance as a member of EventConstraint; make bookends non-Optional; update unit tests to handle book-ends,
dwalenddwalend
916ee4f6f1cNicer json for the new field for SHRINE2020-1352
dwalenddwalend
3024bd2cad6merging
dwalenddwalend
3d05365fa83Found a very clean way to have case objects in the protocol for BookEnds for SHRINE2020-1350
dwalenddwalend
0615370946dUpdated the help link and wiki page for SHRINE 4.2 for SHRINE2020-1346
XavXav
be9638f9274clean up js code
dwalenddwalend
8d40bc75436Getting things lined up just right with the bookend branch for SHRINE2020-1352
dwalenddwalend
73490b380abmerging
XavXav
e49f0228591Merge branch 'feature/SHRINE2020-1350' into feature/SHRINE2020-1262
dwalenddwalend
93b288d9c05Needs an example for the javascript end SHRINE2020-1350
Ansible DeployAnsible Deploy
2ed45b5876bMerge release branch release/4.1.0 into master.
Ansible DeployAnsible Deploy
e383042d015Update POMs with release version 4.1.0.
dwalenddwalend
9c5e6eaf89dI think I've got a full pass for SHRINE2020-1352 caveat a good name for this feature
XavXav
51c24176860made new drop-downs stateful
dwalenddwalend
26b0270b21fMissed an import for SHRINE2020-1352
dwalenddwalend
43373913863Planned work for SHRINE2020-1352
dwalenddwalend
436a9ffca9eMerge remote-tracking branch 'origin/develop' into feature/SHRINE2020-1350
dwalenddwalend
395b7ce5b88Merge remote-tracking branch 'origin/develop' into feature/SHRINE2020-1352
David WalendDavid Walend
42d4f7de86bPull request #1366: Feature/SHRINE2020 1353 Merge in SHRINE/shrine from feature/SHRINE2020-1353 to develop * commit...
XavXav
7bce1a3e8bbvery first cut at the UI
XavXav
a0eef76e227add instructions for pushing front-end and back-end code to a local docker instance
dwalenddwalend
6892598251dOne last easy upgrade and a sad note about circe for SHRINE2020-1353
dwalenddwalend
d032000416bMore easy library upgrades for SHRINE2020-1353
dwalenddwalend
c1477f0f896Updated maven parts for SHRINE2020-1353
XavXav
18177e1a645Merge remote-tracking branch 'origin/develop' into develop
XavXav
874c4853ebemodifications/fixes to README.md for docker
dwalenddwalend
e202bf4b967Cleaned out some yellow flags for SHRINE2020-1350
dwalenddwalend
b338d83f8fdMarking future work in SHRINE2020-1350
dwalenddwalend
57769b83a6cFixed some tests for SHRINE2020-1350
dwalenddwalend
6779b3d0581Intermediate check of SHRINE2020-1350
David WalendDavid Walend
070b1af3670Pull request #1364: More updates to jmeter tests for SHRINE2020-1148 Merge in SHRINE/shrine from SHRINE2020-1148-mor...
dwalenddwalend
d3a3f427263Notes for how to fix SHRINE2020-1305
dwalenddwalend
10b9413f12aMerging
dwalenddwalend
a97923c364fMerging
dwalenddwalend
7ae6c37db04More updates to jmeter tests for SHRINE2020-1148
dwalenddwalend
c9661a51c56Roll back the RC business in the pom.xml
dwalenddwalend
ecd27169841Move develop to shrine 4.2.0
dwalenddwalend
478f3a356c7Start the 4.1.0 release branch with RC1
dwalenddwalend
6f86ba84e0fCleanup of found files for SHRINE2020-1334
dwalenddwalend
bff281206d2Initial state of shrine-dev config files for SHRINE2020-1334
David WalendDavid Walend
86063cca99dPull request #1363: For Kafka - queueusIO should only return the queues used by this shrine networks, not all the que...
David WalendDavid Walend
140cfc65034Pull request #1362: Feature/SHRINE2020 988 Merge in SHRINE/shrine from feature/SHRINE2020-988 to develop * commit '...
dwalenddwalend
cca1cd0d480For Kafka - queueusIO should only return the queues used by this shrine networks, not all the queues in Kafka SHRINE2...
dwalenddwalend
1bde7a04fd5Better logging for picking a MOM system for SHRINE2020-988
XavXav
8c530a6961eset revision back to 4.1.0 in top-level POM file
XavXav
66a79009ffdMerge branch 'develop' into sso-phase2
dwalenddwalend
c38da73ef96Adding the jmeter files used for SHRINE2020-988
dwalenddwalend
5e73f7dd620Clearing an out-dated error in the log found during SHRINE2020-988
dwalenddwalend
cf869d12d25merging
XavXav
749f37e3087remove commented-out setting in sample Tomcat config file
XavXav
1b346cc2a29Revert "Revert "remove stale @param's and @throws's from AuthorizationFilter; remove unused maven-compiler-plugin and...
XavXav
82238212618Revert "remove stale @param's and @throws's from AuthorizationFilter; remove unused maven-compiler-plugin and junit d...
XavXav
8ec60cfbd3aremove stale @param's and @throws's from AuthorizationFilter; remove unused maven-compiler-plugin and junit dependency
XavXav
c043ade67eePR feedback : create more tickets for postponed work and include their # + summary in the code; more comments
Carl WoolfCarl Woolf
b504640512breduce free-standing vals
Carl WoolfCarl Woolf
43ba191594emore compact biz-logic in Filter
XavXav
e8101541481remove shrineSP as a config source; add JIRA ticket numbers where changes have been postponed; remove back quotes fro...
XavXav
da067189e69add sample config for RegexAuthorizer
XavXav
905c28b7817add sample config for RegexAuthorizer
XavXav
67bcc497e3amove RegexAuthorization class to an example folder
XavXav
a1b7402e083fix bug in new AuthorizationFilter
XavXav
df4ed0c4158Add comment to explain how a user is authorized from calling Authorization.AuthorizationCoordinator
XavXav
b34da322378rename AuthorizationService to AuthorizationCoordinator so it is not mistaken to an HTTP end-point provider
XavXav
515591a725arewrite the authorization filter such that there is no return within its body nor is there a 'doChain' var to keep tr...
XavXav
83ade4761b3remove fully qualified name where not necessary; move import
Carl WoolfCarl Woolf
ed5c798b558simplify innerT assignment. More-descriptive names for helpers
David WalendDavid Walend
c405ab5d9f7Pull request #1361: Bugfix/SHRINE2020 1309 queued queries poller runs forever, for a more even load on the i2b2 CRC ...
XavXav
c0f5515434fadd more comments
dwalenddwalend
f29a5249486Logging in ShrineMomClient for SHRINE2020-1305
dwalenddwalend
a9955e18be8Logging around runTransactionIO for SHRINE2020-1305
dwalenddwalend
1d7ad576dc2Logging around runTransactionIO for SHRINE2020-1305
dwalenddwalend
5754ee86a98Logging around runTransactionIO for SHRINE2020-1305
XavXav
3ca2bc19124make SQL for creating BW list table more universal
dwalenddwalend
1678a7bc18cTry not using blocking() for the database transaction. IO.fromFuture should handle the thread pool issues well. For S...
XavXav
17fbfea7695create trait for authorizers which use the black/white list attributes provided by WhiteBlackListAttrProvider
XavXav
f6b69033720straggler for previous commit : simplify SQL for black/white attribute provider so as to be compatible with Oracle. (...
XavXav
a597d9c3d91simplify SQL for black/white attribute provider so as to be compatible with Oracle. (i.e. do not use AUTO_INCREMENT)
dwalenddwalend
a64c18ef5c3Even more logging to bracket SHRINE2020-1305
dwalenddwalend
539250d7cfdYet more logging in the database to bracket SHRINE2020-1305
dwalenddwalend
01106bf4cd4Even more logging in the database to bracket SHRINE2020-1305
dwalenddwalend
7ad6cf5f352More logging in the database to bracket SHRINE2020-1305
XavXav
51beed1c295reinstate configuration of filters in web.xml instead of annotations
dwalenddwalend
52638748a66More logging - trying to bracket for SHRINE2020-1305
XavXav
bc913d959a9reinstate configuration of filters in web.xml instead of annotations
XavXav
1176e0f0ebaMerge remote-tracking branch 'origin/sso-phase2' into sso-phase2
XavXav
c16dbc1db2creinstate configuration of filters in web.xml instead of annotations
dwalenddwalend
627a5016c42A little more logging to try to bracket SHRINE2020-1305
David WalendDavid Walend
cb5f76e09c7Pull request #1360: Added a unit test to show - for duplicated keys in a typesafe config file - last in wins - SHRINE...
dwalenddwalend
8495dffa7d5Fix the config and expand the default CRC QUEUED query polling interval for SHRINE2020-1309
XavXav
8d5a0c25013simplify name and return type of AuthorizationService.isUserAuthorized(), and modify AuthorizerFilter code accordingl...
XavXav
a6b52068757remove wildcard import
XavXav
1f7c16ce114remove wildcard import
XavXav
7e44e6e819badd comment to top of AuthorizationFilter class
XavXav
b276da91449make thrown exception class more specific
XavXav
7bcc42ac87eadd comment on purpose ot AttrProviderTrait
XavXav
b70b2df8547move import statement to just above where it's needed. But not able to figure out which specific cases need to be imp...
XavXav
a881923fc0calready imported Config. No need for a fully qualified class name.
XavXav
6a22043b6d9remove "optimistic" var, moved "unauthorizedUrl" attribute fetching to the top of the if block for clarity
XavXav
29355a6c165get rid of "var doFilter" in AuthorizationFilter
XavXav
a6abbe2a86bremove unneeded comment
XavXav
e799ce2f097fix authz's POM.xml
XavXav
26362458395update servlet api version; make it a POM file property
XavXav
cb7eed8876brename method, add comment
XavXav
bdf9966c9bcMerge remote-tracking branch 'origin/sso-phase2' into sso-phase2
XavXav
ff98ab9ceaerename method, add comment
dwalenddwalend
61d8f7352a8A little more cleanup of SHRINE2020-1309 before review
dwalenddwalend
4e2dc4ba546Added a jmeter QUEUED query test while exploring SHRINE2020-1303
Carl WoolfCarl Woolf
2eb96862a40wb-DB no longer warms up
dwalenddwalend
2d9d5ca87adCode cleanup to let the QueuedQueriesPoller just run all the time for SHRINE2020-1309
dwalenddwalend
386e787914eSee if just letting the queued queries poller go is better for SHRINE2020-1303
XavXav
3e0388518acremove a line of dead code
dwalenddwalend
e51d3418745Revert "SHRINE2020-1303 - try not running the task at all if it is already stopped" This reverts commit 7cf84bb8838f...
XavXav
e74b39aec76add comment describing the REMOTE_USER header remove a line of dead code
XavXav
803161c782fadd comment describing what AuthorizationService does
XavXav
d5be6e16939remove "future-proofing" code; modify shrine.config.authorizer.requireAuthorization to be a boolean
XavXav
9af73c0fd7amove fully qualified names for AttrProviderTrait and AuthorizerTrait to the import statements, instead of where in th...
XavXav
4d5e2392a13rename AuthzHttp4sResource class to AuthzHttp4sService
XavXav
34e21e9fc7brename AuthzHttp4sResource class to AuthzHttp4sService
XavXav
03e8f4d0310add comments to attribute provider classes
XavXav
307942d40a4add comments to attribute provider classes
XavXav
63786234c5badd comments to attribute provider classes
dwalenddwalend
7cf84bb8838SHRINE2020-1303 - try not running the task at all if it is already stopped
dwalenddwalend
a15633fe818Experiment for SHRINE2020-1309 - just start the QueuedQueriesPoller at the beginning
XavXav
9f65b3d48afadd comments; clean up imports
XavXav
d0087524345Merge remote-tracking branch 'origin/sso-phase2' into sso-phase2
XavXav
570a2177affadd comments; clean up imports
dwalenddwalend
49a54cbe4a4Aimed perfest jmeter test at perftest
Carl WoolfCarl Woolf
44b0f254e3bRevert "cleaner (no redundant comment) tag of all {reference,shrine}.conf files in source and in resulting conf" Thi...
XavXav
c97adbf8398add documentation to attribute providers and their usage to build the complete userInfo map
XavXav
31bc96e47f8get rid of pairNameAndMap() method in AttrProviderTrait
XavXav
ab10e6550aeRename class to reflect that it is a trait
XavXav
b33617a299buse trait instead of abstract class for Attribute Providers
XavXav
ce7fd25dee2use trait instead of abstract class for Attribute Providers
XavXav
e5784d914aeuse trait instead of abstract class
XavXav
1441054378cuse trait instead of abstract class
XavXav
d5a1969ebbbuse trait instead of abstract class
XavXav
c8a2225fd0dcoalesce WhiteBlackListAttrProvider and WhiteBlackListDb.scala
XavXav
6fa4a91a8b7add warning to log when authorization fails
XavXav
95ab4210293Revert "add warning to log when authorization fails" This reverts commit 25c682d0d675a19d195919e1342d1ea4d693055d.
XavXav
16734f7c4c2Merge remote-tracking branch 'origin/feature/SHRINE2020-1308' into feature/SHRINE2020-1308
XavXav
25c682d0d67add warning to log when authorization fails
dwalenddwalend
bafc4babf33Added a unit test to show - for duplicated keys in a typesafe config file - last in wins - SHRINE2020-1308
Carl WoolfCarl Woolf
68e7041e128cleaner (no redundant comment) tag of all {reference,shrine}.conf files in source and in resulting conf
Carl WoolfCarl Woolf
ec153da1cd5Revert "tag all {reference,shrine}.conf files in source and in resulting conf" This reverts commit 64e71d0669a71903d...
Carl WoolfCarl Woolf
64e71d0669atag all {reference,shrine}.conf files in source and in resulting conf
Carl WoolfCarl Woolf
d54b6364fabadd back sorting of userInfo in its string-dump
Carl WoolfCarl Woolf
207eb412502Merge remote-tracking branch 'origin/sso-phase2' into sso-phase2
Carl WoolfCarl Woolf
d307b1ee03astop using StringBuilder. simplify 'syntax' of info that regex matches against
XavXav
ca6fed2ee3arefactor method getAuthorization() to isAuthorized()
XavXav
7f33b78f5d2Merge remote-tracking branch 'origin/sso-phase2' into sso-phase2
XavXav
aacbadb9ca4remove stale dependency
Carl WoolfCarl Woolf
ae06c383adbMerge remote-tracking branch 'origin/sso-phase2' into sso-phase2
Carl WoolfCarl Woolf
b2f70d53587Remove Util.scala. allConfig and one method relocated / renamed
XavXav
3ba4f87318aclean up imports
XavXav
cdc1cbf9b38remove stale dependency
XavXav
02ceed30cbemake exception message more informative
XavXav
792ff82cba1Merge remote-tracking branch 'origin/sso-phase2' into sso-phase2
XavXav
0565055db4bremove stale dependency on AuthorizationService
Carl WoolfCarl Woolf
afb0cbcb6b1Merge remote-tracking branch 'origin/sso-phase2' into sso-phase2
Carl WoolfCarl Woolf
ba226eb2c61Cleanup (nuke) smoke-test url-endpoints
XavXav
9d8f3f39f8crevert version in POM to sso-phase2
XavXav
466b4629b0arevert version in POM to sso-phase2
XavXav
b4b2f18ee2dcopy the 3 sample configs for SOO into sso/shrine/shrine.conf, as 3 commented out config blocks
XavXav
5f917e06abdmove the 3 sample configs for SOO into the "big" shrine.conf, as 3 commented out config blocks
XavXav
64c6637c194add a comment about where the config item unauthorizedMessage is set
XavXav
3b2e6532c21add a comment about where the config item unauthorizedMessage is set
XavXav
5ac0776acf8Merge remote-tracking branch 'origin/sso-phase2' into sso-phase2
XavXav
aced1151aecconfigure unauthorizedMessage in the qep' reference.conf file only.
Carl WoolfCarl Woolf
2f5129ab471Merge remote-tracking branch 'origin/sso-phase2' into sso-phase2
Carl WoolfCarl Woolf
a09072d2dfcuse forall() to eliminate one more var
XavXav
31f844cd32bupdate version to 4.1.0
Carl WoolfCarl Woolf
d9b3ce1782bcleanup unused var's, though I think they should have been used?
Carl WoolfCarl Woolf
fcbe708c7e4add summary comments to each authorizer class
Next →