CSPACE-322: Fixing Nuxeo Webapp layout config files so we can create and view our...

diff --git a/services/relation/3rdparty/nuxeo-platform-cs-relation/src/main/resources/OSGI-INF/core-types-contrib.xml b/services/relation/3rdparty/nuxeo-platform-cs-relation/src/main/resources/OSGI-INF/core-types-contrib.xml
index 990052e4abfe242c2259de7ee1a611a469ae5b53..2fe513f959509c48b32f6b7389309eba50c160be 100644 (file)
--- a/services/relation/3rdparty/nuxeo-platform-cs-relation/src/main/resources/OSGI-INF/core-types-contrib.xml
+++ b/services/relation/3rdparty/nuxeo-platform-cs-relation/src/main/resources/OSGI-INF/core-types-contrib.xml
@@ -16,7 +16,7 @@
 -->
 <component name="org.collectionspace.relation.coreTypes">
   <extension target="org.nuxeo.ecm.core.schema.TypeService" point="schema">
-    <schema name="relation" prefix="relation" src="schemas/relation.xsd"/>
+    <schema name="relation" prefix="rel" src="schemas/relation.xsd"/>
   </extension>
   <extension target="org.nuxeo.ecm.core.schema.TypeService" point="doctype">
     <doctype name="Relation" extends="Document">

diff --git a/services/relation/3rdparty/nuxeo-platform-cs-relation/src/main/resources/OSGI-INF/layouts-contrib.xml b/services/relation/3rdparty/nuxeo-platform-cs-relation/src/main/resources/OSGI-INF/layouts-contrib.xml
index c3d2f1073bb53bb7852dc33d500597105e11ab86..e9e3b748d6826df6ccdf46c30ca72a29f55c8e6a 100644 (file)
--- a/services/relation/3rdparty/nuxeo-platform-cs-relation/src/main/resources/OSGI-INF/layouts-contrib.xml
+++ b/services/relation/3rdparty/nuxeo-platform-cs-relation/src/main/resources/OSGI-INF/layouts-contrib.xml
@@ -3,102 +3,100 @@
     Copyright 2009 University of California at Berkeley
     Licensed under the Educational Community License (ECL), Version 2.0.
     You may not use this file except in compliance with this License.
-
+    
     You may obtain a copy of the ECL 2.0 License at
     https://source.collectionspace.org/collection-space/LICENSE.txt
-
+    
     Document   : layouts-contrib.xml
     Created on : $LastChangedDate: $
     Author     : $LastChangedBy: $
     Revision   : $LastChangedRevision: $
     Description:
-        Nuxeo webapp layout for CollectionSpace Relation doctype
+    Nuxeo webapp layout for CollectionSpace Relation doctype
 -->
 <component name="org.collectionspace.relation.layouts.webapp">
-
+    
     <extension target="org.nuxeo.ecm.platform.forms.layout.WebLayoutManager"
-    point="layouts">
-
+        point="layouts">
+        
         <layout name="relation">
             <templates>
                 <template mode="any">/layouts/layout_default_template.xhtml</template>
             </templates>
-
+            
             <rows>
                 <row>
                     <widget>relationtype</widget>
                 </row>
             </rows>
-
+            
             <widget name="relationtype" type="template">
                 <fields>
-                    <field>relation:relationtype</field>
+                    <field>rel:relationtype</field>
                 </fields>
                 <properties mode="any">
                     <property name="template">
-            /widgets/complex_widget_template.xhtml
+                        /widgets/complex_widget_template.xhtml
                     </property>
                 </properties>
-
+                
                 <subWidgets>
-
-                    <widget name="document-id-1" type="text">
+                    
+                    <widget name="documentId1" type="text">
                         <labels>
-                            <label mode="any">Document ID: 1</label>
+                            <label mode="any">Document ID 1</label>
                         </labels>
                         <translated>true</translated>
                         <fields>
-                            <field schema="relation">relation:document-id-1</field>
+                            <field>documentId1</field>
                         </fields>
                         <properties widgetMode="edit">
-                            <property name="javax.faces.Character">javax.faces.convert.CharacterConverter</property>
                             <property name="styleClass">dataInputText</property>
                         </properties>
                     </widget>
-
-                    <widget name="document-type-1" type="text">
+                    
+                    <widget name="documentType1" type="text">
                         <labels>
-                            <label mode="any">Document Type: 1</label>
+                            <label mode="any">Document Type 1</label>
                         </labels>
                         <translated>true</translated>
                         <fields>
-                            <field schema="relation">relation:document-type-1</field>
+                            <field>documentType1</field>
                         </fields>
                         <properties widgetMode="edit">
                             <property name="styleClass">dataInputText</property>
                         </properties>
                     </widget>
-
-                    <widget name="document-id-2" type="text">
+                    
+                    <widget name="documentId2" type="text">
                         <labels>
-                            <label mode="any">Document ID: 2</label>
+                            <label mode="any">Document ID 2</label>
                         </labels>
                         <translated>true</translated>
                         <fields>
-                            <field schema="relation">relation:document-id-2</field>
+                            <field>documentId2</field>
                         </fields>
                         <properties widgetMode="edit">
                             <property name="styleClass">dataInputText</property>
                         </properties>
                     </widget>
-
-                    <widget name="document-type-2" type="text">
+                    
+                    <widget name="documentType2" type="text">
                         <labels>
-                            <label mode="any">Document Type: 2</label>
+                            <label mode="any">Document Type 2</label>
                         </labels>
                         <translated>true</translated>
                         <fields>
-                            <field schema="relation">relation:document-type-2</field>
+                            <field>documentType2</field>
                         </fields>
                         <properties widgetMode="edit">
                             <property name="styleClass">dataInputText</property>
                         </properties>
                     </widget>
-
+                    
                 </subWidgets>
             </widget>
-
+            
         </layout>
     </extension>
 </component>
-

diff --git a/services/relation/3rdparty/nuxeo-platform-cs-relation/src/main/resources/schemas/relation.xsd b/services/relation/3rdparty/nuxeo-platform-cs-relation/src/main/resources/schemas/relation.xsd
index 8aaca970f931bd1094d581b64b29c756c926eef4..cbd7d0cd90acb81f92ae05f3bc68b5418ab6b524 100644 (file)
--- a/services/relation/3rdparty/nuxeo-platform-cs-relation/src/main/resources/schemas/relation.xsd
+++ b/services/relation/3rdparty/nuxeo-platform-cs-relation/src/main/resources/schemas/relation.xsd
@@ -41,13 +41,13 @@
             <!-- document-type-1 would be the doc-type of the container collectionobject -->\r
             <!-- document-id-2 would be the id of the contained (or child) collectionobject -->\r
             <!-- document-type-2 would be the doc-type of the collectionobejct -->\r
-            <xs:element name="document-id-1" type="xs:string"  minOccurs="1" maxOccurs="1"/>\r
-            <xs:element name="document-type-1" type="xs:string"  minOccurs="1" maxOccurs="1"/>\r
-            <xs:element name="document-id-2" type="xs:string"  minOccurs="1" maxOccurs="1"/>\r
-            <xs:element name="document-type-2" type="xs:string"  minOccurs="1" maxOccurs="1"/>\r
+            <xs:element name="documentId1" type="xs:string"  minOccurs="1" maxOccurs="1"/>\r
+            <xs:element name="documentType1" type="xs:string"  minOccurs="1" maxOccurs="1"/>\r
+            <xs:element name="documentId2" type="xs:string"  minOccurs="1" maxOccurs="1"/>\r
+            <xs:element name="documentType2" type="xs:string"  minOccurs="1" maxOccurs="1"/>\r
 \r
             <!-- type of relatinoship between two entities -->\r
-            <xs:element name="relationship-type" type="rel:RelationshipType" minOccurs="1" maxOccurs="1"/>\r
+            <xs:element name="relationshipType" type="rel:RelationshipType" minOccurs="1" maxOccurs="1"/>\r
         </xs:sequence>\r
     </xs:complexType>\r
 \r