X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=resources%2Fembl_mapping.xml;h=ccbde5e1558052e2217ef74782e305f52d6207ce;hb=5abaf9d49abf02d536fb657d33b3fcde91ddb42c;hp=515925604ba740567ee5cc2e99c51597be1c2809;hpb=59d682209891099d46b960509907c79e3fb276fe;p=jalview.git

diff --git a/resources/embl_mapping.xml b/resources/embl_mapping.xml
index 5159256..ccbde5e 100644
--- a/resources/embl_mapping.xml
+++ b/resources/embl_mapping.xml
@@ -1,20 +1,21 @@
 <?xml version="1.0"?>
 <!--
-  Jalview - A Sequence Alignment Editor and Viewer (Version 2.8)
-  Copyright (C) 2012 J Procter, AM Waterhouse, LM Lui, J Engelhardt, G Barton, M Clamp, S Searle
-  
-  This file is part of Jalview.
-  
-  Jalview is free software: you can redistribute it and/or
-  modify it under the terms of the GNU General Public License 
-  as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
-   
-  Jalview is distributed in the hope that it will be useful, but 
-  WITHOUT ANY WARRANTY; without even the implied warranty 
-  of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
-  PURPOSE.  See the GNU General Public License for more details.
-  
-  You should have received a copy of the GNU General Public License along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
+ * 
+ * This file is part of Jalview.
+ * 
+ * Jalview is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ *  
+ * Jalview is distributed in the hope that it will be useful, but 
+ * WITHOUT ANY WARRANTY; without even the implied warranty 
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+ * PURPOSE.  See the GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
 -->
 <mapping xmlns="http://castor.exolab.org/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://castor.exolab.org/ ../schemas/castor-mapping.xsd">
@@ -33,17 +34,16 @@
 		</field>
 	</class>
 	<class name="jalview.datamodel.xdb.embl.EmblEntry">
-		<map-to xml="entry"/>
 		<field name="accession" type="string">
 			<bind-xml location="accession" node="attribute"/>
 		</field>
+		<!--  May 2015 changed from last-updated to match xml -->
 		<field name="lastUpdated" type="string">
-			<bind-xml location="last-updated" node="attribute"/>
+			<bind-xml location="lastUpdated" node="attribute"/>
 		</field>
 		<field name="version" type="string">
 			<bind-xml location="version" node="attribute"/>
 		</field>
-		
 		<field name="rCreated" type="string">
 			<bind-xml location="releaseCreated" node="attribute"/>
 		</field>
@@ -53,7 +53,7 @@
 		<field name="desc" type="string">
 			<bind-xml name="description" node="element"/>
 		</field>
-		<field name="Keywords" type="string" collection="vector">
+		<field name="keywords" type="string" collection="vector">
 			<bind-xml name="keyword" node="element"/>
 		</field>
 		<field name="features" type="jalview.datamodel.xdb.embl.EmblFeature" collection="vector">
@@ -63,11 +63,10 @@
 			<bind-xml name="dbreference" />
 		</field>
 		<field name="sequence" type="jalview.datamodel.xdb.embl.EmblSequence">
-			<bind-xml name="sequence"/> <!-- location="sequence" node="element"/ -->
+			<bind-xml name="sequence"/>
 		</field>
 	</class>
 	<class name="jalview.datamodel.xdb.embl.EmblSequence">
-		<map-to xml="sequence"/>
 		<field name="type" type="string">
 			<bind-xml name="type" node="attribute" location="type"/>
 		</field>
@@ -79,7 +78,6 @@
 		</field>
 	</class>
 	<class name="jalview.datamodel.xdb.embl.EmblFeature" verify-constructable="false">
-		<map-to xml="feature"/>
 		<field name="name" type="string">
 			<bind-xml name="name" node="attribute"/>
 		</field>
@@ -94,18 +92,17 @@
 		</field>
 	</class>
 	<class name="jalview.datamodel.DBRefEntry" verify-constructable="false">
-		<field name="accessionId" type="java.lang.String"><!-- set-method="setAccessionId" get-method="getAccessionId"> -->
+		<field name="accessionId" type="java.lang.String">
 			<bind-xml name="primary" node="attribute"/>
 		</field>
-		<field name="source" type="java.lang.String"> <!--set-method="setSource" get-method="getSource"> -->
+		<field name="source" type="java.lang.String"> 
 			<bind-xml name="db" node="attribute"/>
 		</field>
-		<field name="version" type="string"><!-- set-method="setVersion" get-method="getVersion"> -->
+		<field name="version" type="string">
 			<bind-xml name="secondary" node="attribute"/>
 		</field>
 	</class>
 	<class  name="jalview.datamodel.xdb.embl.Qualifier" verify-constructable="false">
-		<map-to xml="Qualifier"/>
 		<field name="name">
 			<bind-xml name="name" node="attribute"/>
 		</field>
@@ -117,7 +114,6 @@
 		</field>
 	</class>
 	<class name="jalview.datamodel.xdb.embl.EmblFeatureLocations">
-		<map-to xml="location"/>
 		<field name="locationType" type="string">
 			<bind-xml name="type" node="attribute"/>
 		</field>
@@ -129,7 +125,6 @@
 		</field>
 	</class>
 	<class name="jalview.datamodel.xdb.embl.EmblFeatureLocElement">
-		<map-to xml="locationElement"/>
 		<field name="type" type="string">
 			<bind-xml name="type" node="attribute"/>
 		</field>
@@ -147,7 +142,6 @@
 		</field>
 	</class>
 	<class name="jalview.datamodel.xdb.embl.BasePosition">
-		<map-to xml="basePosition"/>
 		<field name="type">
 			<bind-xml name="type" node="attribute"/>
 		</field>