From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Fri, 3 May 2013 22:50:26 +0000 (-0700)
Subject: CSPACE-5989: Minor fixes to comments. Removed whitespace diffs that previously had... 
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=a55ea5530bfed4fbe8516d6651557fbe2582bc8a;p=tmp%2Fjakarta-migration.git

CSPACE-5989: Minor fixes to comments. Removed whitespace diffs that previously had resulted from reformatting the lifesci tenant bindings delta file.
---

diff --git a/services/common/src/main/cspace/config/services/tenants/lifesci/tenant-bindings.delta.xml b/services/common/src/main/cspace/config/services/tenants/lifesci/tenant-bindings.delta.xml
index 2de5a104b..385d81f2d 100644
--- a/services/common/src/main/cspace/config/services/tenants/lifesci/tenant-bindings.delta.xml
+++ b/services/common/src/main/cspace/config/services/tenants/lifesci/tenant-bindings.delta.xml
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <tenant:TenantBindingConfig
-    xmlns:merge='http://xmlmerge.el4j.elca.ch'
-    xmlns:tenant='http://collectionspace.org/services/config/tenant'>
-             
-    <tenant:tenantBinding id="2" name="lifesci.collectionspace.org" displayName="Life Sciences/Natural History Demo Tenant" version="0.1">
+	xmlns:merge='http://xmlmerge.el4j.elca.ch'
+	xmlns:tenant='http://collectionspace.org/services/config/tenant'>
+	    	 
+  <tenant:tenantBinding id="2" name="lifesci.collectionspace.org" displayName="Life Sciences/Natural History Demo Tenant" version="0.1">
+
+    <tenant:repositoryDomain name="default-domain" storageName="lifesci_domain" repositoryName="lifesci_domain" repositoryClient="nuxeo-java" />
 
-        <tenant:repositoryDomain name="default-domain" storageName="lifesci_domain" repositoryName="lifesci_domain" repositoryClient="nuxeo-java" />
- 
         <!--
-            Uncomment any setting(s) below to override system default values.
+            Uncomment any setting(s) in the tenant:properties section below
+            to override system default values.
             See tenant-bindings-proto.xml for explanation of these settings.
         -->
         <tenant:properties>
@@ -27,116 +28,116 @@
             </types:item>
             -->
         </tenant:properties>
-    
-        <tenant:serviceBindings merge:matcher="id" id="CollectionObjects">
-            <service:DocHandlerParams xmlns:service="http://collectionspace.org/services/config/service">
-                <service:params>
-                    <service:ListResultsFields>
-                        <service:ListResultField merge:matcher="skip" merge:action="insert" >
-                            <service:element>taxon</service:element>
-                            <service:schema>collectionobjects_naturalhistory</service:schema>
-                            <service:xpath>taxonomicIdentGroupList/[0]/taxon</service:xpath>
-                        </service:ListResultField>
-                    </service:ListResultsFields>
-                </service:params>
-            </service:DocHandlerParams>
+	
+	<tenant:serviceBindings merge:matcher="id" id="CollectionObjects">
+    <service:DocHandlerParams xmlns:service="http://collectionspace.org/services/config/service">
+			<service:params>
+				<service:ListResultsFields>
+					<service:ListResultField merge:matcher="skip" merge:action="insert" >
+              <service:element>taxon</service:element>
+              <service:schema>collectionobjects_naturalhistory</service:schema>
+							<service:xpath>taxonomicIdentGroupList/[0]/taxon</service:xpath>
+            </service:ListResultField>
+				</service:ListResultsFields>
+			</service:params>
+    </service:DocHandlerParams>
 
-            <service:object xmlns:service="http://collectionspace.org/services/config/service" >
-                <service:part id="3" merge:matcher="skip" merge:action="insert" control_group="Managed" versionable="true" auditable="false" label="collectionobjects_naturalhistory" updated="" order="3">
-                    <!-- Include authRefs for fields in the added schema -->
-                    <service:properties>
-                        <types:item xmlns:types="http://collectionspace.org/services/config/types">
-                            <types:key>authRef</types:key>
-                            <types:value>taxonomicIdentGroupList/*/taxon</types:value>
-                        </types:item>
-                        <types:item xmlns:types="http://collectionspace.org/services/config/types">
-                            <types:key>authRef</types:key>
-                            <types:value>associatedTaxaGroupList/*/taxon</types:value>
-                        </types:item>
-                        <types:item xmlns:types="http://collectionspace.org/services/config/types">
-                            <types:key>authRef</types:key>
-                            <types:value>taxonomicIdentGroupList/*/identBy</types:value>
-                        </types:item>
-                        <types:item xmlns:types="http://collectionspace.org/services/config/types">
-                            <types:key>authRef</types:key>
-                            <types:value>taxonomicIdentGroupList/*/institution</types:value>
-                        </types:item>
-                        <!--
-                       <types:item xmlns:types="http://collectionspace.org/services/config/types">
-                           <types:key>authRef</types:key>
-                           <types:value>annotationGroupList/*/annotationAuthor</types:value>
-                       </types:item>
-                        -->
-                    </service:properties>
-                    <service:content contentType="application/xml">
-                        <service:xmlContent namespaceURI="http://collectionspace.org/services/collectionobject/domain/naturalhistory" schemaLocation="http://collectionspace.org/services/collectionobject/domain/naturalhistory http://collectionspace.org/services/collectionobject/domain/collectionobjects_naturalhistory.xsd" />
-                    </service:content>
-                </service:part>
-            </service:object>
+		<service:object xmlns:service="http://collectionspace.org/services/config/service" >
+			<service:part id="3" merge:matcher="skip" merge:action="insert" control_group="Managed" versionable="true" auditable="false" label="collectionobjects_naturalhistory" updated="" order="3">
+				<!-- Include authRefs for fields in the added schema -->
+				<service:properties>
+					<types:item xmlns:types="http://collectionspace.org/services/config/types">
+						<types:key>authRef</types:key>
+						<types:value>taxonomicIdentGroupList/*/taxon</types:value>
+					</types:item>
+					<types:item xmlns:types="http://collectionspace.org/services/config/types">
+						<types:key>authRef</types:key>
+						<types:value>associatedTaxaGroupList/*/taxon</types:value>
+					</types:item>
+					<types:item xmlns:types="http://collectionspace.org/services/config/types">
+						<types:key>authRef</types:key>
+						<types:value>taxonomicIdentGroupList/*/identBy</types:value>
+					</types:item>
+					<types:item xmlns:types="http://collectionspace.org/services/config/types">
+						<types:key>authRef</types:key>
+						<types:value>taxonomicIdentGroupList/*/institution</types:value>
+					</types:item>
+					<!--
+					<types:item xmlns:types="http://collectionspace.org/services/config/types">
+						<types:key>authRef</types:key>
+						<types:value>annotationGroupList/*/annotationAuthor</types:value>
+					</types:item>
+					 -->
+				</service:properties>
+			  <service:content contentType="application/xml">
+				<service:xmlContent namespaceURI="http://collectionspace.org/services/collectionobject/domain/naturalhistory" schemaLocation="http://collectionspace.org/services/collectionobject/domain/naturalhistory http://collectionspace.org/services/collectionobject/domain/collectionobjects_naturalhistory.xsd" />
+			  </service:content>
+			</service:part>
+		</service:object>
 
-        </tenant:serviceBindings>
+	</tenant:serviceBindings>
 
-        <tenant:serviceBindings merge:matcher="id" id="Movements">
-            <service:DocHandlerParams xmlns:service="http://collectionspace.org/services/config/service">
-                <service:params>
-                    <service:SupportsVersioning>true</service:SupportsVersioning>
-                    <service:ListResultsFields merge:action="preserve" />
-                </service:params>
-            </service:DocHandlerParams>
-        </tenant:serviceBindings>
+  	<tenant:serviceBindings merge:matcher="id" id="Movements">
+  		<service:DocHandlerParams xmlns:service="http://collectionspace.org/services/config/service">
+  			<service:params>
+  				<service:SupportsVersioning>true</service:SupportsVersioning>
+					<service:ListResultsFields merge:action="preserve" />
+  			</service:params>
+  		</service:DocHandlerParams>
+  	</tenant:serviceBindings>
 
-        <tenant:serviceBindings merge:matcher="id" id="Persons">
-            <service:DocHandlerParams xmlns:service="http://collectionspace.org/services/config/service">
-                <service:params>
-                    <service:ListResultsFields>
-                        <service:ListResultField merge:matcher="skip" merge:action="insert" >
-                            <service:element>entityType</service:element>
-                            <service:schema>persons_naturalhistory</service:schema>
-                            <service:xpath>entityType</service:xpath>
-                        </service:ListResultField>
-                    </service:ListResultsFields>
-                </service:params>
-            </service:DocHandlerParams>
+	<tenant:serviceBindings merge:matcher="id" id="Persons">
+    <service:DocHandlerParams xmlns:service="http://collectionspace.org/services/config/service">
+			<service:params>
+				<service:ListResultsFields>
+					<service:ListResultField merge:matcher="skip" merge:action="insert" >
+              <service:element>entityType</service:element>
+              <service:schema>persons_naturalhistory</service:schema>
+							<service:xpath>entityType</service:xpath>
+            </service:ListResultField>
+				</service:ListResultsFields>
+			</service:params>
+    </service:DocHandlerParams>
 
-            <service:object xmlns:service="http://collectionspace.org/services/config/service">
-                <service:part id="3" merge:matcher="skip" merge:action="insert" control_group="Managed"
-                              versionable="true" auditable="false" label="persons_naturalhistory" updated="" order="3">
-                    <service:content contentType="application/xml">
-                        <service:xmlContent namespaceURI="http://collectionspace.org/services/person/domain/naturalhistory"
-                                            schemaLocation="http://collectionspace.org/services/person/domain/naturalhistory http://collectionspace.org/services/person/domain/persons_naturalhistory.xsd"
-                        />
-                    </service:content>
-                    <service:properties>
-                        <!-- See CSPACE-3938 for potential additional authRef and termRef entries -->
-                        <types:item xmlns:types="http://collectionspace.org/services/config/types">
-                            <types:key>authRef</types:key>
-                            <types:value>affiliatedPersonOrgGroupList/*/affiliatedPersonOrg</types:value>
-                        </types:item>
-                        <types:item xmlns:types="http://collectionspace.org/services/config/types">
-                            <types:key>authRef</types:key>
-                            <types:value>orgContactNames|orgContactName</types:value>
-                        </types:item>
-                        <types:item xmlns:types="http://collectionspace.org/services/config/types">
-                            <types:key>termRef</types:key>
-                            <types:value>affiliatedPersonOrgGroupList/*/affiliatedPersonOrgType</types:value>
-                        </types:item>
-                        <types:item xmlns:types="http://collectionspace.org/services/config/types">
-                            <types:key>termRef</types:key>
-                            <types:value>nameTypes|nameType</types:value>
-                        </types:item>
-                        <types:item xmlns:types="http://collectionspace.org/services/config/types">
-                            <types:key>termRef</types:key>
-                            <types:value>nameSource</types:value>
-                        </types:item>
-                        <types:item xmlns:types="http://collectionspace.org/services/config/types">
-                            <types:key>termRef</types:key>
-                            <types:value>entityType</types:value>
-                        </types:item>
-                    </service:properties>
-                </service:part>
-            </service:object>
-        </tenant:serviceBindings>
-    
-    </tenant:tenantBinding>
-                   
+		<service:object xmlns:service="http://collectionspace.org/services/config/service">
+			<service:part id="3" merge:matcher="skip" merge:action="insert" control_group="Managed"
+				versionable="true" auditable="false" label="persons_naturalhistory" updated="" order="3">
+				<service:content contentType="application/xml">
+					<service:xmlContent namespaceURI="http://collectionspace.org/services/person/domain/naturalhistory"
+						schemaLocation="http://collectionspace.org/services/person/domain/naturalhistory http://collectionspace.org/services/person/domain/persons_naturalhistory.xsd"
+					/>
+				</service:content>
+				<service:properties>
+					<!-- See CSPACE-3938 for potential additional authRef and termRef entries -->
+					<types:item xmlns:types="http://collectionspace.org/services/config/types">
+						<types:key>authRef</types:key>
+						<types:value>affiliatedPersonOrgGroupList/*/affiliatedPersonOrg</types:value>
+					</types:item>
+					<types:item xmlns:types="http://collectionspace.org/services/config/types">
+						<types:key>authRef</types:key>
+						<types:value>orgContactNames|orgContactName</types:value>
+					</types:item>
+					<types:item xmlns:types="http://collectionspace.org/services/config/types">
+						<types:key>termRef</types:key>
+						<types:value>affiliatedPersonOrgGroupList/*/affiliatedPersonOrgType</types:value>
+					</types:item>
+					<types:item xmlns:types="http://collectionspace.org/services/config/types">
+						<types:key>termRef</types:key>
+						<types:value>nameTypes|nameType</types:value>
+					</types:item>
+					<types:item xmlns:types="http://collectionspace.org/services/config/types">
+						<types:key>termRef</types:key>
+						<types:value>nameSource</types:value>
+					</types:item>
+					<types:item xmlns:types="http://collectionspace.org/services/config/types">
+						<types:key>termRef</types:key>
+						<types:value>entityType</types:value>
+					</types:item>
+				</service:properties>
+			</service:part>
+		</service:object>
+	</tenant:serviceBindings>
+	
+  </tenant:tenantBinding>
+	    	       
 </tenant:TenantBindingConfig>
diff --git a/services/common/src/main/cspace/config/services/tenants/tenant-bindings-proto.xml b/services/common/src/main/cspace/config/services/tenants/tenant-bindings-proto.xml
index 3206f8939..7fbdda057 100644
--- a/services/common/src/main/cspace/config/services/tenants/tenant-bindings-proto.xml
+++ b/services/common/src/main/cspace/config/services/tenants/tenant-bindings-proto.xml
@@ -49,16 +49,16 @@
             <!--
                 Controls whether term completion (aka partial term matching,
                 aka autocomplete) searches will automatically insert a leading
-                wildcard, in order to match your search expression when found
-                anywhere within a term, not just at the beginning of a term.
+                wildcard.
                 
-                The default value is 'true', which will match your search
-                expression when found anywhere within a term. If this value is
-                set to 'false', searches will only find terms which begin with
-                your search expression. However, even after doing so, you can
-                manually add a wildcard at the beginning of any search; e.g.
-                "*atrick" (without quotes) will match the string "atrick"
-                anywhere, not just at the beginning of a term.
+                The default value is 'true', which will cause your search
+                expression to be matched when found anywhere within a term.
+                If this value is set to 'false', searches will only find terms
+                which begin with your search expression. However, even with a
+                setting of 'false', you can manually add an asterisk (*) as a
+                wildcard at the beginning of any search; e.g. "*atrick"
+                (without quotes) will match the string "atrick" anywhere, not
+                just at the beginning of a term.
 
                 See the tenant-bindings.delta.xml file for the 'lifesci' tenant,
                 for an example of how to override this value in your tenant.
@@ -69,7 +69,7 @@
             </types:item>
             <!--
                By default, term completion searches return a maximum number
-               of terms in their search results. The default value is 40 terms
+               of terms in their search results. The default value is 40 terms.
                See the tenant-bindings.delta.xml file for the 'lifesci' tenant,
                for an example of how to override this value in your tenant.
             -->