From: Richard Millet <remillet@yahoo.com>
Date: Thu, 13 Sep 2018 21:14:04 +0000 (-0700)
Subject: NOJIRA: Adding person, org, and location terms.
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=e080b07afc2587a7aceccd8ea4f62837981d5dae;p=tmp%2Fjakarta-migration.git

NOJIRA: Adding person, org, and location terms.
---

diff --git a/cspace-ui/build.xml b/cspace-ui/build.xml
index 7fc3444e5..8a394507c 100644
--- a/cspace-ui/build.xml
+++ b/cspace-ui/build.xml
@@ -190,6 +190,8 @@
 	-->
 	<target name="download_core">
 		<!-- Core UI -->
+		<echo>Downloading from https://unpkg.com/cspace-ui@${cspace.ui.version}/dist/${cspace.ui.webapp.name}.min.js</echo>
+		
 		<exec executable="curl"	 failonerror="true">
 			<arg line="-o ${cspace.ui.js} --fail --insecure --remote-name --location https://unpkg.com/cspace-ui@${cspace.ui.version}/dist/${cspace.ui.webapp.name}.min.js"/>
 		</exec>
diff --git a/services/jaxb/src/main/resources/relations_common.xsd b/services/jaxb/src/main/resources/relations_common.xsd
index 897a50c8a..923d1d3fd 100644
--- a/services/jaxb/src/main/resources/relations_common.xsd
+++ b/services/jaxb/src/main/resources/relations_common.xsd
@@ -25,6 +25,8 @@
             <xs:sequence>
             	<xs:element name="csid" type="xs:string" />
                         
+                <xs:element name="active" type="xs:boolean" default="true" minOccurs="1" maxOccurs="1"/>     <!-- true=active false=soft-deleted -->
+                        
                 <xs:element name="subjectCsid" type="xs:string"  minOccurs="1" maxOccurs="1"/>     <!-- new name for documentId1 -->
                 <xs:element name="subjectDocumentType" type="xs:string"  minOccurs="1" maxOccurs="1"/>     <!-- new name for documentType1 -->
                 <xs:element name="subjectUri" type="xs:string" minOccurs="1"/>
diff --git a/services/location/client/src/main/java/org/collectionspace/services/client/LocationAuthorityClient.java b/services/location/client/src/main/java/org/collectionspace/services/client/LocationAuthorityClient.java
index efe97c7d6..48238bfe3 100644
--- a/services/location/client/src/main/java/org/collectionspace/services/client/LocationAuthorityClient.java
+++ b/services/location/client/src/main/java/org/collectionspace/services/client/LocationAuthorityClient.java
@@ -90,9 +90,10 @@ public class LocationAuthorityClient extends AuthorityClientImpl<Locationauthori
 		return poxPayloadout.asXML();
 	}
 
+	
 	@Override
 	public String createAuthorityItemInstance(String shortIdentifier, String displayName) {
-		// TODO Auto-generated method stub
-		return null;
+        PoxPayloadOut locationAuthorityInstance = LocationAuthorityClientUtils.createLocationInstance(shortIdentifier, displayName, SERVICE_ITEM_COMMON_PART_NAME);
+        return locationAuthorityInstance.asXML();
 	}
 }
diff --git a/services/location/client/src/main/java/org/collectionspace/services/client/LocationAuthorityClientUtils.java b/services/location/client/src/main/java/org/collectionspace/services/client/LocationAuthorityClientUtils.java
index 1af785628..15b1cb454 100644
--- a/services/location/client/src/main/java/org/collectionspace/services/client/LocationAuthorityClientUtils.java
+++ b/services/location/client/src/main/java/org/collectionspace/services/client/LocationAuthorityClientUtils.java
@@ -3,16 +3,21 @@ package org.collectionspace.services.client;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.MultivaluedMap;
 import javax.ws.rs.core.Response;
-import org.apache.commons.io.FileUtils;
+
 import org.collectionspace.services.LocationJAXBSchema;
+import org.collectionspace.services.PersonJAXBSchema;
 import org.collectionspace.services.client.test.ServiceRequestType;
 import org.collectionspace.services.common.api.Tools;
 import org.collectionspace.services.location.*;
+
+import org.apache.commons.io.FileUtils;
 import org.dom4j.DocumentException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -57,8 +62,10 @@ public class LocationAuthorityClientUtils {
      * @return	The PoxPayloadOut payload for the create call
      */
     public static PoxPayloadOut createLocationInstance( 
-    		String locationAuthRefName, Map<String, String> locationInfo, 
-				List<LocTermGroup> terms, String headerLabel){
+    		String locationAuthRefName,
+    		Map<String, String> locationInfo, 
+		List<LocTermGroup> terms, 
+		String headerLabel) {
         LocationsCommon location = new LocationsCommon();
     	String shortId = locationInfo.get(LocationJAXBSchema.SHORT_IDENTIFIER);
     	String displayName = locationInfo.get(LocationJAXBSchema.DISPLAY_NAME);
@@ -314,4 +321,30 @@ public class LocationAuthorityClientUtils {
         return "id" + new Date().getTime(); 
    }
 
+    public static PoxPayloadOut createLocationInstance(String shortIdentifier, String displayName,
+            String serviceItemCommonPartName) {
+        List<LocTermGroup> terms = getTermGroupInstance(shortIdentifier, displayName);
+        
+        Map<String, String> locationInfo = new HashMap<String, String>();
+        locationInfo.put(PersonJAXBSchema.SHORT_IDENTIFIER, shortIdentifier);
+
+        return createLocationInstance(null, locationInfo, terms, serviceItemCommonPartName);
+    }
+
+    private static List<LocTermGroup> getTermGroupInstance(String shortIdentifier, String displayName) {
+        if (Tools.isBlank(shortIdentifier)) {
+            shortIdentifier = getGeneratedIdentifier();
+        }
+        if (Tools.isBlank(shortIdentifier)) {
+            displayName = shortIdentifier;
+        }
+        
+        List<LocTermGroup> terms = new ArrayList<LocTermGroup>();
+        LocTermGroup term = new LocTermGroup();
+        term.setTermDisplayName(displayName);
+        term.setTermName(shortIdentifier);
+        terms.add(term);
+        return terms;
+    }
+
 }
diff --git a/services/person/client/src/main/java/org/collectionspace/services/client/PersonAuthorityClientUtils.java b/services/person/client/src/main/java/org/collectionspace/services/client/PersonAuthorityClientUtils.java
index 9c85b5687..5462a357a 100644
--- a/services/person/client/src/main/java/org/collectionspace/services/client/PersonAuthorityClientUtils.java
+++ b/services/person/client/src/main/java/org/collectionspace/services/client/PersonAuthorityClientUtils.java
@@ -166,7 +166,7 @@ public class PersonAuthorityClientUtils {
     	personInfo.put(PersonJAXBSchema.SHORT_IDENTIFIER, shortIdentifier);
 
 		return createPersonInstance(null, null, personInfo, terms, null, headerLabel);
-	}    
+	}
     
     /**
      * Creates a person instance.
diff --git a/services/relation/3rdparty/nuxeo-platform-cs-relation/src/main/resources/schemas/relations_common.xsd b/services/relation/3rdparty/nuxeo-platform-cs-relation/src/main/resources/schemas/relations_common.xsd
index 2e25c67fd..d7f86519b 100644
--- a/services/relation/3rdparty/nuxeo-platform-cs-relation/src/main/resources/schemas/relations_common.xsd
+++ b/services/relation/3rdparty/nuxeo-platform-cs-relation/src/main/resources/schemas/relations_common.xsd
@@ -24,6 +24,8 @@
 	<!-- document-id-2 would be the id of the contained (or child) collectionobject -->
 	<!-- document-type-2 would be the doc-type of the collectionobejct -->
 	
+	<xs:element name="active" type="xs:boolean" default="true" minOccurs="1" maxOccurs="1"/>     <!-- true=active false=soft-deleted -->
+	
 	<xs:element name="subjectCsid" type="xs:string" minOccurs="1"
 		maxOccurs="1" />     <!-- new name for documentId1 -->
 	<xs:element name="subjectDocumentType" type="xs:string"