SHRINE
  1. SHRINE

shrine

Public
  1. SHRINE
  2. shrine

All Branches Graph  

        
AuthorCommitMessageCommit dateBuilds
David WalendDavid Walend
bfeaa8acc95Added test for selecting by user
David WalendDavid Walend
b3ad90ab2edGuess for the right value of queryMasterid
David WalendDavid Walend
627357bb98cTrying out reading previous queries from the db
David WalendDavid Walend
53d591999cbSome debugs to see what's what
David WalendDavid Walend
fe5b56ccf24Bill's recommendations for handling the previous query table
David WalendDavid Walend
ba61dcf294fNow storing queries locally in the QEP
David WalendDavid Walend
4a0864cdb8bAdding mysql.ddl for qepQueryDb. Split out the sql directory into subdirectories per database.
David WalendDavid Walend
87fdce25c99cleaned up a lot of dead sql code. SHRINE-1263
David WalendDavid Walend
69fb78df040Moving sql scripts
David WalendDavid Walend
adc59d4ba10Added test for QepQueryDb, fixed a typo
David WalendDavid Walend
75f57ff39ecAdding some slick code for the qep db
David WalendDavid Walend
e59e514d57fBasics of the QueryInstance db table
David WalendDavid Walend
270675b5230Make testing work a bit better
David WalendDavid Walend
def75242955Crap. test.com is a real domain. Changed to bogus.harvard.edu
David WalendDavid Walend
c59582c7fa5Remove test of failing to talk to a missing web service
David WalendDavid Walend
8dc4aedc6b1Trying out trimming the url to save mischief
David WalendDavid Walend
03430c9da80Cleaning up some suggestions from IDEA
David WalendDavid Walend
42aa7426ea2Rearranged dashboard-to-dashboard auth, got through IDEAs checks to green
David WalendDavid Walend
bd59adccfa3Last of the for comprehension
David WalendDavid Walend
87ff89e8081Added more to the for comprehension
David WalendDavid Walend
9579770dc23Added more to the for comprehension
David WalendDavid Walend
865dfd959dbAdded more to the for comprehension
David WalendDavid Walend
7bf1574d584Started refactoring to a for comprehension
David WalendDavid Walend
4f5b748e323Added a null check for the issuer
David WalendDavid Walend
c2f3e5bc06fMore sensible values for the jwts subject field to help refill the user object on the other end.
Ben CarmenBen Carmen
8a37f2c0042Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into develop
Ben CarmenBen Carmen
1a9eae47195Commit of updated Dashboard Service and Tests
David WalendDavid Walend
59a98d288a3Found a bug where my http headers were being ignored
David WalendDavid Walend
852f9f302d7Comment for java code's reason to exist
David WalendDavid Walend
c3ff50aa00bRemoved some stray printlns
David WalendDavid Walend
338c83b1c65Now verifying the keys that signed the jwts string
David WalendDavid Walend
d28c5d496e2Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into develop
Keith DwyerKeith Dwyer
474f5d939b2Remove (unused) PCORI_AdapterMappings.xml file. This should make build/test a bit faster.
David WalendDavid Walend
7fc8a17aba5Restored tests of dashboard-to-dashboard comms
David WalendDavid Walend
fa62d920c19Now sending a Spray OAuth token with the request
David WalendDavid Walend
bfb56131177Switched to Bearer auth scheme, step 1
David WalendDavid Walend
63d938c2d6cReformatted ShrineJwtAuthenticator.scala
David WalendDavid Walend
18ebe89d2a4Another try at getting the pom.xml to build just JDK 7 code
David WalendDavid Walend
4761d5b7f69Swithcing on the JDK 7 comple option. Hope that the Scala/Java compiler thing uses it. If not, I'll see if I can figu...
David WalendDavid Walend
d7464de1cfeNow using just the jwtsString, almost able to switch to Bearer authentication. Checking in before puzzling through th...
David WalendDavid Walend
013344e6f0eRemoved some less interesting dead code
David WalendDavid Walend
a41433107ccNow using jwt's kid field for the public part of the cert.
David WalendDavid Walend
08ea31cca74Trying out an ssl client that accepts all certs
David WalendDavid Walend
41ea6d99dcaMore logging and a fix - default value for status
David WalendDavid Walend
c44036dbcc7Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into develop
David WalendDavid Walend
10a6cae3528Try sending the cert
Ben CarmenBen Carmen
339655e8be9Commit of merge.
Ben CarmenBen Carmen
86f7b56eb57Merge remote-tracking branch 'origin/develop' into develop # Conflicts: # apps/dashboard-app/src/main/scala/net/shri...
Ben CarmenBen Carmen
3ad3fc618d3Commit of POSO stuff for Dashboard Status...also, commit of tests.
David WalendDavid Walend
3542b6d3ba3Try a comma as a delimiter
David WalendDavid Walend
3227a28cd7bAn attempt to circumvent Spray looking for key value pairs. Not sure if its the way to go.
David WalendDavid Walend
6a1a0a66245Took colons out of headers
David WalendDavid Walend
f5edcb1f071Need to try the file system to get the keystore.
David WalendDavid Walend
219ab95646dMinor test for a remote dashboard.
David WalendDavid Walend
b0acc5b62e9Should be wired up for urls to call into a remote dashboard. We'll see tomorrow.
David WalendDavid Walend
d755340cd8bShould have something that can call a remote dashboard. Getting the right urll next.
David WalendDavid Walend
d0e05a36c55Extracted a method to make the new auth header
David WalendDavid Walend
61e4d9640c2A few more tests for server-side jwts
David WalendDavid Walend
fef97f84cc4Using some bits from jwts to validate and prevent replay attacks.
Ben CarmenBen Carmen
bd405ddf8e4Commit of updated configuration file for dashboard.
Ben CarmenBen Carmen
a1f5c959c28Commit of status testing data.
Ben CarmenBen Carmen
69e05a28a65Merge remote-tracking branch 'origin/develop' into develop
Ben CarmenBen Carmen
71c32e0c1e6Commit of POSO stuff for Status
David WalendDavid Walend
b4ec16ed082More error conditions and tests for dashboard-to-dashboard
David WalendDavid Walend
5f87789e5c1Added an example of getting a string from a url and doing something with it.
David WalendDavid Walend
213aeef1aa1Using cert serial numbers for dashboard-to-dashboard comms
David WalendDavid Walend
0056e4eb5b4Got some tests of rejecting bad auth working
David WalendDavid Walend
fcfac771566Now able to get at the header
David WalendDavid Walend
296a2e4283dStructure to support a custom auth
David WalendDavid Walend
55a50c3b968Better handling of error conditions
David WalendDavid Walend
06f9b9006a8Now handling common errors in all calls
David WalendDavid Walend
368deea0b86Consolidated the URI protocol handling code
David WalendDavid Walend
30e27302f5bAdded some basic error handling to the HttpClient
David WalendDavid Walend
e7f277ea8cbCurse Akka's lack of type safty. Why? Why did they do that?
David WalendDavid Walend
2e94565f3ddMade it possible to substitute proxying of http calls with resource files
David WalendDavid Walend
29ac7995aaaFix for count=1 lockout bug, Shrine-1230
David WalendDavid Walend
7aac3ad18adIncreased the pmEndpoint timeout in the DSA and dashboard to 10 seconds
Ansible DeployAnsible Deploy
d6b3abb0be0Merge release branch hotfix/1.20.1 into master.
Ansible DeployAnsible Deploy
4a9c0a687a9Update POMs with release version 1.20.1.
Ben CarmenBen Carmen
27d3b7886b6IE fix for https://open.med.harvard.edu/jira/browse/SHRINE-1265
Ben CarmenBen Carmen
6bcbb14c5f9IE fix for https://open.med.harvard.edu/jira/browse/SHRINE-1265
Ben CarmenBen Carmen
9b4e3d29326IE fix for https://open.med.harvard.edu/jira/browse/SHRINE-1265
Ben CarmenBen Carmen
08796fe101eIE fix for https://open.med.harvard.edu/jira/browse/SHRINE-1265
Ben CarmenBen Carmen
23def7a4138IE fix for https://open.med.harvard.edu/jira/browse/SHRINE-1265
Ben CarmenBen Carmen
afeaad045b0UPDATE of POM version.
Ben CarmenBen Carmen
ab74f140c5ffix for https://open.med.harvard.edu/jira/browse/SHRINE-1265
Ben CarmenBen Carmen
8b82ac7b703fix for https://open.med.harvard.edu/jira/browse/SHRINE-1265
Bill SimonsBill Simons
d8dd91bf0b7update to snapshot version
David WalendDavid Walend
8b400d8c0b6Switched from finding the default hostname via inetaddress to hardcoding localhost
David WalendDavid Walend
3834aa7ac92Limiting the ContainerRequestFilter to happy an internalstatus web api calls
David WalendDavid Walend
30777d7a1a4Trying to hook up a ContainerRequestFilter
David WalendDavid Walend
bf0f2977340Made ManuallyWiredShrineJaxrsResources an object
David WalendDavid Walend
f1ce82b7c5dRemoved one chunk of AuthStrategy's unused indirection.
David WalendDavid Walend
16e065f3dd4Separated out the ContainerRequestFilter for the status service before converting ManuallyWiredShrineJaxrsResources t...
David WalendDavid Walend
887c29b4a94Try getting status service to just respond to calls from the same machine.
Ansible DeployAnsible Deploy
2d440092a8eMerge release branch release/1.20.0 into master.
Ansible DeployAnsible Deploy
6486fdfd57bUpdate POMs with release version 1.20.0.
David HummelDavid Hummel
95472d93b41Update POMs with snapshot version 1.20.0-SNAPSHOT due to failed release build.
Ansible DeployAnsible Deploy
368a603cc9eUpdate POMs with release version 1.20.0.
David WalendDavid Walend
45f31b74277status service now serves Config
David WalendDavid Walend
c54564e8118Checking in an attempt to add the new web api calls to shrine
David WalendDavid Walend
02ffa58dfb4Added default values to new columns
David WalendDavid Walend
2a5dc4741e8Now with json
David WalendDavid Walend
6e6e6b18d9aNascent status service
David WalendDavid Walend
ee757288addAdded package.scala to explain what is here
David WalendDavid Walend
cf533cf1442Shrine-1114 error QueryResults must supply a Problem or a ProblemDigest
David WalendDavid Walend
569261d7a66Tweaking language a bit
David WalendDavid Walend
dd01c2e132dSHRINE-1250 SqlException making it out to the top layer of the adapter needs a proper problem message.
David WalendDavid Walend
11d3bed18ffSHRINE-1253 fix. Better error capture for junk xml from the CRC.
David WalendDavid Walend
012309b58aeUpdated slick profile comments in the reference conf
David WalendDavid Walend
64e3c0616d4Added full set of Slick profile names to the reference.conf
David WalendDavid Walend
7a6e225ef0astraightening out the ddl
David WalendDavid Walend
c6bdb111be5ddl for oracle and mssql
David WalendDavid Walend
62c64b62d85Changes for running with oracle and mssql
David WalendDavid Walend
b6311a9b4a1MSSQL slick profiles
David WalendDavid Walend
52bf35640aeOracle ddl for the adapter audit logs
David WalendDavid Walend
5da3dad7337Try a compatible version of freeslick
David WalendDavid Walend
eb79eee6211Removed unhelpful logging
David WalendDavid Walend
b3e9d4b6841Tweaked logging to try to see what's happening
David WalendDavid Walend
253e6ab1078Merge branch 'release/1.20.0' into develop
David WalendDavid Walend
ee2a578a6e3Merge branch 'release/1.20.0' of https://open.med.harvard.edu/stash/scm/shrine/shrine into release/1.20.0
David WalendDavid Walend
ad501d07f95Toward Oracle support
Ben CarmenBen Carmen
1160493b98eFix for: https://open.med.harvard.edu/jira/browse/SHRINE-1246
David WalendDavid Walend
9c6770a4720Merge branch 'release/1.20.0' into develop
David WalendDavid Walend
bc4d082c6b6Fix for SHRINE-1242. Including freeslick drivers in the .war files that might use them.
David WalendDavid Walend
dda5bd86796No longer logging the password. Fix for SHRINE-1241
David WalendDavid Walend
12c3fa5819aBroadcast message ids from xor'ed UUIDs. Fix for SHRINE-1057.
David WalendDavid Walend
b505add17b2Merge branch 'release/1.20.0' into develop
David WalendDavid Walend
03c289f3837Merge branch 'release/1.20.0' of https://open.med.harvard.edu/stash/scm/shrine/shrine into release/1.20.0
Ben CarmenBen Carmen
eaa0a9c45eeFix for SHRINE-1234
David WalendDavid Walend
e8f1e890368Broke up the failing match/case sugar statement and added an additional test to get some more information about the s...
David WalendDavid Walend
f82aa131afeDon't create hubs by default. Shrine-1155.
David WalendDavid Walend
d5c12c5c200Merge branch 'release/1.20.0' into develop
David WalendDavid Walend
eefc4f993d2Merge branch 'release/1.20.0' of https://open.med.harvard.edu/stash/scm/shrine/shrine into release/1.20.0
Ben CarmenBen Carmen
9d961a5bce4Merge remote-tracking branch 'origin/release/1.20.0' into release/1.20.0
Ben CarmenBen Carmen
8b9c80404deFix for SHRINE-1232
David WalendDavid Walend
3702ef4b3d0Merge branch 'release/1.20.0' into develop
David WalendDavid Walend
86cfe535e33Merge branch 'release/1.20.0' of https://open.med.harvard.edu/stash/scm/shrine/shrine into release/1.20.0
Keith DwyerKeith Dwyer
b00cd70b469[steward/webclient] Add updated help PDFs revised by Tenille.
David WalendDavid Walend
1959b8acdb4Merge branch 'release/1.20.0' into develop
David WalendDavid Walend
589e3a2a307Rolling back changes to lockout, but leaving in comments
David WalendDavid Walend
0f1079037abMerge branch 'release/1.20.0' into develop
David WalendDavid Walend
2c4db061177Fixes for 1229 and 1230, lockout woes.
David WalendDavid Walend
6dc8af01d14Merge branch 'release/1.20.0' into develop
Ben CarmenBen Carmen
f7ff6f20526Fix for SHRINE-1227
David WalendDavid Walend
daf1b6609d0Merge branch 'release/1.20.0' into develop
Ben CarmenBen Carmen
c96bcfb440dCode cleanup.
Ben CarmenBen Carmen
e869cca2d3efix for SHRINE-1216
Ben CarmenBen Carmen
8862ebe7f49Fix for SHRINE 1225
Ben CarmenBen Carmen
cccff4b4d1aMerge remote-tracking branch 'origin/release/1.20.0' into release/1.20.0
Ben CarmenBen Carmen
37a3e43814dFix for SHRINE 1225
David WalendDavid Walend
5ed682f41d9Merge branch 'release/1.20.0' into develop
David WalendDavid Walend
59908e29cffAdded NodeId to RemoteAdapterClient and strung it through the test code. Possible fix for SHRINE-1219
Ben CarmenBen Carmen
cb0416b18c0Merge remote-tracking branch 'origin/release/1.20.0' into release/1.20.0
Ben CarmenBen Carmen
70ac62021efFix for SHRINE 1101
Ben CarmenBen Carmen
c53d0af4cf8fix for SHRINE-1101
Ben CarmenBen Carmen
ea56c04a988Fix of SHRINE-1197
David WalendDavid Walend
5358b449f36Merge branch 'release/1.20.0' into develop
David WalendDavid Walend
6b7a860e088Now trapping ClientHandlerException. Fix for SHRINE-1220.
David WalendDavid Walend
d8f619cc81eMerge branch 'release/1.20.0' of https://open.med.harvard.edu/stash/scm/shrine/shrine into release/1.20.0
David WalendDavid Walend
b9b839bccbaMerge branch 'release/1.20.0' into develop
David WalendDavid Walend
58268f0f7e2Merge branch 'release/1.20.0' of https://open.med.harvard.edu/stash/scm/shrine/shrine into release/1.20.0
David WalendDavid Walend
d136b21949cNow trapping an UnknownHostException in the Hub. Fix for SHRINE-1220.
Ben CarmenBen Carmen
d754dc7dc58Cleanup of unused styles.
Keith DwyerKeith Dwyer
97bec33949c[dashboard/steward] Change margin-bottom clearance for #wrapper to padding-bottom. Fixes SHRINE-1209.
David WalendDavid Walend
9ff874b6d96Merge branch 'release/1.20.0' of https://open.med.harvard.edu/stash/scm/shrine/shrine into release/1.20.0
Keith DwyerKeith Dwyer
3a96210548b[dashboard] duplicate toLower fix from steward
David WalendDavid Walend
8c78d44ca61Merge branch 'release/1.20.0' into develop
David WalendDavid Walend
9cdbaee5b34Fix for 1222 to see what the source of an unencountered problem is
David WalendDavid Walend
96a8bbf4639Merge branch 'release/1.20.0' into develop
Ben CarmenBen Carmen
09b37ce594afix for SHRINE-1196
Ben CarmenBen Carmen
731aeecc72efix for SHRINE 1210
Ben CarmenBen Carmen
5afb4736fb4fix for SHRINE-1209
Ben CarmenBen Carmen
b9a14872bcdUpdate to make https://open.med.harvard.edu/wiki/display/SHRINE/ the default base url for the wiki when none is provi...
David WalendDavid Walend
2135db442f0Merge branch 'release/1.20.0' into develop
Ben CarmenBen Carmen
baa8f77fa62Update of the Update to Enhanced Error message text to include directions for copying and e-mailing.
Ben CarmenBen Carmen
d1e787ac7abUpdate to Enhanced Error message text to include directions for copying and e-mailing.
Ben CarmenBen Carmen
8b356404de3Fix for Fatal Failure, such as QEP.
David WalendDavid Walend
8a796210d03Merge branch 'release/1.20.0' into develop
Ben CarmenBen Carmen
7295867eed7Fix for SHRINE-1191
David WalendDavid Walend
d9743a09870Merge branch 'release/1.20.0' into develop
Ben CarmenBen Carmen
b5830e171ebfix for SHRINE 1187
David WalendDavid Walend
7a6d804cbf9Typesafe has moved on to JDK8. We're stuck on JDK7.
David WalendDavid Walend
655575ceffeUpdated a lot of version numbers
Ben CarmenBen Carmen
578417feb44Fix for SHRINE 1190 Fix for SHRINE 1192
Ben CarmenBen Carmen
44cf157cc7dFix for SHRINE 1189
David WalendDavid Walend
67fd3a7f78bRemoved a todo
David WalendDavid Walend
326d03fb839Merge branch 'release/1.20.0' into develop
Next →