crm# 251120-000827 support shared rims projects

Author: markendr

Dockerfile

@@ -1,7 +1,7 @@
 # ----------------------------------------------------------------------
 # BUILD CLOWDER DIST
 # ----------------------------------------------------------------------
-FROM openjdk:8-jdk-bullseye as clowder-build
+FROM ubuntu:xenial as clowder-build
 
 ARG BRANCH="unknown"
 ARG VERSION="unknown"
@@ -16,7 +16,8 @@ WORKDIR /src
 # install clowder libraries (hopefully cached)
 COPY sbt* /src/
 COPY project /src/project
-RUN ./sbt update
+RUN apt-get update && apt-get -y install openjdk-8-jdk zip \
+    && ./sbt update
 
 # environemnt variables
 ENV BRANCH=${BRANCH} \
@@ -33,7 +34,6 @@ RUN rm -rf target/universal/clowder-*.zip clowder clowder-* \
     && ./sbt dist \
     && unzip -q target/universal/clowder-*.zip \
     && mv clowder-* clowder \
-    && apt-get update && apt-get -y install zip \
     && for x in $(find clowder -name \*.jar); do \
          zip -d $x org/apache/log4j/net/JMSAppender.class org/apache/log4j/net/SocketServer.class | grep 'deleting:' && echo "fixed $x"; \
        done; \
@@ -43,10 +43,10 @@ RUN rm -rf target/universal/clowder-*.zip clowder clowder-* \
 # ----------------------------------------------------------------------
 # BUILD CLOWDER
 # ----------------------------------------------------------------------
-FROM openjdk:8-jre-bullseye as clowder-runtime
+FROM ubuntu:xenial as clowder-runtime
 
 # add bash
-RUN apt-get update && apt-get install -y bash curl bind9
+RUN apt-get update && apt-get install -y openjdk-8-jre wget bash curl bind9
 #RUN apk add --no-cache bash curl
 
 # environemnt variables
@@ -57,7 +57,8 @@ ARG GITSHA1="unknown"
 ENV BRANCH=${BRANCH} \
     VERSION=${VERSION} \
     BUILDNUMBER=${BUILDNUMBER} \
-    GITSHA1=${GITSHA1}
+    GITSHA1=${GITSHA1} \
+    JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64/jre
 
 # expose some properties of the container
 EXPOSE 9000

app/services/PPMSSyncService.scala

@@ -8,6 +8,7 @@ import util.{SpaceConfig, PPMSUtils}
 import play.api.Play._
 import play.api.{ Plugin, Logger, Application }
 import play.libs.Akka
+import scala.collection.mutable.ListBuffer
 import scala.collection.mutable.Map
 import scala.concurrent.duration._
 import play.api.libs.concurrent.Execution.Implicits._
@@ -350,14 +351,29 @@ class PPMSSyncService (application: Application) extends Plugin {
     }
     // get projects
     var numProjects = 0
+    val sharedProjects = new ListBuffer[Int]()
     ppmsCoreids.foreach { ppmsCoreid =>
       val projectsJsonArr = PPMSUtils.getPPMSProjects(ppmsUrl, ppmsPumaApiKey, ppmsGetProjectAction, ppmsCoreid)
       numProjects += projectsJsonArr.value.size
-      projectsJsonArr.value.foreach { projectInfo =>
-        val projId = (projectInfo \ "ProjectRef").as[Int]
+      projectsJsonArr.value.foreach { ppmsProjectInfo =>
+        var projectInfo = ppmsProjectInfo
+        val projId = (ppmsProjectInfo \ "ProjectRef").as[Int]
+        val coreId = (ppmsProjectInfo \ "CoreFacilityRef").as[Int]
         if ( projId >= startingProjectId ) {
-          val projectXtraProfileArr = PPMSUtils.getPPMSExtraProjectProfile(ppmsUrl, ppmsApi2Key, projId, ppmsGetXtraProjectProfileAction)
-          projectXtraProfileArr.value.foreach(syncProject(projectInfo, _))
+          var addProject = true
+          if ( coreId == 0 ) {
+            Logger.info("Shared project: " + projId)
+            addProject = !sharedProjects.contains(projId)
+            if ( addProject ) {
+              Logger.info("Shared project: " + projId + " - using core id: " + ppmsCoreid)
+              projectInfo = ppmsProjectInfo.asInstanceOf[JsObject] + ("CoreFacilityRef" -> JsString(ppmsCoreid))
+              sharedProjects += projId
+            }
+          }
+          if ( addProject ) {
+            val projectXtraProfileArr = PPMSUtils.getPPMSExtraProjectProfile(ppmsUrl, ppmsApi2Key, projId, ppmsGetXtraProjectProfileAction)
+            projectXtraProfileArr.value.foreach(syncProject(projectInfo, _))
+          }
         }
       }
     }

project/Build.scala

@@ -13,7 +13,7 @@ import NativePackagerKeys._
 object ApplicationBuild extends Build {
 
   val appName = "clowder"
-  val version = "1.20.6"
+  val version = "1.20.7"
   val jvm = "1.7"
 
   def appVersion: String = {