Diffusion SHRINE MedCo Fork c50ef2dcee62

shrine…
c50ef2dcee62
Actions

Authored by David Walend <david_walend@hms.harvard.edu> on Nov 8 2016, 22:05.

Description

Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into develop

Details

Committed

David Walend <david_walend@hms.harvard.edu>

Nov 8 2016, 22:05

Pushed

mickmis

Mar 14 2017, 15:12

Parents

R2664:c685e9d1a35c: SHRINE-1735 removed a todo
R2664:73a216579800: fixed cert creation

Branches

Unknown

Tags

Unknown

Event Timeline

David Walend <david_walend@hms.harvard.edu> committed R2664:c50ef2dcee62: Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine… (authored by David Walend <david_walend@hms.harvard.edu>).Nov 8 2016, 22:05

Merged Changes

Commit	Author	Details	Committed
73a216579800	Ty	fixed cert creation	Nov 8 2016
10f671259eeb	Ty	adding some code to make creating certificates easier	Nov 8 2016
2b7417a0f0c1	Ty	war changes	Nov 8 2016
45b121f9c450	Ty	Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine…	Nov 8 2016
3c974d32daed	Ty	metadata api	Nov 8 2016
a6f22fd38688	Ty	updated tests, removed extraneous logging, switched client	Nov 8 2016

Changes (36)

		Path
M		apps/dashboard-app/pom.xml
M		apps/dashboard-app/src/test/scala/net/shrine/dashboard/DashboardServiceTest.scala
A	(dir)	apps/meta-app/
A		apps/meta-app/pom.xml
A	(dir)	apps/meta-app/src/
A	(dir)	apps/meta-app/src/main/
A	(dir)	apps/meta-app/src/main/scala/
A		apps/meta-app/src/main/scala/Boot.scala
A		apps/meta-app/src/main/scala/MetaDataService.scala
A	(dir)	apps/meta-app/src/test/
A	(dir)	apps/meta-app/src/test/resources/
A		apps/meta-app/src/test/resources/shrine.conf
A	(dir)	apps/meta-app/src/test/scala/
A		apps/meta-app/src/test/scala/MetaDataServiceTest.scala
A	(dir)	apps/meta-war/
A		apps/meta-war/pom.xml
A	(dir)	apps/meta-war/src/
A	(dir)	apps/meta-war/src/main/
A	(dir)	apps/meta-war/src/main/resources/
A		apps/meta-war/src/main/resources/reference.conf
A	(dir)	apps/meta-war/src/main/webapp/
A	(dir)	apps/meta-war/src/main/webapp/WEB-INF/
A		apps/meta-war/src/main/webapp/WEB-INF/web.xml
M		apps/shrine-app/src/main/scala/net/shrine/status/StatusJaxrs.scala
M		apps/shrine-app/src/test/scala/net/shrine/wiring/ShrineOrchestratorTest.scala
M		commons/crypto/pom.xml
M		commons/crypto/src/main/scala/net/shrine/crypto/KeyStoreDescriptorParser.scala
M		commons/crypto/src/main/scala/net/shrine/crypto2/BouncyKeyStoreCollection.scala
M		commons/crypto/src/main/scala/net/shrine/crypto2/ImproperlyConfiguredKeyStoreProblem.scala
M		commons/crypto/src/main/scala/net/shrine/crypto2/KeyStoreEntry.scala
M		commons/crypto/src/test/scala/net/shrine/crypto/KeyStoreDescriptorParserTest.scala
M		commons/crypto/src/test/scala/net/shrine/crypto/NewTestKeyStore.scala
M		commons/crypto/src/test/scala/net/shrine/crypto2/DownStreamCertCollectionTest.scala
M		commons/util/src/main/scala/net/shrine/util/NonEmptySeq.scala
M		pom.xml
M		tools/scanner/src/test/scala/net/shrine/utilities/scanner/ScannerConfigTest.scala