diff --git a/README.md b/README.md index 08c16a69a..885d8ffd6 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,11 @@ ![corespring](public/images/logo2015.png) + +# IMPORTANT + +See scripts/build-deploy.sh for information on the patch deploy that is happening for heroku/cloud.mongodb.com + + This project contains the api rest layer and web ui for administering corespring items. ### Prerequisites diff --git a/app/Global.scala b/app/Global.scala index c044d2cfa..a4bf72be6 100644 --- a/app/Global.scala +++ b/app/Global.scala @@ -29,6 +29,13 @@ object Global override def onStart(app: Application): Unit = { + import sys.process._ + println("-----------------------------------------------") + println("java version:") + println(System.getProperty("java.version")) + println(System.getProperty("java.specification.version")) + println(s"exec result ${"java -version" !!}") + println("-----------------------------------------------") CallBlockOnHeaderFilter.block = (rh: RequestHeader) => { if (app.mode != Mode.Prod && diff --git a/app/bootstrap/ItemIndexingDao.scala b/app/bootstrap/ItemIndexingDao.scala index 16520b009..df3cec2b8 100644 --- a/app/bootstrap/ItemIndexingDao.scala +++ b/app/bootstrap/ItemIndexingDao.scala @@ -2,7 +2,7 @@ package bootstrap import com.mongodb.casbah.Imports import com.mongodb.casbah.Imports._ -import com.novus.salat.dao.SalatMongoCursor +import salat.dao.SalatMongoCursor import org.corespring.itemSearch.ItemIndexService import org.corespring.models.item.Item import org.corespring.platform.data.VersioningDao diff --git a/app/bootstrap/Main.scala b/app/bootstrap/Main.scala index b22e34b6e..4bb04bcbd 100644 --- a/app/bootstrap/Main.scala +++ b/app/bootstrap/Main.scala @@ -8,7 +8,7 @@ import com.amazonaws.services.dynamodbv2.AmazonDynamoDBClient import com.amazonaws.services.s3.transfer.TransferManager import com.amazonaws.services.s3.{ AmazonS3, S3ClientOptions } import com.mongodb.casbah.MongoDB -import com.novus.salat.Context +import salat.Context import developer.{ DeveloperConfig, DeveloperModule } import filters.{ BlockingFutureQueuer, CacheFilter, FutureQueuer } import org.bson.types.ObjectId diff --git a/app/web/controllers/Main.scala b/app/web/controllers/Main.scala index 2fbdee30f..bffd1c7d6 100644 --- a/app/web/controllers/Main.scala +++ b/app/web/controllers/Main.scala @@ -142,11 +142,11 @@ class Main( if (!url.contains("@")) { val noAt = """mongodb://(.*)/(.*)""".r val noAt(server, name) = url - (server, name) + (server, name.split("\\?")(0)) } else { val withAt = """.*@(.*)/(.*)""".r val withAt(server, name) = url - (server, name) + (server, name.split("\\?")(0)) } } case None => ("?", "?") diff --git a/conf/mongodb.conf b/conf/mongodb.conf index 0dde2b187..0331bec88 100644 --- a/conf/mongodb.conf +++ b/conf/mongodb.conf @@ -2,6 +2,8 @@ # ~~~~~ # a MongoURI can also be used http://www.mongodb.org/display/DOCS/Connections + +# to add to connection string: maxPoolSize=??&waitQueueMultiple=?? mongodb { default { uri="mongodb://127.0.0.1:27017/api" diff --git a/it/org/corespring/drafts/ItemDraftsCreatePublishIntegrationTest.scala b/it/org/corespring/drafts/ItemDraftsCreatePublishIntegrationTest.scala index 835994238..dba8b0883 100644 --- a/it/org/corespring/drafts/ItemDraftsCreatePublishIntegrationTest.scala +++ b/it/org/corespring/drafts/ItemDraftsCreatePublishIntegrationTest.scala @@ -1,6 +1,6 @@ package org.corespring.drafts -import com.novus.salat.Context +import salat.Context import org.bson.types.ObjectId import org.corespring.drafts.item.{ ItemDraftHelper, S3Paths } import org.corespring.drafts.item.models.DraftId diff --git a/it/org/corespring/it/helpers/CreateDelete.scala b/it/org/corespring/it/helpers/CreateDelete.scala index c01c0b9dd..8e2dd94cc 100644 --- a/it/org/corespring/it/helpers/CreateDelete.scala +++ b/it/org/corespring/it/helpers/CreateDelete.scala @@ -2,7 +2,7 @@ package org.corespring.it.helpers import com.mongodb.casbah.Imports._ import com.mongodb.casbah.commons.MongoDBObject -import com.novus.salat.Context +import salat.Context import grizzled.slf4j.Logger import org.bson.types.ObjectId @@ -15,7 +15,7 @@ private[helpers] trait CreateDelete[A <: AnyRef] { def id(thing: A): ObjectId def create(thing: A)(implicit m: Manifest[A]): ObjectId = { - val grate = com.novus.salat.grater[A] + val grate = salat.grater[A] mongoCollection.save(grate.asDBObject(thing)) id(thing) } diff --git a/it/org/corespring/it/helpers/SubjectHelper.scala b/it/org/corespring/it/helpers/SubjectHelper.scala index f07d18ad0..306c2f245 100644 --- a/it/org/corespring/it/helpers/SubjectHelper.scala +++ b/it/org/corespring/it/helpers/SubjectHelper.scala @@ -2,7 +2,7 @@ package org.corespring.it.helpers import global.Global.main import com.mongodb.casbah.Imports -import com.novus.salat.Context +import salat.Context import org.bson.types.ObjectId import org.corespring.models.Subject import org.corespring.services.salat.bootstrap.CollectionNames diff --git a/it/org/corespring/it/scopes/package.scala b/it/org/corespring/it/scopes/package.scala index 1b5875f9b..aee369905 100644 --- a/it/org/corespring/it/scopes/package.scala +++ b/it/org/corespring/it/scopes/package.scala @@ -3,7 +3,7 @@ package org.corespring.it import global.Global.main import com.amazonaws.services.s3.transfer.{ TransferManager, Upload } import com.mongodb.casbah.commons.MongoDBObject -import com.novus.salat.Context +import salat.Context import grizzled.slf4j.Logger import org.bson.types.ObjectId import org.corespring.drafts.item.ItemDraftHelper @@ -241,7 +241,7 @@ package object scopes { val key = s"${itemId.id}/${itemId.version.getOrElse("0")}/materials/$materialName/$fileName" val sf = StoredFile(name = fileName, contentType = "image/png", storageKey = key) val resource = Resource(name = materialName, files = Seq(sf)) - val dbo = com.novus.salat.grater[Resource].asDBObject(resource) + val dbo = salat.grater[Resource].asDBObject(resource) itemCollection.update( MongoDBObject("_id._id" -> itemId.id, "_id.version" -> itemId.version.getOrElse(0)), diff --git a/it/org/corespring/itemSearch/IndexCalculatorIntegrationTest.scala b/it/org/corespring/itemSearch/IndexCalculatorIntegrationTest.scala index c8471360f..983868bb7 100644 --- a/it/org/corespring/itemSearch/IndexCalculatorIntegrationTest.scala +++ b/it/org/corespring/itemSearch/IndexCalculatorIntegrationTest.scala @@ -1,7 +1,7 @@ package org.corespring.itemSearch import com.mongodb.casbah.Imports._ -import com.novus.salat.Context +import salat.Context import org.corespring.elasticsearch.{ BatchConfig, BatchContentIndexer } import org.corespring.it.helpers._ import org.corespring.it.{ FieldValuesIniter, IntegrationSpecification, ItemIndexCleaner } @@ -68,7 +68,7 @@ class IndexCalculatorIntegrationTest extends IntegrationSpecification { val dbo = com.mongodb.util.JSON.parse(jsonString).asInstanceOf[DBObject] logger.info(s"dbo: $dbo") implicit val nc: Context = main.context - val dboItem = com.novus.salat.grater[Item].asObject(dbo) + val dboItem = salat.grater[Item].asObject(dbo) val item = dboItem.copy(collectionId = collectionId.toString) } diff --git a/it/org/corespring/platform/core/services/ItemServiceIntegrationTest.scala b/it/org/corespring/platform/core/services/ItemServiceIntegrationTest.scala index c97e8b350..dd70b68a7 100644 --- a/it/org/corespring/platform/core/services/ItemServiceIntegrationTest.scala +++ b/it/org/corespring/platform/core/services/ItemServiceIntegrationTest.scala @@ -23,7 +23,7 @@ class ItemServiceIntegrationTest extends IntegrationSpecification { val file = StoredFile("ervin.png", "image/png", false) - val fileDbo = com.novus.salat.grater[BaseFile].asDBObject(file) + val fileDbo = salat.grater[BaseFile].asDBObject(file) val json = s"""{ | "$$addToSet" : { diff --git a/it/org/corespring/v2/api/drafts/item/ItemDraftsApiIntegrationTest.scala b/it/org/corespring/v2/api/drafts/item/ItemDraftsApiIntegrationTest.scala index 948209135..dec6521d5 100644 --- a/it/org/corespring/v2/api/drafts/item/ItemDraftsApiIntegrationTest.scala +++ b/it/org/corespring/v2/api/drafts/item/ItemDraftsApiIntegrationTest.scala @@ -1,7 +1,7 @@ package org.corespring.v2.api.drafts.item import global.Global -import com.novus.salat.Context +import salat.Context import org.corespring.assets.ItemAssetKeys import org.corespring.drafts.item.ItemDraftHelper import org.corespring.drafts.item.models.DraftId diff --git a/it/org/corespring/v2/player/itemDraft/UpdateItemDraftProfileIntegrationTest.scala b/it/org/corespring/v2/player/itemDraft/UpdateItemDraftProfileIntegrationTest.scala index d95c036f4..70d0ebd25 100644 --- a/it/org/corespring/v2/player/itemDraft/UpdateItemDraftProfileIntegrationTest.scala +++ b/it/org/corespring/v2/player/itemDraft/UpdateItemDraftProfileIntegrationTest.scala @@ -1,7 +1,7 @@ package org.corespring.v2.player.itemDraft import global.Global -import com.novus.salat.Context +import salat.Context import org.bson.types.ObjectId import org.corespring.drafts.item.ItemDraftHelper import org.corespring.drafts.item.models.DraftId diff --git a/it/org/corespring/v2/player/supportingMaterials/DraftSupportingMaterialsTest.scala b/it/org/corespring/v2/player/supportingMaterials/DraftSupportingMaterialsTest.scala index 8f777ae7c..338021681 100644 --- a/it/org/corespring/v2/player/supportingMaterials/DraftSupportingMaterialsTest.scala +++ b/it/org/corespring/v2/player/supportingMaterials/DraftSupportingMaterialsTest.scala @@ -1,7 +1,7 @@ package org.corespring.v2.player.supportingMaterials import global.Global -import com.novus.salat.Context +import salat.Context import org.corespring.drafts.item.models.DraftId import org.corespring.drafts.item.{ DraftAssetKeys, ItemDraftHelper } import org.corespring.it.assets.ImageUtils diff --git a/modules/core/salat-config/src/main/scala/org/corespring/salat/config/SalatContext.scala b/modules/core/salat-config/src/main/scala/org/corespring/salat/config/SalatContext.scala index 14b4c1274..839ad320d 100644 --- a/modules/core/salat-config/src/main/scala/org/corespring/salat/config/SalatContext.scala +++ b/modules/core/salat-config/src/main/scala/org/corespring/salat/config/SalatContext.scala @@ -1,6 +1,6 @@ package org.corespring.salat.config -import com.novus.salat.{ TypeHintFrequency, StringTypeHintStrategy, Context } +import salat.{ TypeHintFrequency, StringTypeHintStrategy, Context } class SalatContext(classLoader: ClassLoader) extends Context { diff --git a/modules/core/services-salat/src/it/scala/org/corespring/services/salat/ServicesSalatIntegrationTest.scala b/modules/core/services-salat/src/it/scala/org/corespring/services/salat/ServicesSalatIntegrationTest.scala index 30b23ad37..6a64aaf3e 100644 --- a/modules/core/services-salat/src/it/scala/org/corespring/services/salat/ServicesSalatIntegrationTest.scala +++ b/modules/core/services-salat/src/it/scala/org/corespring/services/salat/ServicesSalatIntegrationTest.scala @@ -2,7 +2,7 @@ package org.corespring.services.salat import com.amazonaws.services.s3.AmazonS3 import com.mongodb.casbah.MongoDB -import com.novus.salat.Context +import salat.Context import grizzled.slf4j.Logger import org.bson.types.ObjectId import org.corespring.models.auth.Permission @@ -27,7 +27,7 @@ trait ServicesSalatIntegrationTest extends Specification with Mockito with Aroun protected val archiveContentCollectionId = ObjectId.get protected val archiveOrgId = ObjectId.get - protected def testMostRecentDateModifiedForSessions(ids:Seq[ObjectId]): Option[DateTime] = None + protected def testMostRecentDateModifiedForSessions(ids: Seq[ObjectId]): Option[DateTime] = None protected def removeAllData() = { logger.info(s"function=removeAllData - dropping db ---------------") diff --git a/modules/core/services-salat/src/main/scala/org/corespring/services/salat/ContentCollectionService.scala b/modules/core/services-salat/src/main/scala/org/corespring/services/salat/ContentCollectionService.scala index c0e592f9e..6ac2ecf0c 100644 --- a/modules/core/services-salat/src/main/scala/org/corespring/services/salat/ContentCollectionService.scala +++ b/modules/core/services-salat/src/main/scala/org/corespring/services/salat/ContentCollectionService.scala @@ -1,8 +1,8 @@ package org.corespring.services.salat import com.mongodb.casbah.Imports._ -import com.novus.salat.Context -import com.novus.salat.dao.{ SalatDAO, SalatDAOUpdateError } +import salat.Context +import salat.dao.{ SalatDAO, SalatDAOUpdateError } import grizzled.slf4j.Logger import org.corespring.errors.{ CollectionInsertError, PlatformServiceError } import org.corespring.models.appConfig.ArchiveConfig diff --git a/modules/core/services-salat/src/main/scala/org/corespring/services/salat/HasDao.scala b/modules/core/services-salat/src/main/scala/org/corespring/services/salat/HasDao.scala index f886fa3f7..bf69ff9d9 100644 --- a/modules/core/services-salat/src/main/scala/org/corespring/services/salat/HasDao.scala +++ b/modules/core/services-salat/src/main/scala/org/corespring/services/salat/HasDao.scala @@ -1,10 +1,10 @@ package org.corespring.services.salat -import com.novus.salat.dao.SalatDAO +import salat.dao.SalatDAO private[salat] trait HasDao[A <: AnyRef, ID <: Any] { - import com.novus.salat._ + import salat._ def dao: SalatDAO[A, ID] implicit def context: Context diff --git a/modules/core/services-salat/src/main/scala/org/corespring/services/salat/OrgCollectionService.scala b/modules/core/services-salat/src/main/scala/org/corespring/services/salat/OrgCollectionService.scala index d26dfcecc..be6e4da59 100644 --- a/modules/core/services-salat/src/main/scala/org/corespring/services/salat/OrgCollectionService.scala +++ b/modules/core/services-salat/src/main/scala/org/corespring/services/salat/OrgCollectionService.scala @@ -2,8 +2,8 @@ package org.corespring.services.salat import com.mongodb.casbah.Imports import com.mongodb.casbah.Imports._ -import com.novus.salat.Context -import com.novus.salat.dao.SalatDAO +import salat.Context +import salat.dao.SalatDAO import grizzled.slf4j.Logger import org.bson.types.ObjectId import org.corespring.errors.PlatformServiceError @@ -262,7 +262,7 @@ class OrgCollectionService(orgService: => org.corespring.services.OrganizationSe import org.corespring.common.mongo.ExpandableDbo.ExpandableDbo for { dboRef <- dbo.expandPath(OrgKeys.contentcolls + ".0") - ref <- Some(com.novus.salat.grater[ContentCollRef].asObject(new MongoDBObject(dboRef))) + ref <- Some(salat.grater[ContentCollRef].asObject(new MongoDBObject(dboRef))) } yield ref } diff --git a/modules/core/services-salat/src/main/scala/org/corespring/services/salat/OrganizationService.scala b/modules/core/services-salat/src/main/scala/org/corespring/services/salat/OrganizationService.scala index 15922afe1..6154e7296 100644 --- a/modules/core/services-salat/src/main/scala/org/corespring/services/salat/OrganizationService.scala +++ b/modules/core/services-salat/src/main/scala/org/corespring/services/salat/OrganizationService.scala @@ -1,8 +1,8 @@ package org.corespring.services.salat import com.mongodb.casbah.Imports._ -import com.novus.salat.dao.{ SalatDAO, SalatRemoveError } -import com.novus.salat.{ Context, grater } +import salat.dao.{ SalatDAO, SalatRemoveError } +import salat.{ Context, grater } import grizzled.slf4j.Logger import org.bson.types.ObjectId import org.corespring.errors.PlatformServiceError diff --git a/modules/core/services-salat/src/main/scala/org/corespring/services/salat/ShareItemWithCollectionsService.scala b/modules/core/services-salat/src/main/scala/org/corespring/services/salat/ShareItemWithCollectionsService.scala index 30245e1bb..3f31504dd 100644 --- a/modules/core/services-salat/src/main/scala/org/corespring/services/salat/ShareItemWithCollectionsService.scala +++ b/modules/core/services-salat/src/main/scala/org/corespring/services/salat/ShareItemWithCollectionsService.scala @@ -1,7 +1,7 @@ package org.corespring.services.salat import com.mongodb.casbah.Imports._ -import com.novus.salat.dao.SalatDAOUpdateError +import salat.dao.SalatDAOUpdateError import grizzled.slf4j.Logger import org.corespring.errors._ import org.corespring.errors.collection.OrgNotAuthorized diff --git a/modules/core/services-salat/src/main/scala/org/corespring/services/salat/StandardService.scala b/modules/core/services-salat/src/main/scala/org/corespring/services/salat/StandardService.scala index 455642f75..d0eb67319 100644 --- a/modules/core/services-salat/src/main/scala/org/corespring/services/salat/StandardService.scala +++ b/modules/core/services-salat/src/main/scala/org/corespring/services/salat/StandardService.scala @@ -2,8 +2,8 @@ package org.corespring.services.salat import com.mongodb.casbah.Imports._ import grizzled.slf4j.Logger -import com.novus.salat.Context -import com.novus.salat.dao.SalatDAO +import salat.Context +import salat.dao.SalatDAO import org.bson.types.ObjectId import org.corespring.models.{ Domain, StandardDomains, Standard } import org.corespring.services.StandardQuery diff --git a/modules/core/services-salat/src/main/scala/org/corespring/services/salat/SubjectService.scala b/modules/core/services-salat/src/main/scala/org/corespring/services/salat/SubjectService.scala index d9ebbf38c..595456c26 100644 --- a/modules/core/services-salat/src/main/scala/org/corespring/services/salat/SubjectService.scala +++ b/modules/core/services-salat/src/main/scala/org/corespring/services/salat/SubjectService.scala @@ -3,8 +3,8 @@ package org.corespring.services.salat import com.mongodb.DBObject import com.mongodb.casbah.WriteConcern import com.mongodb.casbah.commons.{ MongoDBList, MongoDBObject } -import com.novus.salat.Context -import com.novus.salat.dao.SalatDAO +import salat.Context +import salat.dao.SalatDAO import grizzled.slf4j.Logger import org.bson.types.ObjectId import org.corespring.models.Subject diff --git a/modules/core/services-salat/src/main/scala/org/corespring/services/salat/UserService.scala b/modules/core/services-salat/src/main/scala/org/corespring/services/salat/UserService.scala index 65e9b33c5..aed6ea371 100644 --- a/modules/core/services-salat/src/main/scala/org/corespring/services/salat/UserService.scala +++ b/modules/core/services-salat/src/main/scala/org/corespring/services/salat/UserService.scala @@ -2,8 +2,8 @@ package org.corespring.services.salat import com.mongodb.{ WriteConcern, DBObject } import com.mongodb.casbah.commons.MongoDBObject -import com.novus.salat.Context -import com.novus.salat.dao.{ SalatDAO, SalatDAOUpdateError, SalatMongoCursor, SalatRemoveError } +import salat.Context +import salat.dao.{ SalatDAO, SalatDAOUpdateError, SalatMongoCursor, SalatRemoveError } import grizzled.slf4j.Logger import org.bson.types.ObjectId import org.corespring.errors.PlatformServiceError @@ -140,7 +140,7 @@ class UserService( } override def setOrganization(userId: ObjectId, orgId: ObjectId, p: Permission): Validation[PlatformServiceError, Unit] = { - import com.novus.salat.grater + import salat.grater val userOrg = UserOrg(orgId, p.value) try { diff --git a/modules/core/services-salat/src/main/scala/org/corespring/services/salat/assessment/AssessmentService.scala b/modules/core/services-salat/src/main/scala/org/corespring/services/salat/assessment/AssessmentService.scala index a30624cb8..c7c6ded30 100644 --- a/modules/core/services-salat/src/main/scala/org/corespring/services/salat/assessment/AssessmentService.scala +++ b/modules/core/services-salat/src/main/scala/org/corespring/services/salat/assessment/AssessmentService.scala @@ -2,8 +2,8 @@ package org.corespring.services.salat.assessment import com.mongodb.DBObject import com.mongodb.casbah.commons.MongoDBObject -import com.novus.salat.Context -import com.novus.salat.dao.SalatDAO +import salat.Context +import salat.dao.SalatDAO import org.bson.types.ObjectId import org.corespring.models.assessment.{ Answer, Assessment, Participant, Question } import org.corespring.services.salat.HasDao diff --git a/modules/core/services-salat/src/main/scala/org/corespring/services/salat/assessment/AssessmentTemplateService.scala b/modules/core/services-salat/src/main/scala/org/corespring/services/salat/assessment/AssessmentTemplateService.scala index 6d00f8b14..a327f0bad 100644 --- a/modules/core/services-salat/src/main/scala/org/corespring/services/salat/assessment/AssessmentTemplateService.scala +++ b/modules/core/services-salat/src/main/scala/org/corespring/services/salat/assessment/AssessmentTemplateService.scala @@ -2,8 +2,8 @@ package org.corespring.services.salat.assessment import com.mongodb.{ BasicDBObject, DBObject } import com.mongodb.casbah.commons.MongoDBObject -import com.novus.salat.Context -import com.novus.salat.dao.SalatDAO +import salat.Context +import salat.dao.SalatDAO import org.bson.types.ObjectId import org.corespring.models.assessment.AssessmentTemplate import org.corespring.models.assessment.AssessmentTemplate.Keys @@ -17,7 +17,7 @@ class AssessmentTemplateService( extends interface.assessment.AssessmentTemplateService with HasDao[AssessmentTemplate, ObjectId] { - override def findByOrg(orgId:ObjectId): Stream[AssessmentTemplate] = + override def findByOrg(orgId: ObjectId): Stream[AssessmentTemplate] = baseFind(MongoDBObject(Keys.orgId -> orgId)).toStream override def findOneById(id: ObjectId): Option[AssessmentTemplate] = dao.findOneById(id) @@ -42,6 +42,5 @@ class AssessmentTemplateService( dao.find(new MongoDBObject(baseAssessmentTemplateQuery) ++ query, fields).limit(limit).skip(skip).toStream } - } diff --git a/modules/core/services-salat/src/main/scala/org/corespring/services/salat/auth/AccessTokenService.scala b/modules/core/services-salat/src/main/scala/org/corespring/services/salat/auth/AccessTokenService.scala index bf21ea285..0c1be4540 100644 --- a/modules/core/services-salat/src/main/scala/org/corespring/services/salat/auth/AccessTokenService.scala +++ b/modules/core/services-salat/src/main/scala/org/corespring/services/salat/auth/AccessTokenService.scala @@ -2,8 +2,8 @@ package org.corespring.services.salat.auth import com.mongodb.casbah.WriteConcern import com.mongodb.casbah.commons.MongoDBObject -import com.novus.salat.Context -import com.novus.salat.dao.{ SalatDAO, SalatInsertError, SalatRemoveError } +import salat.Context +import salat.dao.{ SalatDAO, SalatInsertError, SalatRemoveError } import grizzled.slf4j.Logger import org.bson.types.ObjectId import org.corespring.errors.{ GeneralError, PlatformServiceError } @@ -92,7 +92,7 @@ class AccessTokenService( override def update(token: AccessToken): Validation[PlatformServiceError, AccessToken] = { logger.debug(s"function=update, token=$token") implicit val ctx = context - val updateDbo = com.novus.salat.grater[AccessToken].asDBObject(token) + val updateDbo = salat.grater[AccessToken].asDBObject(token) val result = dao.update(MongoDBObject("tokenId" -> token.tokenId), updateDbo, upsert = false, multi = false) if (result.getLastError.ok) { Success(token) diff --git a/modules/core/services-salat/src/main/scala/org/corespring/services/salat/auth/ApiClientService.scala b/modules/core/services-salat/src/main/scala/org/corespring/services/salat/auth/ApiClientService.scala index 20163c5f9..e484daef0 100644 --- a/modules/core/services-salat/src/main/scala/org/corespring/services/salat/auth/ApiClientService.scala +++ b/modules/core/services-salat/src/main/scala/org/corespring/services/salat/auth/ApiClientService.scala @@ -1,8 +1,8 @@ package org.corespring.services.salat.auth import com.mongodb.casbah.commons.MongoDBObject -import com.novus.salat.Context -import com.novus.salat.dao.{ SalatDAO, SalatSaveError } +import salat.Context +import salat.dao.{ SalatDAO, SalatSaveError } import grizzled.slf4j.Logger import org.bson.types.ObjectId import org.corespring.models.auth.ApiClient diff --git a/modules/core/services-salat/src/main/scala/org/corespring/services/salat/bootstrap/SalatServices.scala b/modules/core/services-salat/src/main/scala/org/corespring/services/salat/bootstrap/SalatServices.scala index e8963019d..c066d737e 100644 --- a/modules/core/services-salat/src/main/scala/org/corespring/services/salat/bootstrap/SalatServices.scala +++ b/modules/core/services-salat/src/main/scala/org/corespring/services/salat/bootstrap/SalatServices.scala @@ -3,8 +3,8 @@ package org.corespring.services.salat.bootstrap import com.amazonaws.services.s3.AmazonS3 import com.mongodb.casbah.Imports._ import com.mongodb.casbah.commons.conversions.scala.RegisterJodaTimeConversionHelpers -import com.novus.salat.Context -import com.novus.salat.dao.SalatDAO +import salat.Context +import salat.dao.SalatDAO import grizzled.slf4j.Logger import org.bson.types.ObjectId import org.corespring.models._ diff --git a/modules/core/services-salat/src/main/scala/org/corespring/services/salat/item/FieldValueService.scala b/modules/core/services-salat/src/main/scala/org/corespring/services/salat/item/FieldValueService.scala index 991bd1d0a..86b1b02ca 100644 --- a/modules/core/services-salat/src/main/scala/org/corespring/services/salat/item/FieldValueService.scala +++ b/modules/core/services-salat/src/main/scala/org/corespring/services/salat/item/FieldValueService.scala @@ -1,8 +1,8 @@ package org.corespring.services.salat.item import com.mongodb.casbah.commons.MongoDBObject -import com.novus.salat.Context -import com.novus.salat.dao.SalatDAO +import salat.Context +import salat.dao.SalatDAO import org.bson.types.ObjectId import org.corespring.errors.{ GeneralError, PlatformServiceError } import org.corespring.models.item.FieldValue diff --git a/modules/core/services-salat/src/main/scala/org/corespring/services/salat/item/FileTransformer.scala b/modules/core/services-salat/src/main/scala/org/corespring/services/salat/item/FileTransformer.scala index 7f0f0595b..dcbb7d192 100644 --- a/modules/core/services-salat/src/main/scala/org/corespring/services/salat/item/FileTransformer.scala +++ b/modules/core/services-salat/src/main/scala/org/corespring/services/salat/item/FileTransformer.scala @@ -1,6 +1,6 @@ package org.corespring.services.salat.item -import com.novus.salat.transformers.CustomTransformer +import salat.transformers.CustomTransformer import grizzled.slf4j.Logger import com.mongodb.casbah.Imports._ import org.corespring.models.item.resource.{ StoredFile, VirtualFile, BaseFile } diff --git a/modules/core/services-salat/src/main/scala/org/corespring/services/salat/item/ItemService.scala b/modules/core/services-salat/src/main/scala/org/corespring/services/salat/item/ItemService.scala index 96e91a814..ef4f7ecb7 100644 --- a/modules/core/services-salat/src/main/scala/org/corespring/services/salat/item/ItemService.scala +++ b/modules/core/services-salat/src/main/scala/org/corespring/services/salat/item/ItemService.scala @@ -1,7 +1,7 @@ package org.corespring.services.salat.item +import com.mongodb.casbah.{ AggregationOptions, MongoCollection } import com.mongodb.casbah.Imports._ -import com.novus.salat._ import grizzled.slf4j.Logger import org.bson.types.ObjectId import org.corespring.errors.item.{ ItemNotFound, OrgNotAuthorized } @@ -29,7 +29,7 @@ class ItemService( currentCollection: MongoCollection, assets: interface.item.ItemAssetService, orgCollectionService: => interface.OrgCollectionService, - implicit val context: Context, + implicit val context: salat.Context, archiveConfig: ArchiveConfig, salatServicesExecutionContext: SalatServicesExecutionContext) extends interface.item.ItemService with IdConverters { @@ -93,7 +93,7 @@ class ItemService( } override def addFileToPlayerDefinition(itemId: VersionedId[ObjectId], file: StoredFile): Validation[String, Boolean] = { - val dbo = com.novus.salat.grater[StoredFile].asDBObject(file) + val dbo = salat.grater[StoredFile].asDBObject(file) //TODO It was writing to data.playerDefinition before. Is that correct? val update = MongoDBObject("$addToSet" -> MongoDBObject("playerDefinition.files" -> dbo)) val result = dao.update(itemId, update, false) @@ -104,7 +104,7 @@ class ItemService( override def addFileToPlayerDefinition(item: Item, file: StoredFile): Validation[String, Boolean] = addFileToPlayerDefinition(item.id, file) override def removeFileFromPlayerDefinition(itemId: VersionedId[ObjectId], file: StoredFile): Validation[String, Boolean] = { - val dbo = com.novus.salat.grater[StoredFile].asDBObject(file) + val dbo = salat.grater[StoredFile].asDBObject(file) val update = MongoDBObject("$pull" -> MongoDBObject("playerDefinition.files" -> dbo)) val result = dao.update(itemId, update, false) logger.trace(ds(itemId, result)) @@ -190,7 +190,7 @@ class ItemService( } } - private def toVid(dbo: DBObject): VersionedId[ObjectId] = com.novus.salat.grater[VersionedId[ObjectId]].asObject(dbo) + private def toVid(dbo: DBObject): VersionedId[ObjectId] = salat.grater[VersionedId[ObjectId]].asObject(dbo) type CollToVidMap = Map[CollectionIdPermission, Seq[VersionedId[ObjectId]]] @@ -290,8 +290,9 @@ class ItemService( val in: MongoDBObject = ("collectionId" $in collectionIds.map(_.toString)) val matchQuery = MongoDBObject("$match" -> in) val group = MongoDBObject("$group" -> MongoDBObject("_id" -> "$collectionId", "count" -> MongoDBObject("$sum" -> 1))) - val output = currentCollection.aggregate(Seq(matchQuery, group)) - val foundCounts = output.results.toSeq.flatMap(toItemCount) + val opts = AggregationOptions(AggregationOptions.CURSOR) + val output = currentCollection.aggregate(Seq(matchQuery, group), opts) //AggregationOptions(AggregationOptions.CURSOR) ) + val foundCounts = output.toSeq.flatMap(toItemCount) logger.trace(ds(foundCounts)) val emptyCounts = collectionIds.filterNot(id => foundCounts.exists(_.collectionId == id)).map(toEmptyItemCount) logger.trace(ds(emptyCounts)) @@ -366,7 +367,7 @@ class ItemService( (vid -> Failure(PlatformServiceError("No player definition"))) } else { val maybeDef = try { - Some(com.novus.salat.grater[PlayerDefinition].asObject(definition)) + Some(salat.grater[PlayerDefinition].asObject(definition)) } catch { case t: Throwable => { logger.error(t) diff --git a/modules/core/services-salat/src/main/scala/org/corespring/services/salat/item/MongoSupportingMaterialsService.scala b/modules/core/services-salat/src/main/scala/org/corespring/services/salat/item/MongoSupportingMaterialsService.scala index b2ba250ab..fc5ec62ab 100644 --- a/modules/core/services-salat/src/main/scala/org/corespring/services/salat/item/MongoSupportingMaterialsService.scala +++ b/modules/core/services-salat/src/main/scala/org/corespring/services/salat/item/MongoSupportingMaterialsService.scala @@ -2,14 +2,14 @@ package org.corespring.platform.core.services.item import com.mongodb.casbah.Imports._ import com.mongodb.casbah.commons.Logger -import com.novus.salat.{Context, grater} +import salat.{ Context, grater } import org.corespring.common.mongo.ExpandableDbo._ -import org.corespring.models.item.resource.{StoredFileDataStream, BaseFile, Resource, StoredFile} +import org.corespring.models.item.resource.{ StoredFileDataStream, BaseFile, Resource, StoredFile } import org.corespring.platform.core.services.item.MongoSupportingMaterialsService.Errors import org.corespring.services.item.SupportingMaterialsService import scalaz.Scalaz._ -import scalaz.{Failure, Success, Validation} +import scalaz.{ Failure, Success, Validation } private[corespring] object MongoSupportingMaterialsService { object Errors { diff --git a/modules/core/services-salat/src/main/scala/org/corespring/services/salat/item/PlayerDefinitionTransformer.scala b/modules/core/services-salat/src/main/scala/org/corespring/services/salat/item/PlayerDefinitionTransformer.scala index 741ccc6f7..781d906ec 100644 --- a/modules/core/services-salat/src/main/scala/org/corespring/services/salat/item/PlayerDefinitionTransformer.scala +++ b/modules/core/services-salat/src/main/scala/org/corespring/services/salat/item/PlayerDefinitionTransformer.scala @@ -2,7 +2,7 @@ package org.corespring.services.salat.item import com.mongodb.DBObject import com.mongodb.casbah.commons.Logger -import com.novus.salat.transformers.CustomTransformer +import salat.transformers.CustomTransformer import org.corespring.models.item.PlayerDefinition import org.corespring.services.salat.serialization.{ ToJsValue, ToDBObject } import com.mongodb.casbah.Imports._ diff --git a/modules/core/services-salat/src/main/scala/org/corespring/services/salat/metadata/MetadataSetService.scala b/modules/core/services-salat/src/main/scala/org/corespring/services/salat/metadata/MetadataSetService.scala index ae86a68a9..0ca9e58c9 100644 --- a/modules/core/services-salat/src/main/scala/org/corespring/services/salat/metadata/MetadataSetService.scala +++ b/modules/core/services-salat/src/main/scala/org/corespring/services/salat/metadata/MetadataSetService.scala @@ -2,8 +2,8 @@ package org.corespring.services.salat.metadata import com.mongodb.WriteResult import com.mongodb.casbah.commons.MongoDBObject -import com.novus.salat.Context -import com.novus.salat.dao.SalatDAO +import salat.Context +import salat.dao.SalatDAO import grizzled.slf4j.Logger import org.bson.types.ObjectId import org.corespring.models.metadata.MetadataSet diff --git a/modules/core/services-salat/src/main/scala/org/corespring/services/salat/registration/RegistrationTokenService.scala b/modules/core/services-salat/src/main/scala/org/corespring/services/salat/registration/RegistrationTokenService.scala index 0773327ad..20e6ebcd2 100644 --- a/modules/core/services-salat/src/main/scala/org/corespring/services/salat/registration/RegistrationTokenService.scala +++ b/modules/core/services-salat/src/main/scala/org/corespring/services/salat/registration/RegistrationTokenService.scala @@ -1,15 +1,15 @@ package org.corespring.services.salat.registration import com.mongodb.casbah.commons.MongoDBObject -import com.novus.salat.Context -import com.novus.salat.dao.SalatDAO +import salat.Context +import salat.dao.SalatDAO import org.bson.types.ObjectId import org.corespring.models.registration.RegistrationToken -import org.corespring.{services => interface} +import org.corespring.{ services => interface } import org.joda.time.DateTime -class RegistrationTokenService (dao:SalatDAO[RegistrationToken, ObjectId], context:Context) - extends interface.RegistrationTokenService{ +class RegistrationTokenService(dao: SalatDAO[RegistrationToken, ObjectId], context: Context) + extends interface.RegistrationTokenService { override def createToken(token: RegistrationToken): Boolean = { dao.insert(token) diff --git a/modules/core/services-salat/src/main/scala/org/corespring/services/salat/serialization/DboConverters.scala b/modules/core/services-salat/src/main/scala/org/corespring/services/salat/serialization/DboConverters.scala index a463fd0bc..c4b2fd2c9 100644 --- a/modules/core/services-salat/src/main/scala/org/corespring/services/salat/serialization/DboConverters.scala +++ b/modules/core/services-salat/src/main/scala/org/corespring/services/salat/serialization/DboConverters.scala @@ -2,7 +2,7 @@ package org.corespring.services.salat.serialization import com.mongodb.casbah.Implicits.wrapDBObj import com.mongodb.casbah.Imports._ -import com.novus.salat.json.JSONConfig +import salat.json.JSONConfig import java.text.DateFormat import java.util.Date import org.bson.types.BSONTimestamp diff --git a/modules/core/services-salat/src/test/scala/org/corespring/services/salat/ContentCollectionServiceTest.scala b/modules/core/services-salat/src/test/scala/org/corespring/services/salat/ContentCollectionServiceTest.scala index 381cce4b4..26dc1a0af 100644 --- a/modules/core/services-salat/src/test/scala/org/corespring/services/salat/ContentCollectionServiceTest.scala +++ b/modules/core/services-salat/src/test/scala/org/corespring/services/salat/ContentCollectionServiceTest.scala @@ -1,7 +1,7 @@ package org.corespring.services.salat -import com.novus.salat.Context -import com.novus.salat.dao.{ SalatDAO, SalatDAOUpdateError, SalatInsertError, SalatRemoveError } +import salat.Context +import salat.dao.{ SalatDAO, SalatDAOUpdateError, SalatInsertError, SalatRemoveError } import org.bson.types.ObjectId import org.corespring.errors.{ PlatformServiceError, CollectionInsertError, GeneralError } import org.corespring.models.appConfig.ArchiveConfig diff --git a/modules/core/services-salat/src/test/scala/org/corespring/services/salat/ShareItemWithCollectionsServiceTest.scala b/modules/core/services-salat/src/test/scala/org/corespring/services/salat/ShareItemWithCollectionsServiceTest.scala index ed794a527..f808e3953 100644 --- a/modules/core/services-salat/src/test/scala/org/corespring/services/salat/ShareItemWithCollectionsServiceTest.scala +++ b/modules/core/services-salat/src/test/scala/org/corespring/services/salat/ShareItemWithCollectionsServiceTest.scala @@ -1,8 +1,8 @@ package org.corespring.services.salat import com.mongodb.casbah.Imports._ -import com.novus.salat.Context -import com.novus.salat.dao.SalatDAOUpdateError +import salat.Context +import salat.dao.SalatDAOUpdateError import org.bson.types.ObjectId import org.corespring.errors.{ ItemUnShareError, PlatformServiceError } import org.corespring.models.ContentCollection diff --git a/modules/core/services-salat/src/test/scala/org/corespring/services/salat/UserServiceTest.scala b/modules/core/services-salat/src/test/scala/org/corespring/services/salat/UserServiceTest.scala index 33dcfa42d..a23a92d86 100644 --- a/modules/core/services-salat/src/test/scala/org/corespring/services/salat/UserServiceTest.scala +++ b/modules/core/services-salat/src/test/scala/org/corespring/services/salat/UserServiceTest.scala @@ -2,7 +2,7 @@ package org.corespring.services.salat import com.mongodb.{ WriteConcern, DBObject } import com.mongodb.casbah.MongoCollection -import com.novus.salat.dao.{ SalatMongoCursor, SalatDAO } +import salat.dao.{ SalatMongoCursor, SalatDAO } import org.bson.types.ObjectId import org.corespring.errors.PlatformServiceError import org.corespring.models.{ Organization, UserOrg, User } diff --git a/modules/core/services-salat/src/test/scala/org/corespring/services/salat/item/ItemServiceTest.scala b/modules/core/services-salat/src/test/scala/org/corespring/services/salat/item/ItemServiceTest.scala index ee56cf510..c43dc3acd 100644 --- a/modules/core/services-salat/src/test/scala/org/corespring/services/salat/item/ItemServiceTest.scala +++ b/modules/core/services-salat/src/test/scala/org/corespring/services/salat/item/ItemServiceTest.scala @@ -1,7 +1,7 @@ package org.corespring.services.salat.item import com.mongodb.casbah.MongoCollection -import com.novus.salat.Context +import salat.Context import org.bson.types.ObjectId import org.corespring.errors.PlatformServiceError import org.corespring.models.appConfig.ArchiveConfig diff --git a/modules/lib/item-drafts/src/main/scala/org/corespring/drafts/item/ItemDrafts.scala b/modules/lib/item-drafts/src/main/scala/org/corespring/drafts/item/ItemDrafts.scala index fb4e3fb5e..1f8c05ddd 100644 --- a/modules/lib/item-drafts/src/main/scala/org/corespring/drafts/item/ItemDrafts.scala +++ b/modules/lib/item-drafts/src/main/scala/org/corespring/drafts/item/ItemDrafts.scala @@ -2,7 +2,7 @@ package org.corespring.drafts.item import com.mongodb.casbah.commons.MongoDBObject import com.mongodb.{ CommandResult, WriteResult } -import com.novus.salat.Context +import salat.Context import org.bson.types.ObjectId import org.corespring.drafts.errors._ import org.corespring.drafts.item.models._ @@ -30,7 +30,7 @@ class ItemDrafts( draftService: ItemDraftService, commitService: CommitService, assets: ItemDraftAssets, - implicit val context: com.novus.salat.Context) + implicit val context: salat.Context) extends Drafts[DraftId, VersionedId[ObjectId], Item, OrgAndUser, ItemDraft, ItemCommit, ItemDraftIsOutOfDate] with ItemDraftDbUtils { @@ -127,12 +127,11 @@ class ItemDrafts( } for { - canCreate <- - if (userCanCreateDraft(draftId.itemId, user)) { - Success(true) - } else { - Failure(UserCantCreate(user, draftId.itemId)) - } + canCreate <- if (userCanCreateDraft(draftId.itemId, user)) { + Success(true) + } else { + Failure(UserCantCreate(user, draftId.itemId)) + } unpublishedItem <- itemService.getOrCreateUnpublishedVersion( new VersionedId[ObjectId](draftId.itemId, None)).toSuccess(GetUnpublishedItemError(draftId.itemId)) draft <- mkDraft(draftId, unpublishedItem, user) @@ -196,7 +195,6 @@ class ItemDrafts( val pValue = a.pValue != b.pValue val lexile = a.lexile != b.lexile - logger.debug(s"function=hasSrcChanged, taskInfo=$taskInfo, playerDef=$playerDef, supportingMaterials=$supportingMaterials, collectionId=$collectionId") Seq(taskInfo, playerDef, supportingMaterials, collectionId, standards, reviewsPassed, reviewsPassedOther, otherAlignments, contributorDetails, @@ -265,7 +263,7 @@ class ItemDrafts( def addFileToChangeSet(draft: ItemDraft, f: StoredFile): Boolean = { val query = idToDbo(draft.id) - val dbo = com.novus.salat.grater[StoredFile].asDBObject(f) + val dbo = salat.grater[StoredFile].asDBObject(f) val update = MongoDBObject("$addToSet" -> MongoDBObject("change.data.playerDefinition.files" -> dbo)) val result = draftService.collection.update(query, update, false, false) logger.trace(s"function=addFileToChangeSet, draftId=${draft.id}, docsChanged=${result.getN}") @@ -275,7 +273,7 @@ class ItemDrafts( def removeFileFromChangeSet(draftId: DraftId, f: StoredFile): Boolean = { val query = idToDbo(draftId) - val dbo = com.novus.salat.grater[StoredFile].asDBObject(f) + val dbo = salat.grater[StoredFile].asDBObject(f) val update = MongoDBObject("$pull" -> MongoDBObject("change.data.playerDefinition.files" -> dbo)) val result = draftService.collection.update(query, update, false, false) logger.trace(s"function=removeFileFromChangeSet, draftId=${draftId}, docsChanged=${result.getN}") diff --git a/modules/lib/item-drafts/src/main/scala/org/corespring/drafts/item/services/CommitService.scala b/modules/lib/item-drafts/src/main/scala/org/corespring/drafts/item/services/CommitService.scala index e5fb9c48b..80e776ba4 100644 --- a/modules/lib/item-drafts/src/main/scala/org/corespring/drafts/item/services/CommitService.scala +++ b/modules/lib/item-drafts/src/main/scala/org/corespring/drafts/item/services/CommitService.scala @@ -10,9 +10,9 @@ trait CommitService { def collection: MongoCollection - implicit def context : com.novus.salat.Context + implicit def context: salat.Context - import com.novus.salat.grater + import salat.grater private def toCommit(dbo: DBObject): ItemCommit = { grater[ItemCommit].asObject(new MongoDBObject(dbo)) diff --git a/modules/lib/item-drafts/src/main/scala/org/corespring/drafts/item/services/ItemDraftService.scala b/modules/lib/item-drafts/src/main/scala/org/corespring/drafts/item/services/ItemDraftService.scala index 9be89fae5..83a59c479 100644 --- a/modules/lib/item-drafts/src/main/scala/org/corespring/drafts/item/services/ItemDraftService.scala +++ b/modules/lib/item-drafts/src/main/scala/org/corespring/drafts/item/services/ItemDraftService.scala @@ -14,8 +14,8 @@ object ItemDraftConfig { } private[drafts] trait ItemDraftDbUtils { - implicit def context: com.novus.salat.Context - import com.novus.salat.grater + implicit def context: salat.Context + import salat.grater import scala.language.implicitConversions protected def idToDbo(draftId: DraftId): DBObject = { @@ -83,7 +83,7 @@ trait ItemDraftService extends ItemDraftDbUtils { } private def toHeader(dbo: DBObject): ItemDraftHeader = { - import com.novus.salat.grater + import salat.grater val idDbo: BasicDBObject = dbo.expand[BasicDBObject]("_id").getOrElse { throw new RuntimeException(s"Not a db object: ${dbo.get("_id")}") diff --git a/modules/lib/item-drafts/src/test/scala/org/corespring/drafts/item/ItemDraftHelper.scala b/modules/lib/item-drafts/src/test/scala/org/corespring/drafts/item/ItemDraftHelper.scala index ceeb70eba..1d1628f30 100644 --- a/modules/lib/item-drafts/src/test/scala/org/corespring/drafts/item/ItemDraftHelper.scala +++ b/modules/lib/item-drafts/src/test/scala/org/corespring/drafts/item/ItemDraftHelper.scala @@ -1,7 +1,7 @@ package org.corespring.drafts.item import com.mongodb.casbah.Imports._ -import com.novus.salat.Context +import salat.Context import org.corespring.drafts.item.models._ import org.corespring.drafts.item.services.ItemDraftConfig import org.corespring.models.Organization @@ -22,7 +22,7 @@ trait ItemDraftHelper { def create(id: DraftId, itemId: VersionedId[ObjectId], org: Organization): DraftId = { itemService.findOneById(itemId).map { item => val draft = ItemDraft(id, item, OrgAndUser(SimpleOrg(org.id, org.name), None)) - val dbo = com.novus.salat.grater[ItemDraft].asDBObject(draft) + val dbo = salat.grater[ItemDraft].asDBObject(draft) logger.debug(s"function=create, collection=${collection.name}") logger.trace(s"function=create, dbo=$dbo") @@ -40,7 +40,7 @@ trait ItemDraftHelper { collection .findOne(MongoDBObject("_id.itemId" -> id.itemId)) .map { dbo => - val out = com.novus.salat.grater[ItemDraft].asObject(dbo) + val out = salat.grater[ItemDraft].asObject(dbo) out } } diff --git a/modules/lib/item-drafts/src/test/scala/org/corespring/drafts/item/ItemDraftsTest.scala b/modules/lib/item-drafts/src/test/scala/org/corespring/drafts/item/ItemDraftsTest.scala index 0939b549c..0aab49f3b 100644 --- a/modules/lib/item-drafts/src/test/scala/org/corespring/drafts/item/ItemDraftsTest.scala +++ b/modules/lib/item-drafts/src/test/scala/org/corespring/drafts/item/ItemDraftsTest.scala @@ -2,7 +2,7 @@ package org.corespring.drafts.item import com.mongodb.CommandResult import com.mongodb.casbah.Imports._ -import com.novus.salat.Context +import salat.Context import org.bson.types.ObjectId import org.corespring.drafts.errors._ import org.corespring.drafts.item.models._ @@ -170,7 +170,7 @@ class ItemDraftsTest extends Specification with Mockito { "remove" should { class remove(removeSuccessful: Boolean, owns: Boolean, assetsSuccessful: Boolean) extends scope { - draftService.remove(any[DraftId]) returns {if(removeSuccessful) 1 else 0} + draftService.remove(any[DraftId]) returns { if (removeSuccessful) 1 else 0 } draftService.owns(any[OrgAndUser], any[DraftId]) returns owns assets.deleteDraft(any[DraftId]) returns { if (assetsSuccessful) Success(Unit) else Failure(TestError("deleteDraft")) @@ -519,7 +519,7 @@ class ItemDraftsTest extends Specification with Mockito { val expectedQuery = utils.convertToDbo(draft.id) val (q, u) = captureUpdate q.value === expectedQuery - val fileDbo = com.novus.salat.grater[StoredFile].asDBObject(file) + val fileDbo = salat.grater[StoredFile].asDBObject(file) val expectedUpdate = MongoDBObject("$addToSet" -> MongoDBObject("change.data.playerDefinition.files" -> fileDbo)) u.value === expectedUpdate @@ -539,7 +539,7 @@ class ItemDraftsTest extends Specification with Mockito { val expectedQuery = utils.convertToDbo(draft.id) val (q, u) = captureUpdate q.value === expectedQuery - val fileDbo = com.novus.salat.grater[StoredFile].asDBObject(file) + val fileDbo = salat.grater[StoredFile].asDBObject(file) val expectedUpdate = MongoDBObject("$pull" -> MongoDBObject("change.data.playerDefinition.files" -> fileDbo)) u.value === expectedUpdate } diff --git a/modules/lib/item-drafts/src/test/scala/org/corespring/drafts/item/services/ItemDraftServiceTest.scala b/modules/lib/item-drafts/src/test/scala/org/corespring/drafts/item/services/ItemDraftServiceTest.scala index c7327f93d..9dabcecfe 100644 --- a/modules/lib/item-drafts/src/test/scala/org/corespring/drafts/item/services/ItemDraftServiceTest.scala +++ b/modules/lib/item-drafts/src/test/scala/org/corespring/drafts/item/services/ItemDraftServiceTest.scala @@ -2,7 +2,7 @@ package org.corespring.drafts.item.services import com.mongodb.casbah.Imports import com.mongodb.casbah.commons.MongoDBObject -import com.novus.salat.Context +import salat.Context import org.bson.types.ObjectId import org.corespring.drafts.item.models._ import org.corespring.models.item.Item diff --git a/modules/lib/play-json-salat-utils/src/main/scala/org/corespring/play/json/salat/utils/converters.scala b/modules/lib/play-json-salat-utils/src/main/scala/org/corespring/play/json/salat/utils/converters.scala index ad5246072..4c99b5d85 100644 --- a/modules/lib/play-json-salat-utils/src/main/scala/org/corespring/play/json/salat/utils/converters.scala +++ b/modules/lib/play-json-salat-utils/src/main/scala/org/corespring/play/json/salat/utils/converters.scala @@ -2,7 +2,7 @@ package org.corespring.play.json.salat.utils import com.mongodb.casbah.Implicits.wrapDBObj import com.mongodb.casbah.Imports._ -import com.novus.salat.json.JSONConfig +import salat.json.JSONConfig import java.text.DateFormat import java.util.Date import org.bson.types.BSONTimestamp diff --git a/modules/lib/play-json-salat-utils/src/test/scala/org/corespring/play/json/salat/utils/ToJsValueTest.scala b/modules/lib/play-json-salat-utils/src/test/scala/org/corespring/play/json/salat/utils/ToJsValueTest.scala index f0688f3c5..7c3ef02c7 100644 --- a/modules/lib/play-json-salat-utils/src/test/scala/org/corespring/play/json/salat/utils/ToJsValueTest.scala +++ b/modules/lib/play-json-salat-utils/src/test/scala/org/corespring/play/json/salat/utils/ToJsValueTest.scala @@ -3,12 +3,12 @@ package org.corespring.play.json.salat.utils import java.net.URL import java.util.Date -import com.mongodb.casbah.commons.{MongoDBList, MongoDBObject} -import com.novus.salat.json.JSONConfig +import com.mongodb.casbah.commons.{ MongoDBList, MongoDBObject } +import salat.json.JSONConfig import org.bson.types.ObjectId import org.joda.time.DateTime import org.specs2.mutable.Specification -import play.api.libs.json.{JsNull, Json} +import play.api.libs.json.{ JsNull, Json } class ToJsValueTest extends Specification { diff --git a/modules/lib/v2-player-integration/src/main/scala/org/corespring/v2/player/AllItemVersionTransformer.scala b/modules/lib/v2-player-integration/src/main/scala/org/corespring/v2/player/AllItemVersionTransformer.scala index 0abb8058b..03023c294 100644 --- a/modules/lib/v2-player-integration/src/main/scala/org/corespring/v2/player/AllItemVersionTransformer.scala +++ b/modules/lib/v2-player-integration/src/main/scala/org/corespring/v2/player/AllItemVersionTransformer.scala @@ -2,7 +2,7 @@ package org.corespring.v2.player import com.mongodb.casbah.Imports._ import com.mongodb.util.JSON -import com.novus.salat.Context +import salat.Context import org.bson.types.ObjectId import org.corespring.conversion.qti.transformers.{ ItemTransformerConfig, ItemTransformer } import org.corespring.errors.{ GeneralError, PlatformServiceError } @@ -29,7 +29,7 @@ class TransformerItemService(underlying: ItemService, versionedCollection: Mongo override def save(i: Item, createNewVersion: Boolean): Validation[PlatformServiceError, VersionedId[ObjectId]] = { import com.mongodb.casbah.Imports._ - import com.novus.salat._ + import salat._ logger.debug(s"function=save id=${i.id}, id=${i.id.id} version=${i.id.version}") val dbo: MongoDBObject = new MongoDBObject(grater[Item].asDBObject(i)) diff --git a/modules/lib/v2-player-integration/src/main/scala/org/corespring/v2/player/services/item/ItemSupportingMaterialsService.scala b/modules/lib/v2-player-integration/src/main/scala/org/corespring/v2/player/services/item/ItemSupportingMaterialsService.scala index 883e0177a..00908f66c 100644 --- a/modules/lib/v2-player-integration/src/main/scala/org/corespring/v2/player/services/item/ItemSupportingMaterialsService.scala +++ b/modules/lib/v2-player-integration/src/main/scala/org/corespring/v2/player/services/item/ItemSupportingMaterialsService.scala @@ -1,7 +1,7 @@ package org.corespring.v2.player.services.item import com.mongodb.casbah.Imports._ -import com.novus.salat.Context +import salat.Context import org.corespring.drafts.item.models.DraftId import org.corespring.models.appConfig.Bucket import org.corespring.mongo.IdConverters @@ -27,7 +27,7 @@ class MongoDraftSupportingMaterialsService(val collection: MongoCollection, val assets: SupportingMaterialsAssets[DraftId])(implicit val ctx: Context) extends DraftSupportingMaterialsService with MongoSupportingMaterialsService[DraftId] { override def idToDbo(id: DraftId): DBObject = { - val dbo = com.novus.salat.grater[DraftId].asDBObject(id) + val dbo = salat.grater[DraftId].asDBObject(id) MongoDBObject("_id" -> dbo) } override def bucket: String = bucketConfig.bucket diff --git a/modules/web/v1-api/app/org/corespring/api/v1/ContentApi.scala b/modules/web/v1-api/app/org/corespring/api/v1/ContentApi.scala index a976c8f3b..4f226652f 100644 --- a/modules/web/v1-api/app/org/corespring/api/v1/ContentApi.scala +++ b/modules/web/v1-api/app/org/corespring/api/v1/ContentApi.scala @@ -1,8 +1,8 @@ package org.corespring.api.v1 import com.mongodb.casbah.Imports._ -import com.novus.salat.Context -import com.novus.salat.dao.SalatMongoCursor +import salat.Context +import salat.dao.SalatMongoCursor import org.corespring.models.ContentCollection import org.corespring.models.auth.Permission import org.corespring.models.error.CorespringInternalError diff --git a/modules/web/v1-api/app/org/corespring/api/v1/ItemApi.scala b/modules/web/v1-api/app/org/corespring/api/v1/ItemApi.scala index e7f0cd072..827096c8a 100644 --- a/modules/web/v1-api/app/org/corespring/api/v1/ItemApi.scala +++ b/modules/web/v1-api/app/org/corespring/api/v1/ItemApi.scala @@ -3,8 +3,8 @@ package org.corespring.api.v1 import com.mongodb.casbah.Imports import com.mongodb.casbah.Imports._ import com.mongodb.util.JSONParseException -import com.novus.salat.Context -import com.novus.salat.dao.SalatInsertError +import salat.Context +import salat.dao.SalatInsertError import org.bson.types.ObjectId import org.corespring.amazon.s3.S3Service import org.corespring.conversion.qti.transformers.ItemTransformer @@ -143,7 +143,7 @@ class ItemApi( import com.mongodb.casbah.Imports._ service.findFieldsById(id, fields) - .map(dbo => com.novus.salat.grater[Item].asObject[Imports.DBObject](dbo)) + .map(dbo => salat.grater[Item].asObject[Imports.DBObject](dbo)) .map(i => Ok(Json.toJson(i).as[JsObject] + ("latest" -> JsNumber(latestVersion(id))))) .getOrElse(NotFound) } diff --git a/modules/web/v1-api/app/org/corespring/api/v1/SalatContentService.scala b/modules/web/v1-api/app/org/corespring/api/v1/SalatContentService.scala index 03f4b1776..a2d6fb435 100644 --- a/modules/web/v1-api/app/org/corespring/api/v1/SalatContentService.scala +++ b/modules/web/v1-api/app/org/corespring/api/v1/SalatContentService.scala @@ -2,7 +2,7 @@ package org.corespring.api.v1 import com.mongodb.casbah.Imports import com.mongodb.casbah.Imports._ -import com.novus.salat.dao.SalatMongoCursor +import salat.dao.SalatMongoCursor import org.corespring.errors.PlatformServiceError import org.corespring.models.auth.Permission import org.corespring.models.item.{ Content, Item } diff --git a/modules/web/v1-api/app/org/corespring/api/v1/V1ApiModule.scala b/modules/web/v1-api/app/org/corespring/api/v1/V1ApiModule.scala index 55c8ee10c..e0405f323 100644 --- a/modules/web/v1-api/app/org/corespring/api/v1/V1ApiModule.scala +++ b/modules/web/v1-api/app/org/corespring/api/v1/V1ApiModule.scala @@ -1,6 +1,6 @@ package org.corespring.api.v1 -import com.novus.salat.Context +import salat.Context import org.corespring.amazon.s3.S3Service import org.corespring.conversion.qti.transformers.ItemTransformer import org.corespring.models.appConfig.Bucket diff --git a/modules/web/v1-api/test/org/corespring/api/v1/ItemApiTest.scala b/modules/web/v1-api/test/org/corespring/api/v1/ItemApiTest.scala index a30727969..e4ec7d9de 100644 --- a/modules/web/v1-api/test/org/corespring/api/v1/ItemApiTest.scala +++ b/modules/web/v1-api/test/org/corespring/api/v1/ItemApiTest.scala @@ -1,6 +1,6 @@ package org.corespring.api.v1 -import com.novus.salat.Context +import salat.Context import org.bson.types.ObjectId import org.corespring.amazon.s3.S3Service import org.corespring.conversion.qti.transformers.ItemTransformer diff --git a/modules/web/v2-api-drafts/app/org/corespring/v2/api/drafts/item/ItemDraftsModule.scala b/modules/web/v2-api-drafts/app/org/corespring/v2/api/drafts/item/ItemDraftsModule.scala index 19aea1d8a..89e24692d 100644 --- a/modules/web/v2-api-drafts/app/org/corespring/v2/api/drafts/item/ItemDraftsModule.scala +++ b/modules/web/v2-api-drafts/app/org/corespring/v2/api/drafts/item/ItemDraftsModule.scala @@ -2,7 +2,7 @@ package org.corespring.v2.api.drafts.item import com.amazonaws.services.s3.AmazonS3 import com.mongodb.casbah.{ MongoCollection, MongoDB } -import com.novus.salat.Context +import salat.Context import org.corespring.drafts.item.models.OrgAndUser import org.corespring.drafts.item.services.ItemDraftConfig.CollectionNames import org.corespring.drafts.item.services.{ CommitService, ItemDraftService } diff --git a/project/Build.scala b/project/Build.scala index aea65c5e4..902dcc1b0 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -32,9 +32,9 @@ object Build extends sbt.Build { Keys.fork in Test := builders.forkInTests) /** Any shared test helpers in here */ - lazy val testLib = builders.testLib("test-helpers") - .settings(libraryDependencies ++= Seq(specs2 % "test->compile", playFramework, playTest, salatPlay)) - .dependsOn(apiUtils) + // lazy val testLib = builders.testLib("test-helpers") + // .settings(libraryDependencies ++= Seq(specs2 % "test->compile", playFramework, playTest, salatPlay)) + // .dependsOn(apiUtils) lazy val assets = builders.lib("assets") .settings(libraryDependencies ++= Seq( @@ -122,14 +122,14 @@ object Build extends sbt.Build { lazy val itemDrafts = builders.lib("item-drafts") .settings( - libraryDependencies ++= Seq(specs2 % "test", salatVersioningDao, macWireMacro)) - .dependsOn(assets, coreSalatConfig % "compile->test", coreModels, coreServices, drafts, testLib) + libraryDependencies ++= Seq(specs2 % "test", macWireMacro)) + .dependsOn(assets, coreSalatConfig % "compile->test", coreModels, coreServices, drafts) .aggregate(coreModels, drafts) lazy val qtiToV2 = builders.lib("qti-to-v2") .settings( libraryDependencies ++= Seq(playJson, rhino % "test", qti, qtiConverter)) - .dependsOn(coreModels, coreServices, coreUtils, coreJson, apiUtils, testLib % "test->compile") + .dependsOn(coreModels, coreServices, coreUtils, coreJson, apiUtils) /** * Error types @@ -142,7 +142,7 @@ object Build extends sbt.Build { lazy val v2SessionDb = builders.lib("v2-session-db") .settings( libraryDependencies ++= Seq(specs2 % "test", mockito, scalaz, sessionServiceClient)) - .dependsOn(testLib, v2Errors, qtiToV2, itemDrafts) + .dependsOn(v2Errors, qtiToV2, itemDrafts) /** * All authentication code for v2 api + player/editor @@ -150,7 +150,7 @@ object Build extends sbt.Build { lazy val v2Auth = builders.lib("v2-auth") .settings( libraryDependencies ++= Seq(specs2 % "test", mockito, scalaz, sprayCaching, grizzledLog)) - .dependsOn(coreModels, coreServices, coreWeb, coreJson, testLib, v2Errors, qtiToV2, itemDrafts, v2SessionDb, encryption) + .dependsOn(coreModels, coreServices, coreWeb, coreJson, v2Errors, qtiToV2, itemDrafts, v2SessionDb, encryption) lazy val v2Actions = builders.lib("v2-actions") .settings( @@ -159,16 +159,16 @@ object Build extends sbt.Build { lazy val apiTracking = builders.lib("api-tracking") .settings( libraryDependencies ++= Seq(containerClientWeb, playFramework)).dependsOn(v2Auth) - .dependsOn(coreServices, v2Errors, testLib % "test->compile") + .dependsOn(coreServices, v2Errors) lazy val itemImport = builders.web("item-import") .settings( libraryDependencies ++= Seq( playJson, jsonValidator, salatVersioningDao, mockito, macWireMacro, macWireRuntime)) - .dependsOn(coreJson, coreServices, v2Auth, testLib % "test->compile") + .dependsOn(coreJson, coreServices, v2Auth) lazy val draftsApi = builders.web("v2-api-drafts") - .dependsOn(coreJson, itemDrafts, testLib % "test->test") + .dependsOn(coreJson, itemDrafts) lazy val v2Api = builders.web("v2-api") .settings( @@ -229,7 +229,6 @@ object Build extends sbt.Build { .dependsOn( apiUtils, qtiToV2, - testLib, v2Auth % "test->test;compile->compile", coreJson % "test->test;compile->compile", coreModels, @@ -289,7 +288,6 @@ object Build extends sbt.Build { coreJson, apiUtils, commonViews, - testLib % "test->compile;test->test;it->test", v2PlayerIntegration, v2Actions % "test->test;compile->compile", v1Api, @@ -317,7 +315,6 @@ object Build extends sbt.Build { itemDrafts, itemImport, qtiToV2, - testLib, v1Api, v2Api, v2Auth, diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 6dbe46511..3205366e8 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -27,7 +27,7 @@ object Dependencies { val amapClient = "com.rabbitmq" % "amqp-client" % "3.0.2" val assetsLoader = ("com.ee" %% "assets-loader" % "0.12.5").exclude("com.yahoo.platform.yui", "yuicompressor") val aws = "com.amazonaws" % "aws-java-sdk" % "1.10.0" - val casbah = "org.mongodb" %% "casbah" % "2.6.3" + val casbah = "org.mongodb" %% "casbah" % "2.8.2" val closureCompiler = ("com.google.javascript" % "closure-compiler" % "rr2079.1" notTransitive ()).exclude("args4j", "args4j").exclude("com.google.guava", "guava").exclude("org.json", "json").exclude("com.google.protobuf", "protobuf-java").exclude("org.apache.ant", "ant").exclude("com.google.code.findbugs", "jsr305").exclude("com.googlecode.jarjar", "jarjar").exclude("junit", "junit") val commonsCodec = "commons-codec" % "commons-codec" % "1.10" val commonsIo = "commons-io" % "commons-io" % "2.4" @@ -60,9 +60,9 @@ object Dependencies { val qtiConverter = "org.corespring" %% "qti-corespring-converter" % qtiVersion val rhino = "org.mozilla" % "rhino" % "1.7R4" val rhinos = "org.corespring.forks.scalapeno" %% "rhinos" % "0.6.1" - val salat = "com.novus" %% "salat" % "1.9.4" - val salatPlay = "se.radley" %% "play-plugins-salat" % "1.4.0" - val salatVersioningDao = "org.corespring" %% "salat-versioning-dao" % "0.21.0" + val salat = "com.github.salat" %% "salat" % "1.10.0" + val salatPlay = "org.corespring" %% "play-plugins-salat" % "2.0.0" + val salatVersioningDao = "org.corespring" %% "salat-versioning-dao" % "1.0.0" exclude ("org.scala-lang", "scala-library") val scalaFaker = "it.justwrote" %% "scala-faker" % "0.2" val scalaz = "org.scalaz" %% "scalaz-core" % "7.0.6" val scalazContrib = "org.typelevel" %% "scalaz-contrib-210" % "0.1.5" diff --git a/scripts/build-deploy.sh b/scripts/build-deploy.sh index 0e1eba7b7..5511adfff 100644 --- a/scripts/build-deploy.sh +++ b/scripts/build-deploy.sh @@ -1,12 +1,25 @@ -# TODO: flesh out.... +### +# We are patch fixing the app. +# The latest fix points to cloud mongodb +# We point to jdk 1.8 here - but at runtime it's not used (cos cbt isn't packing it correctly) +# The app falls back to the heroku jdk 1.7.0_201 - This version of 1.7 has the cert fix we need +# to make a mongo db connection see: https://docs.atlas.mongodb.com/reference/faq/security/#java-users +# +# We could look at fixing cbt to package 1.8 correctly so that it is picked up, +# but because this is just a patch fix and this app will be decommissioned soon it's +# probably not with the effort. +# Instead we'll live with this weird setup where we add 1.8 to the slug, knowing that it won't work +# +### + play universal:packageZipTarball cbt slug-mk-from-artifact-file \ --artifact-file target/universal/corespring-root-$VERSION.tgz \ ---out-path target/slug-$VERSION.tgz --platform jdk-1.7 +--out-path target/slug-$VERSION.tgz --platform jdk-1.8 cbt slug-deploy-from-file \ --heroku-app=$APP \ ---slug-file target/slug-7.9.12.tgz \ No newline at end of file +--slug-file target/slug-$VERSION.tgz \ No newline at end of file diff --git a/version.sbt b/version.sbt index 7feb32410..763032974 100644 --- a/version.sbt +++ b/version.sbt @@ -1 +1 @@ -version in ThisBuild := "7.9.19" +version in ThisBuild := "8.1.2" diff --git a/worksheets/user-reg.sc b/worksheets/user-reg.sc index 143d71c60..40a22cbb7 100644 --- a/worksheets/user-reg.sc +++ b/worksheets/user-reg.sc @@ -8,7 +8,7 @@ import java.io.File import com.amazonaws.auth.AWSCredentials import com.amazonaws.services.s3.{AmazonS3Client, AmazonS3} import com.mongodb.casbah.{MongoConnection, MongoURI, MongoDB} -import com.novus.salat.Context +import salat.Context import org.bson.types.ObjectId import org.corespring.hash.BCryptHasher import org.corespring.models.appConfig.{ArchiveConfig, Bucket, AccessTokenConfig}