Homec4science
Diffusion SHRINE MedCo Fork 92366f1212ea

Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine…
92366f1212ea
Actions

Authored by Keith Dwyer <keith_dwyer@hms.harvard.edu> on Oct 15 2015, 20:48.

Description

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

Details

Committed
Keith Dwyer <keith_dwyer@hms.harvard.edu>Oct 15 2015, 20:48
Pushed
mickmisMar 14 2017, 15:12
Parents
R2664:84bdca4c12e5: Added HttpErrorCodeFromAdapter and CouldNotParseXmlFromAdapter
R2664:82e80799c1d3: add .DS_Store to .gitignore (seems to already be ignored, adding solely to be…
Branches
Unknown
Tags
Unknown

Event Timeline

Keith Dwyer <keith_dwyer@hms.harvard.edu> committed R2664:92366f1212ea: Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine… (authored by Keith Dwyer <keith_dwyer@hms.harvard.edu>).Oct 15 2015, 20:48

Merged Changes

CommitAuthorDetailsCommitted
84bdca4c12e5David Walend
Added HttpErrorCodeFromAdapter and CouldNotParseXmlFromAdapter 
Oct 15 2015
c3a063dff576David Walend
Changed details to an xml element, which seems to carry through everything as… 
Oct 15 2015

Changes (19)

Path
Madapter/adapter-api/src/main/scala/net/shrine/adapter/client/RemoteAdapterClient.scala
Madapter/adapter-service/src/main/scala/net/shrine/adapter/Adapter.scala
Madapter/adapter-service/src/main/scala/net/shrine/adapter/dao/AdapterDao.scala
Madapter/adapter-service/src/main/scala/net/shrine/adapter/dao/model/ShrineError.scala
Madapter/adapter-service/src/main/scala/net/shrine/adapter/dao/model/squeryl/SquerylShrineError.scala
Madapter/adapter-service/src/main/scala/net/shrine/adapter/dao/squeryl/SquerylAdapterDao.scala
Madapter/adapter-service/src/main/scala/net/shrine/adapter/service/AdapterService.scala
Madapter/adapter-service/src/test/scala/net/shrine/adapter/dao/MockAdapterDao.scala
Madapter/adapter-service/src/test/scala/net/shrine/adapter/dao/model/ShrineErrorTest.scala
Madapter/adapter-service/src/test/scala/net/shrine/adapter/dao/model/ShrineQueryResultTest.scala
Madapter/adapter-service/src/test/scala/net/shrine/adapter/dao/squeryl/SquerylAdapterDaoTest.scala
Mcommons/auth/src/main/scala/net/shrine/authorization/PmAuthorizerComponent.scala
Mcommons/protocol/src/main/scala/net/shrine/protocol/QueryResult.scala
Mcommons/protocol/src/test/scala/net/shrine/protocol/ErrorResponseTest.scala
Mcommons/protocol/src/test/scala/net/shrine/protocol/QueryResultTest.scala
Mcommons/protocol/src/test/scala/net/shrine/protocol/ShrineMessageTest.scala
Mcommons/util/src/main/scala/net/shrine/problem/Problem.scala
Mcommons/util/src/test/scala/net/shrine/problem/ProblemDigestTest.scala
Mhub/broadcaster-aggregator/src/main/scala/net/shrine/aggregation/BasicAggregator.scala

R2664:92366f1212ea

View Options

adapter/adapter-api/src/main/scala/net/shrine/adapter/client/RemoteAdapterClient.scala

Loading...
View Options

adapter/adapter-service/src/main/scala/net/shrine/adapter/Adapter.scala

Loading...
View Options

adapter/adapter-service/src/main/scala/net/shrine/adapter/dao/AdapterDao.scala

Loading...
View Options

adapter/adapter-service/src/main/scala/net/shrine/adapter/dao/model/ShrineError.scala

Loading...
View Options

adapter/adapter-service/src/main/scala/net/shrine/adapter/dao/model/squeryl/SquerylShrineError.scala

Loading...
View Options

adapter/adapter-service/src/main/scala/net/shrine/adapter/dao/squeryl/SquerylAdapterDao.scala

Loading...
View Options

adapter/adapter-service/src/main/scala/net/shrine/adapter/service/AdapterService.scala

Loading...
View Options

adapter/adapter-service/src/test/scala/net/shrine/adapter/dao/MockAdapterDao.scala

Loading...
View Options

adapter/adapter-service/src/test/scala/net/shrine/adapter/dao/model/ShrineErrorTest.scala

Loading...
View Options

adapter/adapter-service/src/test/scala/net/shrine/adapter/dao/model/ShrineQueryResultTest.scala

Loading...
View Options

adapter/adapter-service/src/test/scala/net/shrine/adapter/dao/squeryl/SquerylAdapterDaoTest.scala

Loading...
View Options

commons/auth/src/main/scala/net/shrine/authorization/PmAuthorizerComponent.scala

Loading...
View Options

commons/protocol/src/main/scala/net/shrine/protocol/QueryResult.scala

Loading...
View Options

commons/protocol/src/test/scala/net/shrine/protocol/ErrorResponseTest.scala

Loading...
View Options

commons/protocol/src/test/scala/net/shrine/protocol/QueryResultTest.scala

Loading...
View Options

commons/protocol/src/test/scala/net/shrine/protocol/ShrineMessageTest.scala

Loading...
View Options

commons/util/src/main/scala/net/shrine/problem/Problem.scala

Loading...
View Options

commons/util/src/test/scala/net/shrine/problem/ProblemDigestTest.scala

Loading...
View Options

hub/broadcaster-aggregator/src/main/scala/net/shrine/aggregation/BasicAggregator.scala

Loading...
c4science · Help