From fb3800ab7e9181110cf040eb485426b470aeb3ea Mon Sep 17 00:00:00 2001
From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Fri, 18 Jun 2010 00:03:15 +0000
Subject: [PATCH] CSPACE-2138: Added 'web' field, removed 'notes' field, in
 Contact schema, in the services, per latest changes to Limited for 0.8 Name
 Authority schemas on the wiki.

---
 .../resources/OSGI-INF/layouts-contrib.xml    | 28 +++++++++----------
 .../resources/schemas/contacts_common.xsd     |  2 +-
 .../services/contact/ContactJAXBSchema.java   | 10 +++----
 .../src/main/resources/contacts-common.xsd    |  2 +-
 4 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/services/contact/3rdparty/nuxeo-platform-cs-contact/src/main/resources/OSGI-INF/layouts-contrib.xml b/services/contact/3rdparty/nuxeo-platform-cs-contact/src/main/resources/OSGI-INF/layouts-contrib.xml
index 5f31f0f17..8c967641b 100644
--- a/services/contact/3rdparty/nuxeo-platform-cs-contact/src/main/resources/OSGI-INF/layouts-contrib.xml
+++ b/services/contact/3rdparty/nuxeo-platform-cs-contact/src/main/resources/OSGI-INF/layouts-contrib.xml
@@ -13,10 +13,10 @@
       <rows>
         <row><widget>addressType</widget></row>
         <row><widget>addressPlace</widget></row>
+        <row><widget>web</widget></row>
         <row><widget>email</widget></row>
         <row><widget>telephoneNumber</widget></row>
         <row><widget>faxNumber</widget></row>
-        <row><widget>notes</widget></row>
       </rows>
 
       <widget name="addressType" type="text">
@@ -44,53 +44,53 @@
           <property name="styleClass">dataInputText</property>
         </properties>
       </widget>
-
-      <widget name="email" type="text">
+      
+      <widget name="web" type="text">
         <labels>
-          <label mode="any">email</label>
+          <label mode="any">web</label>
         </labels>
         <translated>true</translated>
         <fields>
-          <field schema="contacts_common">email</field>
+          <field schema="contacts_common">web</field>
         </fields>
         <properties widgetMode="edit">
           <property name="styleClass">dataInputText</property>
         </properties>
       </widget>
 
-      <widget name="telephoneNumber" type="text">
+      <widget name="email" type="text">
         <labels>
-          <label mode="any">telephoneNumber</label>
+          <label mode="any">email</label>
         </labels>
         <translated>true</translated>
         <fields>
-          <field schema="contacts_common">telephoneNumber</field>
+          <field schema="contacts_common">email</field>
         </fields>
         <properties widgetMode="edit">
           <property name="styleClass">dataInputText</property>
         </properties>
       </widget>
 
-      <widget name="faxNumber" type="text">
+      <widget name="telephoneNumber" type="text">
         <labels>
-          <label mode="any">faxNumber</label>
+          <label mode="any">telephoneNumber</label>
         </labels>
         <translated>true</translated>
         <fields>
-          <field schema="contacts_common">faxNumber</field>
+          <field schema="contacts_common">telephoneNumber</field>
         </fields>
         <properties widgetMode="edit">
           <property name="styleClass">dataInputText</property>
         </properties>
       </widget>
 
-      <widget name="notes" type="text">
+      <widget name="faxNumber" type="text">
         <labels>
-          <label mode="any">notes</label>
+          <label mode="any">faxNumber</label>
         </labels>
         <translated>true</translated>
         <fields>
-          <field schema="contacts_common">notes</field>
+          <field schema="contacts_common">faxNumber</field>
         </fields>
         <properties widgetMode="edit">
           <property name="styleClass">dataInputText</property>
diff --git a/services/contact/3rdparty/nuxeo-platform-cs-contact/src/main/resources/schemas/contacts_common.xsd b/services/contact/3rdparty/nuxeo-platform-cs-contact/src/main/resources/schemas/contacts_common.xsd
index a52400b11..c2d2ade2e 100644
--- a/services/contact/3rdparty/nuxeo-platform-cs-contact/src/main/resources/schemas/contacts_common.xsd
+++ b/services/contact/3rdparty/nuxeo-platform-cs-contact/src/main/resources/schemas/contacts_common.xsd
@@ -23,9 +23,9 @@
     <xs:element name="inItem" type="xs:string" />
     <xs:element name="addressType" type="xs:string"/>
     <xs:element name="addressPlace" type="xs:string"/>
+    <xs:element name="web" type="xs:string"/>
     <xs:element name="email" type="xs:string"/>
     <xs:element name="telephoneNumber" type="xs:string"/>
     <xs:element name="faxNumber" type="xs:string"/>
-    <xs:element name="notes" type="xs:string"/>
     
 </xs:schema>
diff --git a/services/contact/jaxb/src/main/java/org/collectionspace/services/contact/ContactJAXBSchema.java b/services/contact/jaxb/src/main/java/org/collectionspace/services/contact/ContactJAXBSchema.java
index c9ad9a449..22834c93d 100644
--- a/services/contact/jaxb/src/main/java/org/collectionspace/services/contact/ContactJAXBSchema.java
+++ b/services/contact/jaxb/src/main/java/org/collectionspace/services/contact/ContactJAXBSchema.java
@@ -7,16 +7,16 @@ package org.collectionspace.services.contact;
  *
  */
 public interface ContactJAXBSchema {
-    	final static String CONTACTS_COMMON = "contacts_common";
-    	final static String CSID = "csid";
+    final static String CONTACTS_COMMON = "contacts_common";
+    final static String CSID = "csid";
 	final static String IN_AUTHORITY = "inAuthority";
-        final static String IN_ITEM ="inItem";
-    	final static String ADDRESS_TYPE = "addressType";
+    final static String IN_ITEM ="inItem";
+    final static String ADDRESS_TYPE = "addressType";
 	final static String ADDRESS_PLACE = "addressPlace";
+	final static String WEB = "web";
 	final static String EMAIL = "email";
 	final static String TELEPHONE_NUMBER = "telephoneNumber";
 	final static String FAX_NUMBER = "faxNumber";
-	final static String NOTES = "notes";
 }
 
 
diff --git a/services/contact/jaxb/src/main/resources/contacts-common.xsd b/services/contact/jaxb/src/main/resources/contacts-common.xsd
index c1913871b..37cc196ef 100644
--- a/services/contact/jaxb/src/main/resources/contacts-common.xsd
+++ b/services/contact/jaxb/src/main/resources/contacts-common.xsd
@@ -35,10 +35,10 @@
                 <xs:element name="inItem" type="xs:string" />
                 <xs:element name="addressType" type="xs:string"/>
                 <xs:element name="addressPlace" type="xs:string"/>
+                <xs:element name="web" type="xs:string"/>
                 <xs:element name="email" type="xs:string"/>
                 <xs:element name="telephoneNumber" type="xs:string"/>
                 <xs:element name="faxNumber" type="xs:string"/>
-                <xs:element name="notes" type="xs:string"/>
             </xs:sequence>
         </xs:complexType>
     </xs:element>
-- 
2.47.3