SHRINE
  1. SHRINE

shrine

Public
  1. SHRINE
  2. shrine

All Branches Graph  

        
AuthorCommitMessageCommit dateBuilds
David WalendDavid Walend
4b92f0e325aMerge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into develop
David WalendDavid Walend
918ca8ac1b3Now using the isDone method on StatusType to determine if queries are done
Ben CarmenBen Carmen
8e13164473dMerge remote-tracking branch 'origin/develop' into develop
Ben CarmenBen Carmen
f7d151b9ed1Commit of UI for config file display.
David WalendDavid Walend
f0f63b4fe1fCQRS for breakdowns and errors in query results
David WalendDavid Walend
36d887412b5Put in any updated records when new results come back from the hub.
David WalendDavid Walend
2a4852b100dFirst attempt at round-trip db cache of results in the qep, and some more cruft cleanup
David WalendDavid Walend
c8676bf4a66Got rid of some unused wierdly complex code
David WalendDavid Walend
f28f5f8754dPrep work and a bit of logging before reading query results
David WalendDavid Walend
2c16042990bMerge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into develop
David WalendDavid Walend
14964e86033Missed a line of db table creation code
Ben CarmenBen Carmen
e20fbddb30cPorted logic for fatal failure and loading.
Ben CarmenBen Carmen
05d26b3250aLatest version of diagnostic cool. Fixed Header and Footer. Refined logic for shrine.conf ui object.
Ben CarmenBen Carmen
7db500a8ab6pick up changes.
Ben CarmenBen Carmen
b423aca39caUpdated Dashboard Client.
Ben CarmenBen Carmen
a5730b8e822Latest version of diagnostic.model with added controllers.
Ben CarmenBen Carmen
123baffbae4Fix for issue with unset values causing an error in config route.
Ben CarmenBen Carmen
837046454acFix for rest url call in deployment, will use named url instead of localhost.
Ben CarmenBen Carmen
81241aecf1dTrying to get Bamboo to pick up latest changes.
Ben CarmenBen Carmen
c7f9371c61bFixing bug with header authorization when in deploy.
Ben CarmenBen Carmen
d50622a5364test of rest call from deploy.
Ben CarmenBen Carmen
6e6b42b1485Test of local rest url.
Ben CarmenBen Carmen
29fbc6fb5cdTest of local vs named url on https in live deployment.
Ben CarmenBen Carmen
337a2bbcc0aCommit of POSO stuff for Status
David WalendDavid Walend
fdcd7f3b1d6Have to use the adapterNode as a foreign key for a response with problems. The resultId coming back is zero for probl...
David WalendDavid Walend
f0d1dc55a94Added mysql sql to create a table for problems the qep stores as part of query results.
David WalendDavid Walend
d782e17e411Test of storing and retrieving a result with a problem
David WalendDavid Walend
066b583758aDB work for problems
Ben CarmenBen Carmen
399f485282eMerge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into develop
Ben CarmenBen Carmen
a6db4a7b1b6Commit of local test data.
Ben CarmenBen Carmen
88d3df38875Commit of latest JS includes (need to move static includes to ocLazyLoad)
Ben CarmenBen Carmen
9dca7ff9402Commit of latest Dashboard JS source.
David WalendDavid Walend
9b6f10a68dabreakdown sql for the qep
David WalendDavid Walend
ff66a1935aeNow storing and retrieving query results with breakdowns in unit tests.
Ben CarmenBen Carmen
20e6063ac1bMerge remote-tracking branch 'origin/develop' into develop
Ben CarmenBen Carmen
adff832f31fUpdate of Dashboard Service Test to reflect changes to route.
Ben CarmenBen Carmen
41d06d0f698Updated Dashboard Service to strip out nested quotes when appropriate.
David WalendDavid Walend
1ea5937a612Getting a QueryResult out of the db
David WalendDavid Walend
dffc299274cBreakdown types table
David WalendDavid Walend
55d2b7bc9c7Another try at the network id
David WalendDavid Walend
a9e82a82b43Think I found the network id
David WalendDavid Walend
3b54492bcfeMerge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into develop
David WalendDavid Walend
c3c7d4df1d2Removed some dead code, updated sql for the new table, and removed the description column (because it is really the n...
Ben CarmenBen Carmen
9d0e1979844Merge remote-tracking branch 'origin/develop' into develop
Ben CarmenBen Carmen
1fcf5b3f075Latest version of diagnostic tool
David WalendDavid Walend
3a5bc041c7fNow attempting to save part of QueryResults in the DB
David WalendDavid Walend
0b4d7f6fa09Matched fields in a QueryResult with fields in the database
David WalendDavid Walend
ccb416e4cc4A little extra logging to try to figure out what one of the aggregators is
David WalendDavid Walend
b809ecd7759Start of query result tables
Ben CarmenBen Carmen
85913978a37update of dashboard.conf file for /test/ directory.
Ben CarmenBen Carmen
0dad039a637Update of Dashboard routing.
David WalendDavid Walend
9fc96147e16Correct default url for status is internalstatus
David WalendDavid Walend
0b9ea42e31eDeleted more PDO stuff
Ben CarmenBen Carmen
0ced7f817feupdate of script includes
Ben CarmenBen Carmen
e68ef1d35f1Merge remote-tracking branch 'origin/develop' into develop
Ben CarmenBen Carmen
033fc768b65Huge refactor of dashboard
David WalendDavid Walend
73bc2b1c8e0Got rid of ReadPDORequest and associated bits
David WalendDavid Walend
064b3b77cf6Planning out the next part of local/local
David WalendDavid Walend
fd395085715Some stray actor systems after the merge
David WalendDavid Walend
f875ded313dMerge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into develop
David WalendDavid Walend
16bf3462545Added some logging to see what else happens
Ben CarmenBen Carmen
6fff2012d50Commit of bug fixes for query history messages: SHRINE-1292 Also, a fix for a missing comma in i2b2_config_data.js.
Ben CarmenBen Carmen
aee3ad95c7dMerge remote-tracking branch 'origin/develop' into develop
David WalendDavid Walend
5ae5189a064Probing a bit into why the steward's actors aren't daemonic
Ben CarmenBen Carmen
ce9bac97088Commit of the latest Dashboard Service.
Ben CarmenBen Carmen
5d48cd0ab33Merge remote-tracking branch 'origin/develop' into develop # Conflicts: # apps/dashboard-app/src/main/scala/net/shri...
David WalendDavid Walend
3ef029060a9Another try at getting akka to run as all-daemon
David WalendDavid Walend
6c7bf41ae49Seeing if I can get some control over akka threads and make them daemons via akka config
David WalendDavid Walend
d6a2021af42Removed stray columns from previousQueries
David WalendDavid Walend
85fb775a3a2Added logging to try to find where the message comes in
David WalendDavid Walend
9a403f61dfaAttempting to track down what happened to the FlagQueryRequest's message
David WalendDavid Walend
29407c707e8Attempting to track down what happened to the FlagQueryRequest's message
David WalendDavid Walend
c623fa3f311Should now handle flag/unflag query requests in the QEP's database
David WalendDavid Walend
254268658d5Some tests for flagged queries
David WalendDavid Walend
54645092738Add flagged query table and use it a little bit
David WalendDavid Walend
5315849aa99Factored the JDNI/tomcat boilerplate off into its own class
David WalendDavid Walend
685c37db95etodo node to check finding the right cert.
David WalendDavid Walend
3c0dcb5f165Handling a case where the dashboard's KeyStore just has the right cert in it.
David WalendDavid Walend
bfad2e33d56Removing the parts that the QEP uses to ask adapters for previous queries
David WalendDavid Walend
75b470281dfRenamed mysterious thing that is the heart of the QEP to AbstractQepService, and renamed its children.
David WalendDavid Walend
4eba8153a90Renamed shrine-service to shrine-qep
David WalendDavid Walend
5b03b448644Renamed 'service' package to 'qep'
David WalendDavid Walend
30dd91476f9Cleaned up dead imports from some ancient refactoring.
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
Next →