Core application including web front end
Build: #36 failed Changes by Todd Nicholson
Code commits
clowder
-
Todd Nicholson 974515ef716182f1a2831158289685587b6dc529
should fix errors after merge. in some parts calls to rabbitmq plugin were put back in, or other deprecated plugins
- app/api/Datasets.scala (version 974515ef716182f1a2831158289685587b6dc529) (diffs)
- app/api/Files.scala (version 974515ef716182f1a2831158289685587b6dc529) (diffs)
- app/api/Status.scala (version 974515ef716182f1a2831158289685587b6dc529) (diffs)
- app/models/ExtractionInfoSetUp.scala (version 974515ef716182f1a2831158289685587b6dc529) (diffs)
-
Todd Nicholson e09cabe8c9f5a75c3b5f78005d80b19819f4edb3
Merge branch '2.0-work-in-progress' into for-2.0-rabbitmq-service
# Conflicts:
# app/models/ExtractionInfoSetUp.scala
# test/unit/extractions/ExtractionHTMLControllerSpec.scala -
Luigi Marini d8421a7330d068141472ddd77b87286fd7e9a449 m
Merge pull request #1376 in CATS/clowder from remove-DTS-extraction-stuff to 2.0-work-in-progress
* commit '21d60cbe74a43869bbdfbe2507d3eb9d5641a0e1':
Removed polling of Rabbitmq to collect client information. Extractors now communicate information directly over Rabbitmq. -
Max Burnette <mburnet2@illinois.com> 21d60cbe74a43869bbdfbe2507d3eb9d5641a0e1 m
Removed polling of Rabbitmq to collect client information. Extractors now communicate information directly over Rabbitmq.
- CHANGELOG.md (version 21d60cbe74a43869bbdfbe2507d3eb9d5641a0e1) (diffs)
- app/Global.scala (version 21d60cbe74a43869bbdfbe2507d3eb9d5641a0e1) (diffs)
- app/api/Extractions.scala (version 21d60cbe74a43869bbdfbe2507d3eb9d5641a0e1) (diffs)
- app/controllers/ExtractionInfo.scala (version 21d60cbe74a43869bbdfbe2507d3eb9d5641a0e1) (diffs)
- app/models/ExtractionInfoSetUp.scala (version 21d60cbe74a43869bbdfbe2507d3eb9d5641a0e1) (diffs)
- app/services/ExtractorService.scala (version 21d60cbe74a43869bbdfbe2507d3eb9d5641a0e1) (diffs)
- app/services/mongodb/MongoDBExtractorService.scala (version 21d60cbe74a43869bbdfbe2507d3eb9d5641a0e1) (diffs)
- conf/routes (version 21d60cbe74a43869bbdfbe2507d3eb9d5641a0e1) (diffs)
- test/integration/extractions/ExtractionsAPIAppSpec.scala (version 21d60cbe74a43869bbdfbe2507d3eb9d5641a0e1) (diffs)
- test/unit/extractions/ExtractionHTMLControllerSpec.scala (version 21d60cbe74a43869bbdfbe2507d3eb9d5641a0e1) (diffs)
