feat: get app working w/ [email protected]

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

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 &&

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

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

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 => ("?", "?")

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"

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

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)
   }

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

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)),

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)
   }
 

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" : {

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

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

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

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 {

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 ---------------")

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

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

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
     }
 

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

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

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

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

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 {

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

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
   }
 
-
 }
 

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)

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

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._

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