Merge pull request #245 from Open-MBEE/release/3.2.4

Release/3.2.4
Open-MBEE · Mar 10, 2018 · 80466ef · 80466ef
2 parents 62c60e4 + 4cea71c
commit 80466ef
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 13 deletions.
diff --git 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.2.3</version>
+    <version>3.2.4</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
@@ -10,7 +10,7 @@
     <parent>
         <groupId>gov.nasa.jpl.mbee</groupId>
         <artifactId>mms-ent</artifactId>
-        <version>3.2.3</version>
+        <version>3.2.4</version>
     </parent>
     <repositories>
         <repository>

diff --git a/mms-ent/repo-amp/src/main/java/gov/nasa/jpl/view_repo/util/EmsNodeUtil.java b/mms-ent/repo-amp/src/main/java/gov/nasa/jpl/view_repo/util/EmsNodeUtil.java
@@ -849,6 +849,8 @@ private void reorderChildViews(JSONObject element, JSONArray newElements, JSONAr
                 } else {
                     notAViewList.add(ownedAttribute.getString(Sjm.SYSMLID));
                 }
+            } else if (ownedAttribute != null) {
+                notAViewList.add(ownedAttribute.getString(Sjm.SYSMLID));
             }
         }
 
@@ -962,8 +964,8 @@ private void reorderChildViews(JSONObject element, JSONArray newElements, JSONAr
                         newElements.put(propertyASI);
                         addedElements.put(propertyASI);
                         JSONObject newASI = new JSONObject();
-                        newASI.put(Sjm.SYSMLID, property.getString(Sjm.SYSMLID));
-                        newASI.put(Sjm.ELASTICID, property.getString(Sjm.ELASTICID));
+                        newASI.put(Sjm.SYSMLID, propertyASI.getString(Sjm.SYSMLID));
+                        newASI.put(Sjm.ELASTICID, propertyASI.getString(Sjm.ELASTICID));
                         commitAdded.put(newASI);
 
                         // Create Associations
@@ -1020,8 +1022,8 @@ private void reorderChildViews(JSONObject element, JSONArray newElements, JSONAr
                         newElements.put(association);
                         addedElements.put(association);
                         JSONObject newAssociation = new JSONObject();
-                        newAssociation.put(Sjm.SYSMLID, property.getString(Sjm.SYSMLID));
-                        newAssociation.put(Sjm.ELASTICID, property.getString(Sjm.ELASTICID));
+                        newAssociation.put(Sjm.SYSMLID, association.getString(Sjm.SYSMLID));
+                        newAssociation.put(Sjm.ELASTICID, association.getString(Sjm.ELASTICID));
                         commitAdded.put(newAssociation);
 
                         // Create Association Property
@@ -1077,8 +1079,8 @@ private void reorderChildViews(JSONObject element, JSONArray newElements, JSONAr
                         newElements.put(assocProperty);
                         addedElements.put(assocProperty);
                         JSONObject newAssociationProperty = new JSONObject();
-                        newAssociationProperty.put(Sjm.SYSMLID, property.getString(Sjm.SYSMLID));
-                        newAssociationProperty.put(Sjm.ELASTICID, property.getString(Sjm.ELASTICID));
+                        newAssociationProperty.put(Sjm.SYSMLID, assocProperty.getString(Sjm.SYSMLID));
+                        newAssociationProperty.put(Sjm.ELASTICID, assocProperty.getString(Sjm.ELASTICID));
                         commitAdded.put(newAssociationProperty);
 
                         ownedAttributesIds.put(propertySysmlId);

diff --git 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.2.3</version>
+        <version>3.2.4</version>
     </parent>
 
     <properties>

diff --git 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.2.3</version>
+        <version>3.2.4</version>
     </parent>
 
     <properties>

diff --git 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.2.3</version>
+        <version>3.2.4</version>
     </parent>
 
     <!--

diff --git 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.2.3</version>
+        <version>3.2.4</version>
     </parent>
 
     <properties>

diff --git 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.2.3</version>
+        <version>3.2.4</version>
     </parent>
 
     <!-- Build Solr Configuration only when we run an embedded Tomcat (i.e. profile run is enabled).