From: Richard Millet <richard.millet@berkeley.edu>
Date: Wed, 29 Aug 2012 19:22:34 +0000 (-0700)
Subject: CSPACE-5489: Added "supports hierarchy" field to document handler parameter list... 
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=6aa1dc97c1ff2e96660314c0158cc56799ca37f9;p=tmp%2Fjakarta-migration.git

CSPACE-5489: Added "supports hierarchy" field to document handler parameter list in the tenant bindings schema.  Also added method to check this param in the base class for document handlers."
---

diff --git a/.gitignore b/.gitignore
index c7db4707b..09e375b94 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,7 @@
+.metadata/
+services/collectionobject/sample/sample/.classpath
+services/organization/sample/sample/.classpath
+services/vocabulary/sample/sample/.classpath
 3rdparty/nuxeo/nuxeo-platform-thumbnail/.classpath
 3rdparty/nuxeo/nuxeo-platform-thumbnail/.project
 3rdparty/nuxeo/nuxeo-platform-thumbnail/.settings/
diff --git a/services/collectionobject/sample/sample/.project b/services/collectionobject/sample/sample/.project
index e028f2e15..219f5cff3 100644
--- a/services/collectionobject/sample/sample/.project
+++ b/services/collectionobject/sample/sample/.project
@@ -13,12 +13,12 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.maven.ide.eclipse.maven2Builder</name>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<name>org.maven.ide.eclipse.maven2Builder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
diff --git a/services/common/src/main/java/org/collectionspace/services/common/document/AbstractMultipartDocumentHandlerImpl.java b/services/common/src/main/java/org/collectionspace/services/common/document/AbstractMultipartDocumentHandlerImpl.java
index a8a580ff5..a30a45eef 100644
--- a/services/common/src/main/java/org/collectionspace/services/common/document/AbstractMultipartDocumentHandlerImpl.java
+++ b/services/common/src/main/java/org/collectionspace/services/common/document/AbstractMultipartDocumentHandlerImpl.java
@@ -49,6 +49,13 @@ public abstract class AbstractMultipartDocumentHandlerImpl<T, TL, WT, WTL>
     	//Empty constructor
     }
 
+    /*
+     * By default we won't support object hierarchy
+     */
+    public boolean supportsHierarchy() {
+    	return false;
+    }
+    
     /* (non-Javadoc)
      * @see org.collectionspace.services.common.document.AbstractDocumentHandlerImpl#handleCreate(org.collectionspace.services.common.document.DocumentWrapper)
      */
diff --git a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/DocHandlerBase.java b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/DocHandlerBase.java
index 8bff24172..22c7f1355 100644
--- a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/DocHandlerBase.java
+++ b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/DocHandlerBase.java
@@ -126,17 +126,6 @@ public abstract class DocHandlerBase<T> extends RemoteDocumentModelHandlerImpl<T
         		docModel, label, id, true);
     }
 
-	public DocHandlerParams.Params getDocHandlerParams() throws DocumentException {
-		MultipartServiceContext sc = (MultipartServiceContext) getServiceContext();
-		ServiceBindingType sb = sc.getServiceBinding();
-		DocHandlerParams dhb = sb.getDocHandlerParams();
-		if (dhb != null && dhb.getParams() != null) {
-			return dhb.getParams();
-		}
-		throw new DocumentException("No DocHandlerParams configured for: "
-				+ sb.getName());
-	}
-
     public String getSummaryFields(AbstractCommonList theCommonList) throws DocumentException {
         return getDocHandlerParams().getSummaryFields();
     }
diff --git a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RemoteDocumentModelHandlerImpl.java b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RemoteDocumentModelHandlerImpl.java
index 623a86dc6..1a4271ac7 100644
--- a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RemoteDocumentModelHandlerImpl.java
+++ b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RemoteDocumentModelHandlerImpl.java
@@ -49,6 +49,7 @@ import org.collectionspace.services.common.context.JaxRsContext;
 import org.collectionspace.services.common.context.MultipartServiceContext;
 import org.collectionspace.services.common.context.ServiceContext;
 import org.collectionspace.services.common.document.BadRequestException;
+import org.collectionspace.services.common.document.DocumentException;
 import org.collectionspace.services.common.document.DocumentUtils;
 import org.collectionspace.services.common.document.DocumentWrapper;
 import org.collectionspace.services.common.document.DocumentFilter;
@@ -58,8 +59,10 @@ import org.collectionspace.services.common.storage.jpa.JpaStorageUtils;
 import org.collectionspace.services.common.api.RefNameUtils;
 import org.collectionspace.services.common.vocabulary.RefNameServiceUtils;
 import org.collectionspace.services.common.vocabulary.RefNameServiceUtils.AuthRefConfigInfo;
+import org.collectionspace.services.config.service.DocHandlerParams;
 import org.collectionspace.services.config.service.ListResultField;
 import org.collectionspace.services.config.service.ObjectPartType;
+import org.collectionspace.services.config.service.ServiceBindingType;
 import org.collectionspace.services.nuxeo.util.NuxeoUtils;
 import org.dom4j.Element;
 
@@ -98,6 +101,37 @@ public abstract class   RemoteDocumentModelHandlerImpl<T, TL>
         }
     }
 
+    /*
+     * Returns the document handler parameters that were loaded at startup from the
+     * tenant bindings config file.
+     */
+	public DocHandlerParams.Params getDocHandlerParams() throws DocumentException {
+		MultipartServiceContext sc = (MultipartServiceContext) getServiceContext();
+		ServiceBindingType sb = sc.getServiceBinding();
+		DocHandlerParams dhb = sb.getDocHandlerParams();
+		if (dhb != null && dhb.getParams() != null) {
+			return dhb.getParams();
+		}
+		throw new DocumentException("No DocHandlerParams configured for: "
+				+ sb.getName());
+	}
+    
+    @Override
+    public boolean supportsHierarchy() {
+    	boolean result;
+    	
+    	DocHandlerParams.Params params = null;
+    	try {
+			params = getDocHandlerParams();
+		} catch (DocumentException e) {
+			// TODO Auto-generated catch block
+			logger.error(String.format("Could not get document handler params for class %s", this.getClass().getName()), e);
+		}
+		result = params.isSupportsHierarchy();
+    	
+    	return result;
+    }
+
 	@Override
 	public void handleWorkflowTransition(DocumentWrapper<DocumentModel> wrapDoc, TransitionDef transitionDef)
 			throws Exception {
diff --git a/services/config/src/main/resources/service.xsd b/services/config/src/main/resources/service.xsd
index f059239c0..8726ef87b 100644
--- a/services/config/src/main/resources/service.xsd
+++ b/services/config/src/main/resources/service.xsd
@@ -239,6 +239,7 @@
                 <xs:complexType>
                     <xs:sequence>
                         <xs:element name="SchemaName" type="xs:string" minOccurs="0" maxOccurs="1"/>
+                        <xs:element name="supportsHierarchy" type="xs:boolean" minOccurs="0" maxOccurs="1" default="false"/>
                         <xs:element name="DublinCoreTitle" type="xs:string" minOccurs="0" maxOccurs="1"/>
                         <xs:element name="SummaryFields" type="xs:string" minOccurs="0" maxOccurs="1"/>
                         <xs:element name="AbstractCommonListClassname" type="xs:string" minOccurs="0" maxOccurs="1"/>
diff --git a/services/jaxb/src/main/resources/relations_common.xsd b/services/jaxb/src/main/resources/relations_common.xsd
index 48e5fe1f3..af01c9a15 100644
--- a/services/jaxb/src/main/resources/relations_common.xsd
+++ b/services/jaxb/src/main/resources/relations_common.xsd
@@ -26,6 +26,7 @@
             	<xs:element name="csid" type="xs:string" />            
                 <!-- type of relationship between two entities -->
                 <xs:element name="relationshipType" type="xs:string" minOccurs="1"/>
+                <xs:element name="relationshipMetaType" type="xs:string" minOccurs="0"/>
                 <xs:element name="predicateDisplayName" type="xs:string" minOccurs="1"/>
                 <!--- New Names -->
                 <xs:element name="subjectCsid" type="xs:string"  minOccurs="1" maxOccurs="1"/>     <!-- new name for documentId1 -->
diff --git a/services/organization/sample/sample/.project b/services/organization/sample/sample/.project
index ba16f0f4c..7af1b2789 100644
--- a/services/organization/sample/sample/.project
+++ b/services/organization/sample/sample/.project
@@ -12,12 +12,12 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.maven.ide.eclipse.maven2Builder</name>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<name>org.maven.ide.eclipse.maven2Builder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
diff --git a/services/person/sample/sample/.classpath b/services/person/sample/sample/.classpath
index 68da5cd86..b6fe6934a 100644
--- a/services/person/sample/sample/.classpath
+++ b/services/person/sample/sample/.classpath
@@ -3,7 +3,7 @@
 	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
 	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
 	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/services/person/sample/sample/.project b/services/person/sample/sample/.project
index 7c3143f94..3128252a2 100644
--- a/services/person/sample/sample/.project
+++ b/services/person/sample/sample/.project
@@ -13,12 +13,12 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.maven.ide.eclipse.maven2Builder</name>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<name>org.maven.ide.eclipse.maven2Builder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
diff --git a/services/vocabulary/sample/sample/.project b/services/vocabulary/sample/sample/.project
index 867905504..bdf494a12 100644
--- a/services/vocabulary/sample/sample/.project
+++ b/services/vocabulary/sample/sample/.project
@@ -11,12 +11,12 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.maven.ide.eclipse.maven2Builder</name>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<name>org.maven.ide.eclipse.maven2Builder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>