SHRINE
  1. SHRINE

shrine

Public
  1. SHRINE
  2. shrine

All Branches Graph  

        
AuthorCommitMessageCommit dateBuilds
dwalenddwalend
e016ecfb0cfMerge branch 'feature/SHRINE2020-1355' into feature/SHRINE2020-1625
dwalenddwalend
11fe5ca9417merging
dwalenddwalend
c4c14ed2ea8Merge branch 'feature/SHRINE2020-1624' into feature/SHRINE2020-1623
dwalenddwalend
c053f3cea2eMerge branch 'feature/SHRINE2020-1622' into feature/SHRINE2020-1624
dwalenddwalend
a3446f8aac0Merge branch 'feature/SHRINE2020-1621' into feature/SHRINE2020-1622
dwalenddwalend
23e0614589bMerge branch 'feature/SHRINE2020-1620' into feature/SHRINE2020-1621
dwalenddwalend
c580782146aSome notes to wrap up SHRINE2020-1625
dwalenddwalend
bfcadcf458dRevert "Extracting the dispatcher one layer for SHRINE2020-1625" This reverts commit 4ffba50fe7bbe00f569bd35fe5ccaa2...
dwalenddwalend
bf4a6ff1144Revert "Now starting the IOs for SHRINE2020-1625" This reverts commit e4a8c97390d8b4b680deaab5d723e12be49ec84d.
David WalendDavid Walend
2d06661a687Pull request #1495: Feature/SHRINE2020 1611 cats io upgrade changes in commons util Merge in SHRINE/shrine from feat...
dwalenddwalend
e4a8c97390dNow starting the IOs for SHRINE2020-1625
dwalenddwalend
a18ed491209Merge branch 'feature/SHRINE2020-1618' into feature/SHRINE2020-1620
dwalenddwalend
e51ae890083Merge branch 'feature/SHRINE2020-1617' into feature/SHRINE2020-1618
dwalenddwalend
fdecea54d71Merge branch 'feature/SHRINE2020-1616' into feature/SHRINE2020-1617
dwalenddwalend
5f4fd276d4eGetting this ready for review for SHRINE2020-1616
dwalenddwalend
4ffba50fe7bExtracting the dispatcher one layer for SHRINE2020-1625
dwalenddwalend
d2f9d837ab6Got the hub working - and maybe downstream nodes - in SHRINE2020-1625
dwalenddwalend
fafadede426Got an example ping service working for SHRINE2020-1625
dwalenddwalend
b4defdfdf22Upgrade circe to 1.4.x for SHRINE2020-1355
dwalenddwalend
cfacc96cec0Got rid of old cats stuff. Cerce next. SHRINE2020-1623
dwalenddwalend
810291f870fMockCRC changes for cats io upgrade for SHRINE2020-1623
dwalenddwalend
ff88151d4d3shrine-api cats IO upgrade for SHRINE2020-1623
dwalenddwalend
6a5dc1afd35CATS IO upgrade for Authz
dwalenddwalend
b8845474b6aCATS IO upgrade for Authz
dwalenddwalend
061d0e9b943missed checking in SHRINE2020-1621
dwalenddwalend
23aa65dbf46aim3 service changes for the cats upgrade SHRINE2020-1622
dwalenddwalend
0a14f1016b6adapter changes for CATs IO upgrade for SHRINE2020-1622
dwalenddwalend
e09664bc5bfsetup tools to latest cats IO for SHRINE2020-1621
dwalenddwalend
7c0102f1420Got the researcher metrics tool compiling for SHRINE2020-1621
dwalenddwalend
3e02a005c0bGot the networks metrics tool and the http4s client test all set for SHRINE2020-1621
dwalenddwalend
fd2d16b2171QEP and ontology now compiling, and probably working with a 500 caveat for SHRINE2020-1620
dwalenddwalend
1c56a09e691Merge branch 'feature/SHRINE2020-1616' into feature/SHRINE2020-1620
dwalenddwalend
2ee7252decaFixed one of the header bits for SHRINE2020-1616
dwalenddwalend
321b77691b2Merge branch 'feature/SHRINE2020-1617' into feature/SHRINE2020-1618
dwalenddwalend
d64fb143f20Merge branch 'feature/SHRINE2020-1616' into feature/SHRINE2020-1617
dwalenddwalend
645a37e53d9Got tests compiling but help with SHRINE2020-1616
dwalenddwalend
77d57ee0d5aMade some progress on commons/auth, then asked for help with SHRINE2020-1616
dwalenddwalend
12a4b66d41aCats IO updates to hub/service for SHRINE2020-1618
dwalenddwalend
0b0f46d5dc6Cats IO updates to hub/service for SHRINE2020-1618
dwalenddwalend
570ce93718bMerge branch 'feature/SHRINE2020-1611-cats-io-upgrade-changes-in-commons-util' into feature/SHRINE2020-1617
dwalenddwalend
6e436fe0f15Some stray bits from LogCensor for SHRINE2020-1611
dwalenddwalend
331df14c655Cats IO 3 upgrade for hub/message-service for SHRINE2020-1617
David WalendDavid Walend
0be171fe074Pull request #1494: SHRINE2020 1606 Merge in SHRINE/shrine from SHRINE2020-1606 to feature/SHRINE2020-1218-cats-effe...
dwalenddwalend
9d0c06a3f2dGot Auth* compiling for SHRINE2020-1616
dwalenddwalend
48754a7cb46Missed the pom.xml changes for SHRINE2020-1611
dwalenddwalend
934c937f8c9Got commons/util compiling and passing tests for SHRINE2020-1611
dwalenddwalend
6be911c8671Preliminaries for using scala fix to do the cats IO upgrade - SHRINE2020-1606
Ansible DeployAnsible Deploy
b463cb1c025Merge release branch release/4.2.0 into master.
Ansible DeployAnsible Deploy
7476dea3527Update POMs with release version 4.2.0.
Andrew DionAndrew Dion
1638b26b570Revert changelist from -RC1 to -SNAPSHOT to appease git-flow script
dwalenddwalend
15e26d57a03Solved the version number mysteries for SHRINE2020-1606
David WalendDavid Walend
2dc41eb0162Pull request #1492: A better fix for the DB change notifier for SHRINE2020-1603 Merge in SHRINE/shrine from feature/...
David WalendDavid Walend
1e4eb98aacbPull request #1493: Feature/SHRINE2020 1567 Merge in SHRINE/shrine from feature/SHRINE2020-1567 to develop * commit...
dwalenddwalend
171cae3cceaAdded goal versions for the cats IO update for SHRINE2020-1606
dwalenddwalend
be54e73b20cRenamed the existing dependencies I'll be upgrading to old-* for SHRINE2020-1606
dwalenddwalend
f8e5c27e85cMerge branch 'feature/SHRINE2020-1603' into feature/SHRINE2020-1218-cats-effect-upgrade
dwalenddwalend
99db5dbcd3eDowngraded AWS libraries back for SHRINE2020-1567
dwalenddwalend
21f9933c2e2Downgraded AWS libraries back for SHRINE2020-1567
dwalenddwalend
e9d9a3eb4eeEasy library upgrades for SHRINE2020-1567
dwalenddwalend
d905056db8cAll the maven libraries for SHRINE2020-1567
dwalenddwalend
16772abe2c4Backing off a log level for SHRINE2020-1603
dwalenddwalend
caabe148c96A better fix for the DB change notifier for SHRINE2020-1603
dwalenddwalend
0608bb79fc7Building an RC1
dwalenddwalend
1b63b322193Merging release/4.2.0 now that we have an RC1
dwalenddwalend
9da885b0388Moved pom.xml to 4.2.0-RC1-SNAPSHOT
David WalendDavid Walend
87ca4d89a22Pull request #1491: Potential fix for SHRINE2020-1547 Merge in SHRINE/shrine from bugfix/SHRINE2020-1547 to release/...
dwalenddwalend
9ad0018fafcReview comments from Xav for SHRINE2020-1547
dwalenddwalend
3377d69b7bdChanged up the comments to reference future work for SHRINE2020-1547
dwalenddwalend
554e211d756Potential fix for SHRINE2020-1547
dwalenddwalend
c4980367d9fAdded a shutdown hook to handle general interrupts more gracefully for SHRINE2020-1592
dwalenddwalend
f642c3e1edbCouple of comments to close out SHRINE2020-1592
David WalendDavid Walend
7ef43655bfePull request #1487: Scaleup test script tweaks Merge in SHRINE/shrine from SHRINE2020-1457 to develop * commit '39b...
David WalendDavid Walend
0939d7357bbPull request #1490: Bugfix/SHRINE2020 1586r Merge in SHRINE/shrine from bugfix/SHRINE2020-1586r to release/4.2.0 * ...
dwalenddwalend
92fd3f752b6Added the QUEUED query poller for SHRINE2020-1592
dwalenddwalend
2cdd61f6088A few more comments to close out this step for SRHINE2020-1590
dwalenddwalend
ae29fc64212Also needed to catch where queries are loaded in for SHRINE2020-1586
dwalenddwalend
7bb8924cb0aSupplying a ResultOutputType of last resort for SHRINE2020-1586
dwalenddwalend
5cd07845fc3A couple of tweaks while closing out this work
dwalenddwalend
477ea6a9bc2Adding the full breakdown config for SHRINE2020-1590
dwalenddwalend
cfd2b54694dGot the database business changed over to 'create if exists' and fixed a typo for SHRINE2020-1590
dwalenddwalend
ba5c9a824e8Got the main() to run queries and report results for SHRINE2020-1590
dwalenddwalend
e9ee2ae9722Set up the exec frame for SHRINE2020-1590
dwalenddwalend
f1ec41489fdMost of the legwork to set up a freestanding adapter exec for SHRINE200-1590
dwalenddwalend
c0f87150110Changed over the adapter to use H2 by default at runtime for SHRINE2020-1589
dwalenddwalend
1941c07812dMerge branch 'feature/SHRINE2020-1573' into feature/SHRINE2020-1589
Marc-Danie NazaireMarc-Danie Nazaire
4d60b6d0395Pull request #1489: Feature/SHRINE2020 1583 Merge in SHRINE/shrine from feature/SHRINE2020-1583 to develop * commit...
Marc-Danie NazaireMarc-Danie Nazaire
db844e94706Pull request #1488: Feature/SHRINE2020 1583 - Remove zookeeper references in kafka setup in docker Merge in SHRINE/s...
dwalenddwalend
7927e3b847dMoved the develop branch to version 4.3.0-SNAPSHOT
dwalenddwalend
c3e4c4a21d4Merge branch 'develop' into release/4.2.0
Marc-Danie NazaireMarc-Danie Nazaire
7add1d0f6a7SHRINE2020-1583 - Remove zookeeper references in kafka setup in docker - reduce sleep time from 255s to 75s when star...
dwalenddwalend
39b03911fe4More jmeter script changes for SHRINE2020-1457
Marc-Danie NazaireMarc-Danie Nazaire
cc1edaeb7a6SHRINE2020-1583 - Remove zookeeper references in kafka setup in docker - Fixed issue with refreshShrineNode not runni...
Marc-Danie NazaireMarc-Danie Nazaire
79f3a75dd08SHRINE2020-1583 - Remove zookeeper references in kafka setup in docker
dwalenddwalend
3e8a3387adeUpdates for testing vs new ontologies with new json for SHRINE2020-1580
dwalenddwalend
45d4e21e7b7Updates to jmeter scripts for 4.2 for SHRINE2020-1457
dwalenddwalend
f8fd45a8f46Some cleanup for show-and-tell of SHRINE2020-1580
dwalenddwalend
74dc19802ffSome cleanup for show-and-tell of SHRINE2020-1580
dwalenddwalend
739f1468c45Added more example scripts for SHRINE20020-1580
dwalenddwalend
35386d2c6dcGot the script down to a funciton for SHRINE2020-1580
dwalenddwalend
2099e03b532More cleanup - code is compiled just once for SHRINE2020-1580
dwalenddwalend
b1c3326ccbbDo one term at a time for SHRINE2020-1580
Xavier HaurieXavier Haurie
b8ad0e0b991SHRINE2020-1579 : fix configuration file
dwalenddwalend
dfbe7da984cGot it working with Scala's own interpreter for SHRINE2020-1580
dwalenddwalend
5b76f4a6828Got a first pass working for SHRINE2020-1580
Xavier HaurieXavier Haurie
ef6637992eeSHRINE2020-1579 : clean-up
Xavier HaurieXavier Haurie
21bb6c15af4SHRINE2020-1579 : clean-up
dwalenddwalend
e25d5f885ffPlanning for SHRINE2020-1580 - scala script for adapter mapping
Xavier HaurieXavier Haurie
cc28e22b9c8SHRINE2020-1579 : add to unit test the ability to record search performance
dwalenddwalend
042aecd79e5More to delete for SHRINE2020-1572
dwalenddwalend
11c8e9550ebSome clean-up for SHRINE2020-1572
Xavier HaurieXavier Haurie
aba48aea335SHRINE2020-1579 : add a unit test for loading the adapter mapping file (CSV)
Xavier HaurieXavier Haurie
6bfe726abb1SHRINE2020-1579 : make loadMappings() work with Bootstrap by wrapping it with IO
Xavier HaurieXavier Haurie
8358f8cd5bbSHRINE2020-1579 : compiles
dwalenddwalend
345ea53902aUsing parameters and giving up on just one CRC id for SHRINE2020-1572
dwalenddwalend
4912622ab3cNow getting QUEUED query results without a database call in the adapter for SHRINE2020-1572
dwalenddwalend
48fcedaaa0bChaser for SHRINE2020-1572
dwalenddwalend
19d90fd1b92Added the count result id to ResultProgress for SHRINE2020-1572
dwalenddwalend
f2fbc675e9cCommented out a lot of DB code for SHRINE2020-1572
Xavier HaurieXavier Haurie
aeb50aeb577Revert "SHRINE2020-1579 : clean-up" This reverts commit 5f0053fc3b6273c9f705b294cf9f10b61f5bd499.
dwalenddwalend
28f0ad6b35cNow works with the hub deciding when to check queued queries for SHRINE2020-1572
dwalenddwalend
afa13b49f01Lined up some dominoes for SHRINE2020-1572 - next will try pushing them over
Xavier HaurieXavier Haurie
5f0053fc3b6SHRINE2020-1579 : clean-up
Xavier HaurieXavier Haurie
3c65ff99f7aSHRINE2020-1579 : clean-up
Marc-Danie NazaireMarc-Danie Nazaire
6ef503a838aSHRINE2020-1579 - Adapter Mapping using Lucene - Added batching of commits and set RAM size for IndexWriter
dwalenddwalend
70a1eb235f3The receiver should be ready to receive and reply to check queued query commands for SHRINE2020-1572
Xavier HaurieXavier Haurie
9e949bbb989SHRINE2020-1579 : index real data, add search capability
dwalenddwalend
03f49bb38cfNow making a result progress for SHRINE2020-1572
dwalenddwalend
c83ac6f56e1Copied the interpretation of responses from the poller to the interrogator for SHRINE2020-1572
Xavier HaurieXavier Haurie
290bc1db5a4SHRINE2020-1579 : move to adapter module
dwalenddwalend
c6efa6328f0A few bits in askCrc to wrap up the simplification for SHRINE2020-1572
dwalenddwalend
f9971724e18Cleanup pass for requestQueuedResultFromCrc for SHRINE2020-1572
dwalenddwalend
29698b25148Cleaned up retrieveIfComplete for SHRINE2020-1572
dwalenddwalend
13e5cea99deFirst pass of cleanup in retrieveQueryResults for SHRINE2020-1572
dwalenddwalend
e8726dc1a5eCleaned up the bit of code that retrieves breakdowns for SHRINE2020-1572
dwalenddwalend
01063e38c43Now getting the count back a bit leaner for SHRINE2020-1572
dwalenddwalend
219c101de5dAnother step deeper for SHRINE2020-1572
dwalenddwalend
4af527bdca3Cleanup for the previous step for SHRINE2020-1572
dwalenddwalend
e2f5559b466Revert "Removed some bits without breaking anything for SHRINE2020-1572" This reverts commit fde39d39840dac66c87628d...
Xavier HaurieXavier Haurie
56a268c7807SHRINE2020-1579 : clean-up
Xavier HaurieXavier Haurie
3d4cea258a1SHRINE2020-1579 : second cut, seeks exact match on the lucene concept, returns the entire local concept
dwalenddwalend
fde39d39840Removed some bits without breaking anything for SHRINE2020-1572
dwalenddwalend
a47fa39130bPlanning and a first data structure for SHRINE2020-1572
Xavier HaurieXavier Haurie
98025ceadafSHRINE2020-1579 : first cut, working Lucene indexer
Xavier HaurieXavier Haurie
a2e47cc184cMerge branch 'develop' into bugfix/SHRINE2020-1524
Xavier HaurieXavier Haurie
98de90d2426SHRINE2020-1524 : remove un-needed parameter
David WalendDavid Walend
988ab3e838dPull request #1469: Make VerifyServerCerts the default for shrine-to-shrine communication for SHRINE2020-1514 Merge ...
dwalenddwalend
50c02290458Merge remote-tracking branch 'origin/develop' into feature/SHRINE2020-1514
dwalenddwalend
e26ade39a78Working config for SHRINE2020-1573 show-and-tell
dwalenddwalend
1ac485a962bTry byte arrays instead of strings for SHRINE2020-1573
dwalenddwalend
8592c42ed01Wrote a simple test before switching databases
dwalenddwalend
e8ef570561dSee if that will get the auditDB started for SHRINE2020-1573
dwalenddwalend
824910e3579Try storing the mappings in h2 for SHRINE2020-1573
dwalenddwalend
7fa0b1b8f87Quick twiddle comment of default values in the comprehensive shrine.conf for SHRINE 4.2 doc
Xavier HaurieXavier Haurie
0393f1831f7SHRINE2020-1524 : simply set criteria text of the QueryCell
Xavier HaurieXavier Haurie
84705b41a12SHRINE2020-1524 : remove bits used to display "Please wait..." but add back UNSUPPORTED_QUERY_ALERT in warning popup ...
Xavier HaurieXavier Haurie
9d54f9c9987Merge branch 'develop' into bugfix/SHRINE2020-1524
Xavier HaurieXavier Haurie
ecb8db82ddaSHRINE2020-1524 : make the "Please wait ..." text when loading a query's HTML representation an empty string
Xavier HaurieXavier Haurie
34c05aa1012Revert "SHRINE2020-1524 : fix as per PR" This reverts commit 5a760f64d6d5541fc4e3a10d29096a4a1348b5bd.
Xavier HaurieXavier Haurie
5a760f64d6dSHRINE2020-1524 : fix as per PR
Xavier HaurieXavier Haurie
0bc8d0c5098SHRINE2020-1560 : make the set of available breakdowns load only once
Xavier HaurieXavier Haurie
7c895ef6511fix the name of shine node in Docker module's README.md
dwalenddwalend
c57a2029757Moved the time span constraint text to the end and used the word 'by' for it for SHRINE2020-1511
David WalendDavid Walend
d7644656fefPull request #1484: Removed timeoutWaitGap, and cleaned up EndpointConfig for SHRINE2020-1526 Merge in SHRINE/shrine...
Xavier HaurieXavier Haurie
c0f13ab6fe0Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into develop
David WalendDavid Walend
ca7263a6d44Pull request #1482: Fix for SHRINE2020-1557 to store updates to queries in the database Merge in SHRINE/shrine from ...
Xavier HaurieXavier Haurie
82befdc6c2dMerge branch 'develop' into bugfix/SHRINE2020-1553
dwalenddwalend
a1edcf2485aRemoved timeoutWaitGap, and cleaned up EndpointConfig for SHRINE2020-1526
Xavier HaurieXavier Haurie
6acfaf9de75SHRINE2020-1553 : remove the word "demographic" from the breakdown heading and from the tooltip for the download button
David WalendDavid Walend
ee29501fd74Pull request #1481: Bugfix/SHRINE2020 1558 Merge in SHRINE/shrine from bugfix/SHRINE2020-1558 to develop * commit '...
dwalenddwalend
c984c90b6acCleaned up some logging for SHRINE2020-1557
dwalenddwalend
e1470a9250fFix for SHRINE2020-1557 to store updates to queries in the database
Xavier HaurieXavier Haurie
d06f754d04fMerge branch 'develop' into bugfix/SHRINE2020-1539
dwalenddwalend
94ce92589b7Fixed the bug that lets the hub check for old queries in SHRINE2020-1558
dwalenddwalend
d2e9bb18183Added some unit tests but didn't find anything broken yet for SHRINE2020-1558
Xavier HaurieXavier Haurie
646317e9c42SHRINE2020-1539 : fix spacing so it's as before I touched this code
Xavier HaurieXavier Haurie
46c9adf8d62SHRINE2020-1539 : remove unnecessary parentheses
dwalenddwalend
0c69b4b4bf9Merge remote-tracking branch 'origin/develop' into bugfix/SHRINE2020-1558
David WalendDavid Walend
2f60485dfd5Pull request #1470: Make unknown messages a bit less dire than an exception for SHRINE2020-1556 Merge in SHRINE/shri...
dwalenddwalend
c6db5486eacmerging
dwalenddwalend
4662685c053experiments for SHRINE2020-1558
David WalendDavid Walend
48cb1cb0fe1Pull request #1476: Some places to tighten up the schema Mike C's mariadb upgrade suggests for SHRINE2020-1561 Merge...
David WalendDavid Walend
6e7abe3779fPull request #1477: Feature/SHRINE2020 1562 Merge in SHRINE/shrine from feature/SHRINE2020-1365 to develop * commit...
Xavier HaurieXavier Haurie
ab06144a5bbMerge branch 'develop' into bugfix/SHRINE2020-1555
Xavier HaurieXavier Haurie
fa1e9ff91a8Merge branch 'develop' into bugfix/SHRINE2020-1538
Xavier HaurieXavier Haurie
6b46efb8f98Merge branch 'develop' into bugfix/SHRINE2020-1537
Marc-Danie NazaireMarc-Danie Nazaire
aede064824dPull request #1474: SHRINE2020-1559-Add option to specify whether to include tooltips in the Lucene indexing tool Me...
Xavier HaurieXavier Haurie
114f547c301SHRINE2020-1539 : fix HTML representation of complex queries
dwalenddwalend
1d09e147520Found where the hub was sending raw results and had it send UpdateResult commands for SHRINE2020-1561
Next →