From 56f59d5d4e5c83a477cd185d1304be9bcbec216c Mon Sep 17 00:00:00 2001
From: Jason Han <jason.han@jpl.nasa.gov>
Date: Wed, 3 Oct 2018 12:05:50 -0700
Subject: [PATCH 1/5] Fixing potential infinite loop

---
 .../main/java/gov/nasa/jpl/view_repo/db/PostgresHelper.java   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/mms-ent/repo-amp/src/main/java/gov/nasa/jpl/view_repo/db/PostgresHelper.java b/mms-ent/repo-amp/src/main/java/gov/nasa/jpl/view_repo/db/PostgresHelper.java
index ad539364..77b3d94e 100644
--- a/mms-ent/repo-amp/src/main/java/gov/nasa/jpl/view_repo/db/PostgresHelper.java
+++ b/mms-ent/repo-amp/src/main/java/gov/nasa/jpl/view_repo/db/PostgresHelper.java
@@ -1281,6 +1281,10 @@ public String getImmediateParentOfType(String sysmlId, DbEdgeTypes et, Set<DbNod
 
                     try (ResultSet rs = statement.executeQuery()) {
                         while (rs.next()) {
+                            // Project nodetype elements should not have immediate parents
+                            if (rs.getLong(1) == DbNodeTypes.PROJECT.getValue()) {
+                                return null;
+                            }
                             for (DbNodeTypes dnt : dnts) {
                                 if (dnt.getValue() == rs.getLong(1)) {
                                     return parentId;

From 1fae74da3e1b046fbf44c157aa0e5b73d6e5b19b Mon Sep 17 00:00:00 2001
From: Jason Han <jason.han@jpl.nasa.gov>
Date: Wed, 3 Oct 2018 12:09:31 -0700
Subject: [PATCH 2/5] Bump version

---
 .circleci/config.yml        | 14 +++++++-------
 mms-ent/pom.xml             |  2 +-
 mms-ent/repo-amp/pom.xml    |  2 +-
 mms-ent/repo/pom.xml        |  2 +-
 mms-ent/runner/pom.xml      |  2 +-
 mms-ent/share-amp/pom.xml   |  2 +-
 mms-ent/share/pom.xml       |  2 +-
 mms-ent/solr-config/pom.xml |  2 +-
 8 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 5a4657c5..11a79e31 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -58,25 +58,25 @@ jobs:
           command: ./jfrog rt config --url $ARTIFACTORY_URL --user $ARTIFACTORY_USER --apikey $ARTIFACTORY_APIKEY --interactive false
       - run:
           name: Send mms-amp
-          command: ./jfrog rt u 'mms-ent/repo-amp/target/*.amp' libs-release-local/gov/nasa/jpl/mms/mms-amp/3.4.0/ --build-name=mms-circleci --build-number=$CIRCLE_BUILD_NUM --flat=true
+          command: ./jfrog rt u 'mms-ent/repo-amp/target/*.amp' libs-snapshot-local/gov/nasa/jpl/mms/mms-amp/3.4.1-SNAPSHOT/ --build-name=mms-circleci --build-number=$CIRCLE_BUILD_NUM --flat=true
       - run:
           name: Send mms-share-amp
-          command: ./jfrog rt u 'mms-ent/share-amp/target/*.amp' libs-release-local/gov/nasa/jpl/mms/mms-share-amp/3.4.0/ --build-name=mms-circleci --build-number=$CIRCLE_BUILD_NUM --flat=true
+          command: ./jfrog rt u 'mms-ent/share-amp/target/*.amp' libs-snapshot-local/gov/nasa/jpl/mms/mms-share-amp/3.4.1-SNAPSHOT/ --build-name=mms-circleci --build-number=$CIRCLE_BUILD_NUM --flat=true
       - run:
           name: Send mms java client
-          command: ./jfrog rt u 'mms-ent/repo-amp/target/mms-java-client/mms-java-*.jar' libs-release-local/gov/nasa/jpl/mms/mms-java-client/3.4.0/ --build-name=mms-circleci --build-number=$CIRCLE_BUILD_NUM --flat=true
+          command: ./jfrog rt u 'mms-ent/repo-amp/target/mms-java-client/mms-java-*.jar' libs-snapshot-local/gov/nasa/jpl/mms/mms-java-client/3.4.1-SNAPSHOT/ --build-name=mms-circleci --build-number=$CIRCLE_BUILD_NUM --flat=true
       - run:
           name: Send mms java client
-          command: ./jfrog rt u 'mms-ent/repo-amp/target/mms-java-client/pom.xml' libs-release-local/gov/nasa/jpl/mms/mms-java-client/3.4.0/ --build-name=mms-circleci --build-number=$CIRCLE_BUILD_NUM --flat=true
+          command: ./jfrog rt u 'mms-ent/repo-amp/target/mms-java-client/pom.xml' libs-snapshot-local/gov/nasa/jpl/mms/mms-java-client/3.4.1-SNAPSHOT/ --build-name=mms-circleci --build-number=$CIRCLE_BUILD_NUM --flat=true
       - run:
           name: Send mms python client
-          command: ./jfrog rt u 'mms-ent/repo-amp/target/mms_python_*.zip' libs-release-local/gov/nasa/jpl/mms/mms-python-client/3.4.0/ --build-name=mms-circleci --build-number=$CIRCLE_BUILD_NUM --flat=true
+          command: ./jfrog rt u 'mms-ent/repo-amp/target/mms_python_*.zip' libs-snapshot-local/gov/nasa/jpl/mms/mms-python-client/3.4.1-SNAPSHOT/ --build-name=mms-circleci --build-number=$CIRCLE_BUILD_NUM --flat=true
       - run:
           name: Send mms mathematica client
-          command: ./jfrog rt u 'mms-ent/repo-amp/target/mms-mathematica-*.zip' libs-release-local/gov/nasa/jpl/mms/mms-mathematica-client/3.4.0/ --build-name=mms-circleci --build-number=$CIRCLE_BUILD_NUM --flat=true
+          command: ./jfrog rt u 'mms-ent/repo-amp/target/mms-mathematica-*.zip' libs-snapshot-local/gov/nasa/jpl/mms/mms-mathematica-client/3.4.1-SNAPSHOT/ --build-name=mms-circleci --build-number=$CIRCLE_BUILD_NUM --flat=true
       - run:
           name: Send mms matlab client
-          command: ./jfrog rt u 'mms-ent/repo-amp/target/mms-matlab-*.zip' libs-release-local/gov/nasa/jpl/mms/mms-matlab-client/3.4.0/ --build-name=mms-circleci --build-number=$CIRCLE_BUILD_NUM --flat=true
+          command: ./jfrog rt u 'mms-ent/repo-amp/target/mms-matlab-*.zip' libs-snapshot-local/gov/nasa/jpl/mms/mms-matlab-client/3.4.1-SNAPSHOT/ --build-name=mms-circleci --build-number=$CIRCLE_BUILD_NUM --flat=true
 
 workflows:
   version: 2
diff --git a/mms-ent/pom.xml b/mms-ent/pom.xml
index 8fab76ce..504c0d0f 100755
--- a/mms-ent/pom.xml
+++ b/mms-ent/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>gov.nasa.jpl.mbee</groupId>
     <artifactId>mms-ent</artifactId>
-    <version>3.4.0</version>
+    <version>3.4.1-SNAPSHOT</version>
     <name>Alfresco Repository and Share Quickstart with database and an embedded Tomcat runner.</name>
     <description>This All-in-One project allows to manage all the components involved in Alfresco development (Repo, Share, Solr4, AMPs) in one project
     </description>
diff --git a/mms-ent/repo-amp/pom.xml b/mms-ent/repo-amp/pom.xml
index 4fcb8335..8db54458 100755
--- a/mms-ent/repo-amp/pom.xml
+++ b/mms-ent/repo-amp/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>gov.nasa.jpl.mbee</groupId>
         <artifactId>mms-ent</artifactId>
-        <version>3.4.0</version>
+        <version>3.4.1-SNAPSHOT</version>
     </parent>
 
     <properties>
diff --git a/mms-ent/repo/pom.xml b/mms-ent/repo/pom.xml
index 44839c57..1d7600b5 100755
--- a/mms-ent/repo/pom.xml
+++ b/mms-ent/repo/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>gov.nasa.jpl.mbee</groupId>
         <artifactId>mms-ent</artifactId>
-        <version>3.4.0</version>
+        <version>3.4.1-SNAPSHOT</version>
     </parent>
 
     <properties>
diff --git a/mms-ent/runner/pom.xml b/mms-ent/runner/pom.xml
index 4a30a1db..037d902a 100755
--- a/mms-ent/runner/pom.xml
+++ b/mms-ent/runner/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>gov.nasa.jpl.mbee</groupId>
         <artifactId>mms-ent</artifactId>
-        <version>3.4.0</version>
+        <version>3.4.1-SNAPSHOT</version>
     </parent>
 
     <properties>
diff --git a/mms-ent/share-amp/pom.xml b/mms-ent/share-amp/pom.xml
index 20e1202a..8b88a293 100644
--- a/mms-ent/share-amp/pom.xml
+++ b/mms-ent/share-amp/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>gov.nasa.jpl.mbee</groupId>
         <artifactId>mms-ent</artifactId>
-        <version>3.4.0</version>
+        <version>3.4.1-SNAPSHOT</version>
     </parent>
 
     <!--
diff --git a/mms-ent/share/pom.xml b/mms-ent/share/pom.xml
index cfbfb1dc..2fe839ea 100755
--- a/mms-ent/share/pom.xml
+++ b/mms-ent/share/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>gov.nasa.jpl.mbee</groupId>
         <artifactId>mms-ent</artifactId>
-        <version>3.4.0</version>
+        <version>3.4.1-SNAPSHOT</version>
     </parent>
 
     <properties>
diff --git a/mms-ent/solr-config/pom.xml b/mms-ent/solr-config/pom.xml
index b6035535..ec288d3f 100755
--- a/mms-ent/solr-config/pom.xml
+++ b/mms-ent/solr-config/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>gov.nasa.jpl.mbee</groupId>
         <artifactId>mms-ent</artifactId>
-        <version>3.4.0</version>
+        <version>3.4.1-SNAPSHOT</version>
     </parent>
 
     <!-- Build Solr Configuration only when we run an embedded Tomcat (i.e. profile run is enabled).

From 2a99f28a77ba2887842a67a43333e052de72dc0a Mon Sep 17 00:00:00 2001
From: Jason Han <jason.han@jpl.nasa.gov>
Date: Wed, 3 Oct 2018 13:59:56 -0700
Subject: [PATCH 3/5] Remove owner on project element

---
 .../main/java/gov/nasa/jpl/view_repo/util/CommitUtil.java    | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/mms-ent/repo-amp/src/main/java/gov/nasa/jpl/view_repo/util/CommitUtil.java b/mms-ent/repo-amp/src/main/java/gov/nasa/jpl/view_repo/util/CommitUtil.java
index a1fb3ffa..3d8adb73 100644
--- a/mms-ent/repo-amp/src/main/java/gov/nasa/jpl/view_repo/util/CommitUtil.java
+++ b/mms-ent/repo-amp/src/main/java/gov/nasa/jpl/view_repo/util/CommitUtil.java
@@ -424,6 +424,11 @@ private static boolean processDeltasForDb(JsonObject delta, String projectId, St
                     pgh.deleteEdgesForNode(e.get(Sjm.SYSMLID).getAsString(), false, DbEdgeTypes.VIEW);
                     pgh.deleteEdgesForNode(e.get(Sjm.SYSMLID).getAsString(), false, DbEdgeTypes.CHILDVIEW);
 
+                    if (e.get(Sjm.SYSMLID).getAsString().equalsIgnoreCase(projectId)) {
+                        // Remove owner from project element
+                        e.remove(Sjm.OWNERID);
+                    }
+
                     if (e.has(Sjm.OWNERID) && !e.get(Sjm.OWNERID).isJsonNull() && !e.get(Sjm.SYSMLID).isJsonNull()) {
                         Pair<String, String> p =
                             new Pair<>(e.get(Sjm.OWNERID).getAsString(), e.get(Sjm.SYSMLID).getAsString());

From a56b484035faaedef2c125d1f99ff1cc3622d48b Mon Sep 17 00:00:00 2001
From: "Lam, Doris T" <Doris.T.Lam@jpl.nasa.gov>
Date: Thu, 18 Oct 2018 10:10:35 -0700
Subject: [PATCH 4/5] save ref creating status in elastic

---
 .../java/gov/nasa/jpl/view_repo/webscripts/WorkspacesPost.java   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mms-ent/repo-amp/src/main/java/gov/nasa/jpl/view_repo/webscripts/WorkspacesPost.java b/mms-ent/repo-amp/src/main/java/gov/nasa/jpl/view_repo/webscripts/WorkspacesPost.java
index 399d2ba0..ee41873f 100644
--- a/mms-ent/repo-amp/src/main/java/gov/nasa/jpl/view_repo/webscripts/WorkspacesPost.java
+++ b/mms-ent/repo-amp/src/main/java/gov/nasa/jpl/view_repo/webscripts/WorkspacesPost.java
@@ -245,6 +245,7 @@ public JsonObject createWorkSpace(String projectId, String sourceWorkId, String
             wsJson.addProperty(Sjm.CREATOR, user);
             wsJson.addProperty(Sjm.MODIFIED, date);
             wsJson.addProperty(Sjm.MODIFIER, user);
+            wsJson.addProperty("status", "creating");
             elasticId = emsNodeUtil.insertSingleElastic(wsJson, ElasticHelper.REF);
 
             if (!NO_WORKSPACE_ID.equals(sourceWorkspaceId) && srcWs == null) {

From d40a76bdb1aab7fb36f4f144daeda2f3d4bdcdeb Mon Sep 17 00:00:00 2001
From: Jason Han <jason.han@jpl.nasa.gov>
Date: Fri, 19 Oct 2018 11:53:14 -0700
Subject: [PATCH 5/5] Bump version

---
 .circleci/config.yml        | 14 +++++++-------
 mms-ent/pom.xml             |  2 +-
 mms-ent/repo-amp/pom.xml    |  2 +-
 mms-ent/repo/pom.xml        |  2 +-
 mms-ent/runner/pom.xml      |  2 +-
 mms-ent/share-amp/pom.xml   |  2 +-
 mms-ent/share/pom.xml       |  2 +-
 mms-ent/solr-config/pom.xml |  2 +-
 8 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 11a79e31..81a0e628 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -58,25 +58,25 @@ jobs:
           command: ./jfrog rt config --url $ARTIFACTORY_URL --user $ARTIFACTORY_USER --apikey $ARTIFACTORY_APIKEY --interactive false
       - run:
           name: Send mms-amp
-          command: ./jfrog rt u 'mms-ent/repo-amp/target/*.amp' libs-snapshot-local/gov/nasa/jpl/mms/mms-amp/3.4.1-SNAPSHOT/ --build-name=mms-circleci --build-number=$CIRCLE_BUILD_NUM --flat=true
+          command: ./jfrog rt u 'mms-ent/repo-amp/target/*.amp' libs-release-local/gov/nasa/jpl/mms/mms-amp/3.4.1/ --build-name=mms-circleci --build-number=$CIRCLE_BUILD_NUM --flat=true
       - run:
           name: Send mms-share-amp
-          command: ./jfrog rt u 'mms-ent/share-amp/target/*.amp' libs-snapshot-local/gov/nasa/jpl/mms/mms-share-amp/3.4.1-SNAPSHOT/ --build-name=mms-circleci --build-number=$CIRCLE_BUILD_NUM --flat=true
+          command: ./jfrog rt u 'mms-ent/share-amp/target/*.amp' libs-release-local/gov/nasa/jpl/mms/mms-share-amp/3.4.1/ --build-name=mms-circleci --build-number=$CIRCLE_BUILD_NUM --flat=true
       - run:
           name: Send mms java client
-          command: ./jfrog rt u 'mms-ent/repo-amp/target/mms-java-client/mms-java-*.jar' libs-snapshot-local/gov/nasa/jpl/mms/mms-java-client/3.4.1-SNAPSHOT/ --build-name=mms-circleci --build-number=$CIRCLE_BUILD_NUM --flat=true
+          command: ./jfrog rt u 'mms-ent/repo-amp/target/mms-java-client/mms-java-*.jar' libs-release-local/gov/nasa/jpl/mms/mms-java-client/3.4.1/ --build-name=mms-circleci --build-number=$CIRCLE_BUILD_NUM --flat=true
       - run:
           name: Send mms java client
-          command: ./jfrog rt u 'mms-ent/repo-amp/target/mms-java-client/pom.xml' libs-snapshot-local/gov/nasa/jpl/mms/mms-java-client/3.4.1-SNAPSHOT/ --build-name=mms-circleci --build-number=$CIRCLE_BUILD_NUM --flat=true
+          command: ./jfrog rt u 'mms-ent/repo-amp/target/mms-java-client/pom.xml' libs-release-local/gov/nasa/jpl/mms/mms-java-client/3.4.1/ --build-name=mms-circleci --build-number=$CIRCLE_BUILD_NUM --flat=true
       - run:
           name: Send mms python client
-          command: ./jfrog rt u 'mms-ent/repo-amp/target/mms_python_*.zip' libs-snapshot-local/gov/nasa/jpl/mms/mms-python-client/3.4.1-SNAPSHOT/ --build-name=mms-circleci --build-number=$CIRCLE_BUILD_NUM --flat=true
+          command: ./jfrog rt u 'mms-ent/repo-amp/target/mms_python_*.zip' libs-release-local/gov/nasa/jpl/mms/mms-python-client/3.4.1/ --build-name=mms-circleci --build-number=$CIRCLE_BUILD_NUM --flat=true
       - run:
           name: Send mms mathematica client
-          command: ./jfrog rt u 'mms-ent/repo-amp/target/mms-mathematica-*.zip' libs-snapshot-local/gov/nasa/jpl/mms/mms-mathematica-client/3.4.1-SNAPSHOT/ --build-name=mms-circleci --build-number=$CIRCLE_BUILD_NUM --flat=true
+          command: ./jfrog rt u 'mms-ent/repo-amp/target/mms-mathematica-*.zip' libs-release-local/gov/nasa/jpl/mms/mms-mathematica-client/3.4.1/ --build-name=mms-circleci --build-number=$CIRCLE_BUILD_NUM --flat=true
       - run:
           name: Send mms matlab client
-          command: ./jfrog rt u 'mms-ent/repo-amp/target/mms-matlab-*.zip' libs-snapshot-local/gov/nasa/jpl/mms/mms-matlab-client/3.4.1-SNAPSHOT/ --build-name=mms-circleci --build-number=$CIRCLE_BUILD_NUM --flat=true
+          command: ./jfrog rt u 'mms-ent/repo-amp/target/mms-matlab-*.zip' libs-release-local/gov/nasa/jpl/mms/mms-matlab-client/3.4.1/ --build-name=mms-circleci --build-number=$CIRCLE_BUILD_NUM --flat=true
 
 workflows:
   version: 2
diff --git a/mms-ent/pom.xml b/mms-ent/pom.xml
index 504c0d0f..6af357d1 100755
--- a/mms-ent/pom.xml
+++ b/mms-ent/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>gov.nasa.jpl.mbee</groupId>
     <artifactId>mms-ent</artifactId>
-    <version>3.4.1-SNAPSHOT</version>
+    <version>3.4.1</version>
     <name>Alfresco Repository and Share Quickstart with database and an embedded Tomcat runner.</name>
     <description>This All-in-One project allows to manage all the components involved in Alfresco development (Repo, Share, Solr4, AMPs) in one project
     </description>
diff --git a/mms-ent/repo-amp/pom.xml b/mms-ent/repo-amp/pom.xml
index 8db54458..8381f81b 100755
--- a/mms-ent/repo-amp/pom.xml
+++ b/mms-ent/repo-amp/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>gov.nasa.jpl.mbee</groupId>
         <artifactId>mms-ent</artifactId>
-        <version>3.4.1-SNAPSHOT</version>
+        <version>3.4.1</version>
     </parent>
 
     <properties>
diff --git a/mms-ent/repo/pom.xml b/mms-ent/repo/pom.xml
index 1d7600b5..5ebd6be9 100755
--- a/mms-ent/repo/pom.xml
+++ b/mms-ent/repo/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>gov.nasa.jpl.mbee</groupId>
         <artifactId>mms-ent</artifactId>
-        <version>3.4.1-SNAPSHOT</version>
+        <version>3.4.1</version>
     </parent>
 
     <properties>
diff --git a/mms-ent/runner/pom.xml b/mms-ent/runner/pom.xml
index 037d902a..c1c4ad25 100755
--- a/mms-ent/runner/pom.xml
+++ b/mms-ent/runner/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>gov.nasa.jpl.mbee</groupId>
         <artifactId>mms-ent</artifactId>
-        <version>3.4.1-SNAPSHOT</version>
+        <version>3.4.1</version>
     </parent>
 
     <properties>
diff --git a/mms-ent/share-amp/pom.xml b/mms-ent/share-amp/pom.xml
index 8b88a293..092ff5e7 100644
--- a/mms-ent/share-amp/pom.xml
+++ b/mms-ent/share-amp/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>gov.nasa.jpl.mbee</groupId>
         <artifactId>mms-ent</artifactId>
-        <version>3.4.1-SNAPSHOT</version>
+        <version>3.4.1</version>
     </parent>
 
     <!--
diff --git a/mms-ent/share/pom.xml b/mms-ent/share/pom.xml
index 2fe839ea..eecfc481 100755
--- a/mms-ent/share/pom.xml
+++ b/mms-ent/share/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>gov.nasa.jpl.mbee</groupId>
         <artifactId>mms-ent</artifactId>
-        <version>3.4.1-SNAPSHOT</version>
+        <version>3.4.1</version>
     </parent>
 
     <properties>
diff --git a/mms-ent/solr-config/pom.xml b/mms-ent/solr-config/pom.xml
index ec288d3f..2f40219c 100755
--- a/mms-ent/solr-config/pom.xml
+++ b/mms-ent/solr-config/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>gov.nasa.jpl.mbee</groupId>
         <artifactId>mms-ent</artifactId>
-        <version>3.4.1-SNAPSHOT</version>
+        <version>3.4.1</version>
     </parent>
 
     <!-- Build Solr Configuration only when we run an embedded Tomcat (i.e. profile run is enabled).