Build: #41 failed
Job: default failed
Code commits
clowder
-
Todd Nicholson 29b80e32b5962bc52be4dba12f2200a8f1d8e810
merge, plus removing unused plugins from play.plugins
-
Todd Nicholson eaf03fe64722aca71d928a3a7101386154ee19d4
Merge branch '2.0-work-in-progress' into for-2.0-rabbitmq-service
# Conflicts:
# app/api/Datasets.scala
# app/api/Files.scala
# app/api/Indexes.scala
# app/api/Metadata.scala
# app/api/Status.scala
# app/controllers/Files.scala
# app/services/DI.scala
# app/services/mongodb/MongoDBFileService.scala
# app/services/mongodb/MongoDBMetadataService.scala
# doc/src/sphinx/admin/customizing.rst
# docker/play.plugins -
Todd Nicholson 7f2162c0e79bca798e65c898b48337a3cac89f48 m
Transitioned Polyglot play plugin to guice service.
- app/controllers/Files.scala (version 7f2162c0e79bca798e65c898b48337a3cac89f48) (diffs)
- app/services/FileConvertService.scala (version 7f2162c0e79bca798e65c898b48337a3cac89f48) (diffs)
- app/services/PolyglotPlugin.scala (version 7f2162c0e79bca798e65c898b48337a3cac89f48) (diffs)
- conf/application.conf (version 7f2162c0e79bca798e65c898b48337a3cac89f48) (diffs)
-
Todd Nicholson c41f0ab4fc227137232534b7092208245f1a5e66 m
Replaced VersusPlugin with Guice Service.
- app/api/Files.scala (version c41f0ab4fc227137232534b7092208245f1a5e66) (diffs)
- app/api/Indexes.scala (version c41f0ab4fc227137232534b7092208245f1a5e66) (diffs)
- app/api/Status.scala (version c41f0ab4fc227137232534b7092208245f1a5e66) (diffs)
- app/controllers/Admin.scala (version c41f0ab4fc227137232534b7092208245f1a5e66) (diffs)
- app/controllers/Files.scala (version c41f0ab4fc227137232534b7092208245f1a5e66) (diffs)
- app/controllers/Search.scala (version c41f0ab4fc227137232534b7092208245f1a5e66) (diffs)
- app/services/VersusPlugin.scala (version c41f0ab4fc227137232534b7092208245f1a5e66) (diffs)
- app/services/VersusService.scala (version c41f0ab4fc227137232534b7092208245f1a5e66) (diffs)
- conf/application.conf (version c41f0ab4fc227137232534b7092208245f1a5e66) (diffs)
-
Max Burnette <mburnet2@illinois.com> 3f77fa6bfde63bc7671f5a8e774fb4975a9bd930 m
Conversion of elasticsearch plugin to generic search service, including using queue traits and implementation.
- CHANGELOG.md (version 3f77fa6bfde63bc7671f5a8e774fb4975a9bd930) (diffs)
- app/api/Admin.scala (version 3f77fa6bfde63bc7671f5a8e774fb4975a9bd930) (diffs)
- app/api/Collections.scala (version 3f77fa6bfde63bc7671f5a8e774fb4975a9bd930) (diffs)
- app/api/Comments.scala (version 3f77fa6bfde63bc7671f5a8e774fb4975a9bd930) (diffs)
- app/api/Datasets.scala (version 3f77fa6bfde63bc7671f5a8e774fb4975a9bd930) (diffs)
- app/api/Files.scala (version 3f77fa6bfde63bc7671f5a8e774fb4975a9bd930) (diffs)
- app/api/Metadata.scala (version 3f77fa6bfde63bc7671f5a8e774fb4975a9bd930) (diffs)
- app/api/Search.scala (version 3f77fa6bfde63bc7671f5a8e774fb4975a9bd930) (diffs)
- app/api/Status.scala (version 3f77fa6bfde63bc7671f5a8e774fb4975a9bd930) (diffs)
- app/controllers/Collections.scala (version 3f77fa6bfde63bc7671f5a8e774fb4975a9bd930) (diffs)
- app/controllers/Files.scala (version 3f77fa6bfde63bc7671f5a8e774fb4975a9bd930) (diffs)
- app/controllers/Search.scala (version 3f77fa6bfde63bc7671f5a8e774fb4975a9bd930) (diffs)
- app/controllers/Tags.scala (version 3f77fa6bfde63bc7671f5a8e774fb4975a9bd930) (diffs)
- app/models/ElasticSearchObject.scala (version 3f77fa6bfde63bc7671f5a8e774fb4975a9bd930) (diffs)
- app/models/SearchResults.scala (version 3f77fa6bfde63bc7671f5a8e774fb4975a9bd930) (diffs)
- app/services/DI.scala (version 3f77fa6bfde63bc7671f5a8e774fb4975a9bd930) (diffs)
- app/services/ElasticsearchPlugin.scala (version 3f77fa6bfde63bc7671f5a8e774fb4975a9bd930) (diffs)
- app/services/MemoryQueueService.scala (version 3f77fa6bfde63bc7671f5a8e774fb4975a9bd930) (diffs)
- app/services/QueueService.scala (version 3f77fa6bfde63bc7671f5a8e774fb4975a9bd930) (diffs)
- app/services/SearchService.scala (version 3f77fa6bfde63bc7671f5a8e774fb4975a9bd930) (diffs)
- app/services/elasticsearch/ElasticsearchSearchService.scala (version 3f77fa6bfde63bc7671f5a8e774fb4975a9bd930) (diffs)
- app/services/mongodb/ElasticsearchQueue.scala (version 3f77fa6bfde63bc7671f5a8e774fb4975a9bd930) (diffs)
- app/services/mongodb/MongoDBCollectionService.scala (version 3f77fa6bfde63bc7671f5a8e774fb4975a9bd930) (diffs)
- app/services/mongodb/MongoDBDatasetService.scala (version 3f77fa6bfde63bc7671f5a8e774fb4975a9bd930) (diffs)
- app/services/mongodb/MongoDBFileService.scala (version 3f77fa6bfde63bc7671f5a8e774fb4975a9bd930) (diffs)
- app/services/mongodb/MongoDBMetadataService.scala (version 3f77fa6bfde63bc7671f5a8e774fb4975a9bd930) (diffs)
- app/services/mongodb/MongoDBQueueService.scala (version 3f77fa6bfde63bc7671f5a8e774fb4975a9bd930) (diffs)
- app/util/FileUtils.scala (version 3f77fa6bfde63bc7671f5a8e774fb4975a9bd930) (diffs)
- app/util/SearchUtils.scala (version 3f77fa6bfde63bc7671f5a8e774fb4975a9bd930) (diffs)
- app/views/main.scala.html (version 3f77fa6bfde63bc7671f5a8e774fb4975a9bd930) (diffs)
- conf/application.conf (version 3f77fa6bfde63bc7671f5a8e774fb4975a9bd930) (diffs)
- conf/play.plugins (version 3f77fa6bfde63bc7671f5a8e774fb4975a9bd930) (diffs)
- doc/src/sphinx/admin/customizing.rst (version 3f77fa6bfde63bc7671f5a8e774fb4975a9bd930) (diffs)
- docker/custom.conf (version 3f77fa6bfde63bc7671f5a8e774fb4975a9bd930) (diffs)
- docker/play.plugins (version 3f77fa6bfde63bc7671f5a8e774fb4975a9bd930) (diffs)
-
Max Burnette <mburnet2@illinois.com> aff27e7268d9942c059c5d40d1ab50f41067be93 m
remove or update affected tests
-
Max Burnette <mburnet2@illinois.com> 40d87f9ce755de37a3c209d1caf68d0611a21866 m
fix inadvertent merge change
-
Max Burnette <mburnet2@illinois.com> d723e39143b1afc0b37babea5e54d82aa00c8b8f m
Merge branch '2.0-work-in-progress' into remove-deprecated-API-endpoints
-
Max Burnette <mburnet2@illinois.com> f27d470048e5775767b55645211453e6faefb9ec m
Merge branch 'develop' into remove-deprecated-API-endpoints
-
Max Burnette <mburnet2@illinois.com> 8192798aa3601bb209cb7e3ab91a9f0478df1b07 m
remove IIP code
- app/api/Previews.scala (version 8192798aa3601bb209cb7e3ab91a9f0478df1b07) (diffs)
- app/models/Preview.scala (version 8192798aa3601bb209cb7e3ab91a9f0478df1b07) (diffs)
- app/services/PreviewService.scala (version 8192798aa3601bb209cb7e3ab91a9f0478df1b07) (diffs)
- app/services/mongodb/MongoDBPreviewService.scala (version 8192798aa3601bb209cb7e3ab91a9f0478df1b07) (diffs)
- app/views/extract.scala.html (version 8192798aa3601bb209cb7e3ab91a9f0478df1b07) (diffs)
- app/views/file.scala.html (version 8192798aa3601bb209cb7e3ab91a9f0478df1b07) (diffs)
- conf/routes (version 8192798aa3601bb209cb7e3ab91a9f0478df1b07) (diffs)
- public/javascripts/previewers/iip/package.json (version 8192798aa3601bb209cb7e3ab91a9f0478df1b07) (diffs)
- public/javascripts/previewers/iip/some-library.js (version 8192798aa3601bb209cb7e3ab91a9f0478df1b07) (diffs)
- test/testing-coverage.csv (version 8192798aa3601bb209cb7e3ab91a9f0478df1b07) (diffs)
-
Max Burnette <mburnet2@illinois.com> d708039bf2916e0fed2fcfb418fa69ed7db5ff13 m
remove annotations from preview model
-
Max Burnette <mburnet2@illinois.com> c8cbc189943e5593c4474833548c6d2c478870f9 m
remove reference to Oni file type
-
Luigi Marini 811ebc47530ba271e28f23bea93700f2d462c891 m
Merge pull request #1426 in CATS/clowder from bugfix/CATS-929-counts-on-home-page-are-off to develop
* commit 'de6abc93536817405aa2b53107a285ca087e8b1c':
CATS-929: Fix one instance of improper counters decrementation in api/Files.removeFile. -
Sara Lambert de6abc93536817405aa2b53107a285ca087e8b1c m
CATS-929: Fix one instance of improper counters decrementation in api/Files.removeFile.
-
Sara Lambert b16b022ff940477192f89ab005e562d5b6f3ba27 m
Include length of file in `FileService` when saving the bytes to any backend service. This helps optimize S3 implementation.
- CHANGELOG.md (version b16b022ff940477192f89ab005e562d5b6f3ba27) (diffs)
- app/api/Extractions.scala (version b16b022ff940477192f89ab005e562d5b6f3ba27) (diffs)
- app/api/Geometry.scala (version b16b022ff940477192f89ab005e562d5b6f3ba27) (diffs)
- app/api/Logos.scala (version b16b022ff940477192f89ab005e562d5b6f3ba27) (diffs)
- app/api/Previews.scala (version b16b022ff940477192f89ab005e562d5b6f3ba27) (diffs)
- app/api/ThreeDTexture.scala (version b16b022ff940477192f89ab005e562d5b6f3ba27) (diffs)
- app/api/Thumbnail.scala (version b16b022ff940477192f89ab005e562d5b6f3ba27) (diffs)
- app/api/ZoomIt.scala (version b16b022ff940477192f89ab005e562d5b6f3ba27) (diffs)
- app/controllers/Files.scala (version b16b022ff940477192f89ab005e562d5b6f3ba27) (diffs)
- app/services/ByteStorageService.scala (version b16b022ff940477192f89ab005e562d5b6f3ba27) (diffs)
- app/services/FileService.scala (version b16b022ff940477192f89ab005e562d5b6f3ba27) (diffs)
- app/services/LogoService.scala (version b16b022ff940477192f89ab005e562d5b6f3ba27) (diffs)
- app/services/PreviewService.scala (version b16b022ff940477192f89ab005e562d5b6f3ba27) (diffs)
- app/services/ThreeDService.scala (version b16b022ff940477192f89ab005e562d5b6f3ba27) (diffs)
- app/services/ThumbnailService.scala (version b16b022ff940477192f89ab005e562d5b6f3ba27) (diffs)
- app/services/TileService.scala (version b16b022ff940477192f89ab005e562d5b6f3ba27) (diffs)
- app/services/filesystem/DiskByteStorageService.scala (version b16b022ff940477192f89ab005e562d5b6f3ba27) (diffs)
- app/services/irods/IRODSByteStorageService.scala (version b16b022ff940477192f89ab005e562d5b6f3ba27) (diffs)
- app/services/mongodb/MongoDBByteStorage.scala (version b16b022ff940477192f89ab005e562d5b6f3ba27) (diffs)
- app/services/mongodb/MongoDBFileService.scala (version b16b022ff940477192f89ab005e562d5b6f3ba27) (diffs)
- app/services/mongodb/MongoDBLogoService.scala (version b16b022ff940477192f89ab005e562d5b6f3ba27) (diffs)
- app/services/mongodb/MongoDBPreviewService.scala (version b16b022ff940477192f89ab005e562d5b6f3ba27) (diffs)
- app/services/mongodb/MongoDBThreeDService.scala (version b16b022ff940477192f89ab005e562d5b6f3ba27) (diffs)
- app/services/mongodb/MongoDBThumbnailService.scala (version b16b022ff940477192f89ab005e562d5b6f3ba27) (diffs)
- app/services/mongodb/MongoDBTileService.scala (version b16b022ff940477192f89ab005e562d5b6f3ba27) (diffs)
- app/services/s3/S3ByteStorageService.scala (version b16b022ff940477192f89ab005e562d5b6f3ba27) (diffs)
- app/util/FileUtils.scala (version b16b022ff940477192f89ab005e562d5b6f3ba27) (diffs)
-
Todd Nicholson a6f18d21461c117cf541ee66b8e121dad28f0d38 m
undid changed accidentally committed and pushed
-
Todd Nicholson 58ae1ccfeb2ab54bdcaad061d66f255a10a377a6 m
begin changing rabbitmq plugin to service
added trait rabbitmqservice
changed plugin to service implementation -
Max Burnette <mburnet2@illinois.com> a8e7a1cbacb263325b22b358f883b4e6f195e146 m
remove additional components
- app/api/Files.scala (version a8e7a1cbacb263325b22b358f883b4e6f195e146) (diffs)
- app/api/Users.scala (version a8e7a1cbacb263325b22b358f883b4e6f195e146) (diffs)
- app/controllers/Profile.scala (version a8e7a1cbacb263325b22b358f883b4e6f195e146) (diffs)
- app/models/Stream.scala (version a8e7a1cbacb263325b22b358f883b4e6f195e146) (diffs)
- app/services/UserService.scala (version a8e7a1cbacb263325b22b358f883b4e6f195e146) (diffs)
- conf/routes (version a8e7a1cbacb263325b22b358f883b4e6f195e146) (diffs)
-
Max Burnette <mburnet2@illinois.com> e3172d9a530abda3470f0abcf480ae81f4ea27bd m
remove threeD code
- app/api/Datasets.scala (version e3172d9a530abda3470f0abcf480ae81f4ea27bd) (diffs)
- app/api/Files.scala (version e3172d9a530abda3470f0abcf480ae81f4ea27bd) (diffs)
- app/api/Geometry.scala (version e3172d9a530abda3470f0abcf480ae81f4ea27bd) (diffs)
- app/api/Previews.scala (version e3172d9a530abda3470f0abcf480ae81f4ea27bd) (diffs)
- app/api/ThreeDTexture.scala (version e3172d9a530abda3470f0abcf480ae81f4ea27bd) (diffs)
- app/controllers/Files.scala (version e3172d9a530abda3470f0abcf480ae81f4ea27bd) (diffs)
- app/services/DI.scala (version e3172d9a530abda3470f0abcf480ae81f4ea27bd) (diffs)
- app/services/PreviewService.scala (version e3172d9a530abda3470f0abcf480ae81f4ea27bd) (diffs)
- app/services/ThreeDService.scala (version e3172d9a530abda3470f0abcf480ae81f4ea27bd) (diffs)
- app/services/mongodb/MongoDBFileService.scala (version e3172d9a530abda3470f0abcf480ae81f4ea27bd) (diffs)
- app/services/mongodb/MongoDBPreviewService.scala (version e3172d9a530abda3470f0abcf480ae81f4ea27bd) (diffs)
- app/services/mongodb/MongoDBThreeDService.scala (version e3172d9a530abda3470f0abcf480ae81f4ea27bd) (diffs)
- app/views/file.scala.html (version e3172d9a530abda3470f0abcf480ae81f4ea27bd) (diffs)
- conf/routes (version e3172d9a530abda3470f0abcf480ae81f4ea27bd) (diffs)
-
Max Burnette <mburnet2@illinois.com> d6cf2c243e6a0788222b294d44b846fa51beccd2 m
remove commented out routes
-
Max Burnette <mburnet2@illinois.com> 399f68a30d4a707b53b6c9a8edc6ff542d77c044 m
fix usages of thumbnails.get
- app/views/collections/listchildcollection.scala.html (version 399f68a30d4a707b53b6c9a8edc6ff542d77c044) (diffs)
- app/views/collections/listitem.scala.html (version 399f68a30d4a707b53b6c9a8edc6ff542d77c044) (diffs)
- app/views/collections/tile.scala.html (version 399f68a30d4a707b53b6c9a8edc6ff542d77c044) (diffs)
- app/views/datasets/collections.scala.html (version 399f68a30d4a707b53b6c9a8edc6ff542d77c044) (diffs)
- app/views/datasets/listitem.scala.html (version 399f68a30d4a707b53b6c9a8edc6ff542d77c044) (diffs)
- app/views/datasets/tile.scala.html (version 399f68a30d4a707b53b6c9a8edc6ff542d77c044) (diffs)
- app/views/datasetsContainingFile.scala.html (version 399f68a30d4a707b53b6c9a8edc6ff542d77c044) (diffs)
- app/views/files/listitem.scala.html (version 399f68a30d4a707b53b6c9a8edc6ff542d77c044) (diffs)
- app/views/files/tile.scala.html (version 399f68a30d4a707b53b6c9a8edc6ff542d77c044) (diffs)
- app/views/search/searchResultCollection.scala.html (version 399f68a30d4a707b53b6c9a8edc6ff542d77c044) (diffs)
- app/views/search/searchResultDataset.scala.html (version 399f68a30d4a707b53b6c9a8edc6ff542d77c044) (diffs)
- app/views/search/searchResultFile.scala.html (version 399f68a30d4a707b53b6c9a8edc6ff542d77c044) (diffs)
- app/views/spaces/collectionsTable.scala.html (version 399f68a30d4a707b53b6c9a8edc6ff542d77c044) (diffs)
- app/views/spaces/datasetsTable.scala.html (version 399f68a30d4a707b53b6c9a8edc6ff542d77c044) (diffs)
-
Max Burnette <mburnet2@illinois.com> a64150ef419558dd9c97c65f6540ef0408d0db98 m
initial removal