From a8b2761fbb8bf6f1f0b2df902036d144c36cdb97 Mon Sep 17 00:00:00 2001 From: jprocter Date: Thu, 14 Dec 2006 19:07:00 +0000 Subject: [PATCH] changed vamsasDocument and vamsas types namespaces. git-svn-id: https://svn.lifesci.dundee.ac.uk/svn/repository/trunk@300 be28352e-c001-0410-b1a7-c7978e42abec --- schemas/vamsas.xsd | 4 ++-- schemas/vamsasDocument.xsd | 4 ++-- .../objects/core/AlignmentAnnotationDescriptor.java | 4 ++-- src/uk/ac/vamsas/objects/core/AlignmentDescriptor.java | 12 ++++++------ .../core/AlignmentSequenceAnnotationDescriptor.java | 4 ++-- .../objects/core/AlignmentSequenceDescriptor.java | 4 ++-- .../objects/core/AnnotationElementDescriptor.java | 8 ++++---- src/uk/ac/vamsas/objects/core/AppDataDescriptor.java | 6 +++--- .../vamsas/objects/core/ApplicationDataDescriptor.java | 8 ++++---- .../ac/vamsas/objects/core/AttachmentDescriptor.java | 2 +- src/uk/ac/vamsas/objects/core/CommonDescriptor.java | 2 +- .../objects/core/DataSetAnnotationsDescriptor.java | 4 ++-- src/uk/ac/vamsas/objects/core/DataSetDescriptor.java | 12 ++++++------ src/uk/ac/vamsas/objects/core/DbRefDescriptor.java | 8 ++++---- src/uk/ac/vamsas/objects/core/EntryDescriptor.java | 16 ++++++++-------- src/uk/ac/vamsas/objects/core/GlyphDescriptor.java | 2 +- src/uk/ac/vamsas/objects/core/InputDescriptor.java | 2 +- src/uk/ac/vamsas/objects/core/InstanceDescriptor.java | 2 +- src/uk/ac/vamsas/objects/core/LinkDescriptor.java | 2 +- src/uk/ac/vamsas/objects/core/LockFileDescriptor.java | 2 +- src/uk/ac/vamsas/objects/core/MapDescriptor.java | 2 +- src/uk/ac/vamsas/objects/core/MapListDescriptor.java | 2 +- src/uk/ac/vamsas/objects/core/MappingDescriptor.java | 2 +- src/uk/ac/vamsas/objects/core/NewickDescriptor.java | 2 +- src/uk/ac/vamsas/objects/core/ParamDescriptor.java | 2 +- src/uk/ac/vamsas/objects/core/PosDescriptor.java | 2 +- src/uk/ac/vamsas/objects/core/PropertyDescriptor.java | 2 +- .../ac/vamsas/objects/core/ProvenanceDescriptor.java | 4 ++-- .../vamsas/objects/core/RangeAnnotationDescriptor.java | 16 ++++++++-------- src/uk/ac/vamsas/objects/core/RangeTypeDescriptor.java | 6 +++--- src/uk/ac/vamsas/objects/core/ScoreDescriptor.java | 2 +- src/uk/ac/vamsas/objects/core/SegDescriptor.java | 2 +- src/uk/ac/vamsas/objects/core/SequenceDescriptor.java | 4 ++-- .../ac/vamsas/objects/core/SequenceTypeDescriptor.java | 12 ++++++------ src/uk/ac/vamsas/objects/core/TreeDescriptor.java | 10 +++++----- src/uk/ac/vamsas/objects/core/UserDescriptor.java | 2 +- src/uk/ac/vamsas/objects/core/VAMSASDescriptor.java | 6 +++--- .../vamsas/objects/core/VamsasDocumentDescriptor.java | 14 +++++++------- 38 files changed, 100 insertions(+), 100 deletions(-) diff --git a/schemas/vamsas.xsd b/schemas/vamsas.xsd index 5eb52d1..7f01fd2 100644 --- a/schemas/vamsas.xsd +++ b/schemas/vamsas.xsd @@ -1,8 +1,8 @@ - Vorba ID - Vamsas Object Request Broker Address ID (name needs to be diff --git a/schemas/vamsasDocument.xsd b/schemas/vamsasDocument.xsd index 2834313..0f916fc 100644 --- a/schemas/vamsasDocument.xsd +++ b/schemas/vamsasDocument.xsd @@ -1,6 +1,6 @@ - - + + diff --git a/src/uk/ac/vamsas/objects/core/AlignmentAnnotationDescriptor.java b/src/uk/ac/vamsas/objects/core/AlignmentAnnotationDescriptor.java index a91bedb..7bdd015 100644 --- a/src/uk/ac/vamsas/objects/core/AlignmentAnnotationDescriptor.java +++ b/src/uk/ac/vamsas/objects/core/AlignmentAnnotationDescriptor.java @@ -57,7 +57,7 @@ public class AlignmentAnnotationDescriptor extends uk.ac.vamsas.objects.core.Ran { super(); setExtendsWithoutFlatten(new uk.ac.vamsas.objects.core.RangeAnnotationDescriptor()); - nsURI = "http://www.vamsas.org"; + nsURI = "http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes"; xmlName = "AlignmentAnnotation"; //-- set grouping compositor @@ -136,7 +136,7 @@ public class AlignmentAnnotationDescriptor extends uk.ac.vamsas.objects.core.Ran } }; desc.setHandler(handler); - desc.setNameSpaceURI("http://www.vamsas.org"); + desc.setNameSpaceURI("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes"); desc.setRequired(true); desc.setMultivalued(false); addFieldDescriptor(desc); diff --git a/src/uk/ac/vamsas/objects/core/AlignmentDescriptor.java b/src/uk/ac/vamsas/objects/core/AlignmentDescriptor.java index 4589e43..a24de0d 100644 --- a/src/uk/ac/vamsas/objects/core/AlignmentDescriptor.java +++ b/src/uk/ac/vamsas/objects/core/AlignmentDescriptor.java @@ -56,7 +56,7 @@ public class AlignmentDescriptor extends org.exolab.castor.xml.util.XMLClassDesc public AlignmentDescriptor() { super(); - nsURI = "http://www.vamsas.org"; + nsURI = "http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes"; xmlName = "Alignment"; //-- set grouping compositor @@ -245,7 +245,7 @@ public class AlignmentDescriptor extends org.exolab.castor.xml.util.XMLClassDesc } }; desc.setHandler(handler); - desc.setNameSpaceURI("http://www.vamsas.org"); + desc.setNameSpaceURI("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes"); desc.setMultivalued(true); addFieldDescriptor(desc); @@ -280,7 +280,7 @@ public class AlignmentDescriptor extends org.exolab.castor.xml.util.XMLClassDesc } }; desc.setHandler(handler); - desc.setNameSpaceURI("http://www.vamsas.org"); + desc.setNameSpaceURI("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes"); desc.setMultivalued(true); addFieldDescriptor(desc); @@ -315,7 +315,7 @@ public class AlignmentDescriptor extends org.exolab.castor.xml.util.XMLClassDesc } }; desc.setHandler(handler); - desc.setNameSpaceURI("http://www.vamsas.org"); + desc.setNameSpaceURI("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes"); desc.setRequired(true); desc.setMultivalued(true); addFieldDescriptor(desc); @@ -351,7 +351,7 @@ public class AlignmentDescriptor extends org.exolab.castor.xml.util.XMLClassDesc } }; desc.setHandler(handler); - desc.setNameSpaceURI("http://www.vamsas.org"); + desc.setNameSpaceURI("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes"); desc.setMultivalued(true); addFieldDescriptor(desc); @@ -386,7 +386,7 @@ public class AlignmentDescriptor extends org.exolab.castor.xml.util.XMLClassDesc } }; desc.setHandler(handler); - desc.setNameSpaceURI("http://www.vamsas.org"); + desc.setNameSpaceURI("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes"); desc.setRequired(true); desc.setMultivalued(false); addFieldDescriptor(desc); diff --git a/src/uk/ac/vamsas/objects/core/AlignmentSequenceAnnotationDescriptor.java b/src/uk/ac/vamsas/objects/core/AlignmentSequenceAnnotationDescriptor.java index 8099f4e..ea94403 100644 --- a/src/uk/ac/vamsas/objects/core/AlignmentSequenceAnnotationDescriptor.java +++ b/src/uk/ac/vamsas/objects/core/AlignmentSequenceAnnotationDescriptor.java @@ -57,7 +57,7 @@ public class AlignmentSequenceAnnotationDescriptor extends uk.ac.vamsas.objects. { super(); setExtendsWithoutFlatten(new uk.ac.vamsas.objects.core.RangeAnnotationDescriptor()); - nsURI = "http://www.vamsas.org"; + nsURI = "http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes"; xmlName = "AlignmentSequenceAnnotation"; //-- set grouping compositor @@ -136,7 +136,7 @@ public class AlignmentSequenceAnnotationDescriptor extends uk.ac.vamsas.objects. } }; desc.setHandler(handler); - desc.setNameSpaceURI("http://www.vamsas.org"); + desc.setNameSpaceURI("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes"); desc.setRequired(true); desc.setMultivalued(false); addFieldDescriptor(desc); diff --git a/src/uk/ac/vamsas/objects/core/AlignmentSequenceDescriptor.java b/src/uk/ac/vamsas/objects/core/AlignmentSequenceDescriptor.java index bb30ab7..0bbc06b 100644 --- a/src/uk/ac/vamsas/objects/core/AlignmentSequenceDescriptor.java +++ b/src/uk/ac/vamsas/objects/core/AlignmentSequenceDescriptor.java @@ -57,7 +57,7 @@ public class AlignmentSequenceDescriptor extends uk.ac.vamsas.objects.core.Seque { super(); setExtendsWithoutFlatten(new uk.ac.vamsas.objects.core.SequenceTypeDescriptor()); - nsURI = "http://www.vamsas.org"; + nsURI = "http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes"; xmlName = "alignmentSequence"; //-- set grouping compositor @@ -164,7 +164,7 @@ public class AlignmentSequenceDescriptor extends uk.ac.vamsas.objects.core.Seque } }; desc.setHandler(handler); - desc.setNameSpaceURI("http://www.vamsas.org"); + desc.setNameSpaceURI("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes"); desc.setMultivalued(true); addFieldDescriptor(desc); diff --git a/src/uk/ac/vamsas/objects/core/AnnotationElementDescriptor.java b/src/uk/ac/vamsas/objects/core/AnnotationElementDescriptor.java index 0dc10d3..4d315ed 100644 --- a/src/uk/ac/vamsas/objects/core/AnnotationElementDescriptor.java +++ b/src/uk/ac/vamsas/objects/core/AnnotationElementDescriptor.java @@ -56,7 +56,7 @@ public class AnnotationElementDescriptor extends org.exolab.castor.xml.util.XMLC public AnnotationElementDescriptor() { super(); - nsURI = "http://www.vamsas.org"; + nsURI = "http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes"; xmlName = "annotationElement"; //-- set grouping compositor @@ -212,7 +212,7 @@ public class AnnotationElementDescriptor extends org.exolab.castor.xml.util.XMLC } }; desc.setHandler(handler); - desc.setNameSpaceURI("http://www.vamsas.org"); + desc.setNameSpaceURI("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes"); desc.setMultivalued(false); addFieldDescriptor(desc); @@ -249,7 +249,7 @@ public class AnnotationElementDescriptor extends org.exolab.castor.xml.util.XMLC } }; desc.setHandler(handler); - desc.setNameSpaceURI("http://www.vamsas.org"); + desc.setNameSpaceURI("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes"); desc.setMultivalued(true); addFieldDescriptor(desc); @@ -287,7 +287,7 @@ public class AnnotationElementDescriptor extends org.exolab.castor.xml.util.XMLC } }; desc.setHandler(handler); - desc.setNameSpaceURI("http://www.vamsas.org"); + desc.setNameSpaceURI("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes"); desc.setMultivalued(true); addFieldDescriptor(desc); diff --git a/src/uk/ac/vamsas/objects/core/AppDataDescriptor.java b/src/uk/ac/vamsas/objects/core/AppDataDescriptor.java index 49c6be0..3366ccd 100644 --- a/src/uk/ac/vamsas/objects/core/AppDataDescriptor.java +++ b/src/uk/ac/vamsas/objects/core/AppDataDescriptor.java @@ -56,7 +56,7 @@ public class AppDataDescriptor extends org.exolab.castor.xml.util.XMLClassDescri public AppDataDescriptor() { super(); - nsURI = "http://www.vamsas.org"; + nsURI = "http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes"; xmlName = "appData"; //-- set grouping compositor @@ -93,7 +93,7 @@ public class AppDataDescriptor extends org.exolab.castor.xml.util.XMLClassDescri } }; desc.setHandler(handler); - desc.setNameSpaceURI("http://www.vamsas.org"); + desc.setNameSpaceURI("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes"); desc.setRequired(true); desc.setMultivalued(false); addFieldDescriptor(desc); @@ -130,7 +130,7 @@ public class AppDataDescriptor extends org.exolab.castor.xml.util.XMLClassDescri } }; desc.setHandler(handler); - desc.setNameSpaceURI("http://www.vamsas.org"); + desc.setNameSpaceURI("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes"); desc.setRequired(true); desc.setMultivalued(false); addFieldDescriptor(desc); diff --git a/src/uk/ac/vamsas/objects/core/ApplicationDataDescriptor.java b/src/uk/ac/vamsas/objects/core/ApplicationDataDescriptor.java index 01bcfe3..8998b5a 100644 --- a/src/uk/ac/vamsas/objects/core/ApplicationDataDescriptor.java +++ b/src/uk/ac/vamsas/objects/core/ApplicationDataDescriptor.java @@ -57,7 +57,7 @@ public class ApplicationDataDescriptor extends uk.ac.vamsas.objects.core.AppData { super(); setExtendsWithoutFlatten(new uk.ac.vamsas.objects.core.AppDataDescriptor()); - nsURI = "http://www.vamsas.org"; + nsURI = "http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes"; xmlName = "ApplicationData"; //-- set grouping compositor @@ -172,7 +172,7 @@ public class ApplicationDataDescriptor extends uk.ac.vamsas.objects.core.AppData } }; desc.setHandler(handler); - desc.setNameSpaceURI("http://www.vamsas.org"); + desc.setNameSpaceURI("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes"); desc.setMultivalued(true); addFieldDescriptor(desc); @@ -207,7 +207,7 @@ public class ApplicationDataDescriptor extends uk.ac.vamsas.objects.core.AppData } }; desc.setHandler(handler); - desc.setNameSpaceURI("http://www.vamsas.org"); + desc.setNameSpaceURI("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes"); desc.setMultivalued(false); addFieldDescriptor(desc); @@ -241,7 +241,7 @@ public class ApplicationDataDescriptor extends uk.ac.vamsas.objects.core.AppData } }; desc.setHandler(handler); - desc.setNameSpaceURI("http://www.vamsas.org"); + desc.setNameSpaceURI("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes"); desc.setMultivalued(true); addFieldDescriptor(desc); diff --git a/src/uk/ac/vamsas/objects/core/AttachmentDescriptor.java b/src/uk/ac/vamsas/objects/core/AttachmentDescriptor.java index 830655d..5c6712d 100644 --- a/src/uk/ac/vamsas/objects/core/AttachmentDescriptor.java +++ b/src/uk/ac/vamsas/objects/core/AttachmentDescriptor.java @@ -57,7 +57,7 @@ public class AttachmentDescriptor extends uk.ac.vamsas.objects.core.AppDataDescr { super(); setExtendsWithoutFlatten(new uk.ac.vamsas.objects.core.AppDataDescriptor()); - nsURI = "http://www.vamsas.org"; + nsURI = "http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes"; xmlName = "Attachment"; org.exolab.castor.xml.util.XMLFieldDescriptorImpl desc = null; org.exolab.castor.mapping.FieldHandler handler = null; diff --git a/src/uk/ac/vamsas/objects/core/CommonDescriptor.java b/src/uk/ac/vamsas/objects/core/CommonDescriptor.java index 6f2cc14..6672b14 100644 --- a/src/uk/ac/vamsas/objects/core/CommonDescriptor.java +++ b/src/uk/ac/vamsas/objects/core/CommonDescriptor.java @@ -57,7 +57,7 @@ public class CommonDescriptor extends uk.ac.vamsas.objects.core.AppDataDescripto { super(); setExtendsWithoutFlatten(new uk.ac.vamsas.objects.core.AppDataDescriptor()); - nsURI = "http://www.vamsas.org"; + nsURI = "http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes"; xmlName = "Common"; } //-- uk.ac.vamsas.objects.core.CommonDescriptor() diff --git a/src/uk/ac/vamsas/objects/core/DataSetAnnotationsDescriptor.java b/src/uk/ac/vamsas/objects/core/DataSetAnnotationsDescriptor.java index 3286df7..fae04cf 100644 --- a/src/uk/ac/vamsas/objects/core/DataSetAnnotationsDescriptor.java +++ b/src/uk/ac/vamsas/objects/core/DataSetAnnotationsDescriptor.java @@ -57,7 +57,7 @@ public class DataSetAnnotationsDescriptor extends uk.ac.vamsas.objects.core.Rang { super(); setExtendsWithoutFlatten(new uk.ac.vamsas.objects.core.RangeAnnotationDescriptor()); - nsURI = "http://www.vamsas.org"; + nsURI = "http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes"; xmlName = "DataSetAnnotations"; //-- set grouping compositor @@ -130,7 +130,7 @@ public class DataSetAnnotationsDescriptor extends uk.ac.vamsas.objects.core.Rang } }; desc.setHandler(handler); - desc.setNameSpaceURI("http://www.vamsas.org"); + desc.setNameSpaceURI("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes"); desc.setRequired(true); desc.setMultivalued(false); addFieldDescriptor(desc); diff --git a/src/uk/ac/vamsas/objects/core/DataSetDescriptor.java b/src/uk/ac/vamsas/objects/core/DataSetDescriptor.java index a920361..d5c42fe 100644 --- a/src/uk/ac/vamsas/objects/core/DataSetDescriptor.java +++ b/src/uk/ac/vamsas/objects/core/DataSetDescriptor.java @@ -56,7 +56,7 @@ public class DataSetDescriptor extends org.exolab.castor.xml.util.XMLClassDescri public DataSetDescriptor() { super(); - nsURI = "http://www.vamsas.org"; + nsURI = "http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes"; xmlName = "DataSet"; //-- set grouping compositor @@ -127,7 +127,7 @@ public class DataSetDescriptor extends org.exolab.castor.xml.util.XMLClassDescri } }; desc.setHandler(handler); - desc.setNameSpaceURI("http://www.vamsas.org"); + desc.setNameSpaceURI("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes"); desc.setRequired(true); desc.setMultivalued(true); addFieldDescriptor(desc); @@ -163,7 +163,7 @@ public class DataSetDescriptor extends org.exolab.castor.xml.util.XMLClassDescri } }; desc.setHandler(handler); - desc.setNameSpaceURI("http://www.vamsas.org"); + desc.setNameSpaceURI("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes"); desc.setMultivalued(true); addFieldDescriptor(desc); @@ -198,7 +198,7 @@ public class DataSetDescriptor extends org.exolab.castor.xml.util.XMLClassDescri } }; desc.setHandler(handler); - desc.setNameSpaceURI("http://www.vamsas.org"); + desc.setNameSpaceURI("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes"); desc.setMultivalued(true); addFieldDescriptor(desc); @@ -233,7 +233,7 @@ public class DataSetDescriptor extends org.exolab.castor.xml.util.XMLClassDescri } }; desc.setHandler(handler); - desc.setNameSpaceURI("http://www.vamsas.org"); + desc.setNameSpaceURI("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes"); desc.setMultivalued(true); addFieldDescriptor(desc); @@ -268,7 +268,7 @@ public class DataSetDescriptor extends org.exolab.castor.xml.util.XMLClassDescri } }; desc.setHandler(handler); - desc.setNameSpaceURI("http://www.vamsas.org"); + desc.setNameSpaceURI("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes"); desc.setRequired(true); desc.setMultivalued(false); addFieldDescriptor(desc); diff --git a/src/uk/ac/vamsas/objects/core/DbRefDescriptor.java b/src/uk/ac/vamsas/objects/core/DbRefDescriptor.java index 563ed4b..e6e9374 100644 --- a/src/uk/ac/vamsas/objects/core/DbRefDescriptor.java +++ b/src/uk/ac/vamsas/objects/core/DbRefDescriptor.java @@ -56,7 +56,7 @@ public class DbRefDescriptor extends org.exolab.castor.xml.util.XMLClassDescript public DbRefDescriptor() { super(); - nsURI = "http://www.vamsas.org"; + nsURI = "http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes"; xmlName = "dbRef"; //-- set grouping compositor @@ -244,7 +244,7 @@ public class DbRefDescriptor extends org.exolab.castor.xml.util.XMLClassDescript } }; desc.setHandler(handler); - desc.setNameSpaceURI("http://www.vamsas.org"); + desc.setNameSpaceURI("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes"); desc.setMultivalued(true); addFieldDescriptor(desc); @@ -279,7 +279,7 @@ public class DbRefDescriptor extends org.exolab.castor.xml.util.XMLClassDescript } }; desc.setHandler(handler); - desc.setNameSpaceURI("http://www.vamsas.org"); + desc.setNameSpaceURI("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes"); desc.setMultivalued(true); addFieldDescriptor(desc); @@ -314,7 +314,7 @@ public class DbRefDescriptor extends org.exolab.castor.xml.util.XMLClassDescript } }; desc.setHandler(handler); - desc.setNameSpaceURI("http://www.vamsas.org"); + desc.setNameSpaceURI("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes"); desc.setMultivalued(true); addFieldDescriptor(desc); diff --git a/src/uk/ac/vamsas/objects/core/EntryDescriptor.java b/src/uk/ac/vamsas/objects/core/EntryDescriptor.java index c5fdc00..c9f8635 100644 --- a/src/uk/ac/vamsas/objects/core/EntryDescriptor.java +++ b/src/uk/ac/vamsas/objects/core/EntryDescriptor.java @@ -56,7 +56,7 @@ public class EntryDescriptor extends org.exolab.castor.xml.util.XMLClassDescript public EntryDescriptor() { super(); - nsURI = "http://www.vamsas.org"; + nsURI = "http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes"; xmlName = "entry"; //-- set grouping compositor @@ -128,7 +128,7 @@ public class EntryDescriptor extends org.exolab.castor.xml.util.XMLClassDescript } }; desc.setHandler(handler); - desc.setNameSpaceURI("http://www.vamsas.org"); + desc.setNameSpaceURI("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes"); desc.setRequired(true); desc.setMultivalued(false); addFieldDescriptor(desc); @@ -168,7 +168,7 @@ public class EntryDescriptor extends org.exolab.castor.xml.util.XMLClassDescript } }; desc.setHandler(handler); - desc.setNameSpaceURI("http://www.vamsas.org"); + desc.setNameSpaceURI("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes"); desc.setRequired(true); desc.setMultivalued(false); addFieldDescriptor(desc); @@ -208,7 +208,7 @@ public class EntryDescriptor extends org.exolab.castor.xml.util.XMLClassDescript } }; desc.setHandler(handler); - desc.setNameSpaceURI("http://www.vamsas.org"); + desc.setNameSpaceURI("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes"); desc.setRequired(true); desc.setMultivalued(false); addFieldDescriptor(desc); @@ -247,7 +247,7 @@ public class EntryDescriptor extends org.exolab.castor.xml.util.XMLClassDescript } }; desc.setHandler(handler); - desc.setNameSpaceURI("http://www.vamsas.org"); + desc.setNameSpaceURI("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes"); desc.setRequired(true); desc.setMultivalued(false); addFieldDescriptor(desc); @@ -285,7 +285,7 @@ public class EntryDescriptor extends org.exolab.castor.xml.util.XMLClassDescript } }; desc.setHandler(handler); - desc.setNameSpaceURI("http://www.vamsas.org"); + desc.setNameSpaceURI("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes"); desc.setMultivalued(true); addFieldDescriptor(desc); @@ -320,7 +320,7 @@ public class EntryDescriptor extends org.exolab.castor.xml.util.XMLClassDescript } }; desc.setHandler(handler); - desc.setNameSpaceURI("http://www.vamsas.org"); + desc.setNameSpaceURI("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes"); desc.setMultivalued(true); addFieldDescriptor(desc); @@ -355,7 +355,7 @@ public class EntryDescriptor extends org.exolab.castor.xml.util.XMLClassDescript } }; desc.setHandler(handler); - desc.setNameSpaceURI("http://www.vamsas.org"); + desc.setNameSpaceURI("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes"); desc.setMultivalued(true); addFieldDescriptor(desc); diff --git a/src/uk/ac/vamsas/objects/core/GlyphDescriptor.java b/src/uk/ac/vamsas/objects/core/GlyphDescriptor.java index c28acfc..726dec2 100644 --- a/src/uk/ac/vamsas/objects/core/GlyphDescriptor.java +++ b/src/uk/ac/vamsas/objects/core/GlyphDescriptor.java @@ -56,7 +56,7 @@ public class GlyphDescriptor extends org.exolab.castor.xml.util.XMLClassDescript public GlyphDescriptor() { super(); - nsURI = "http://www.vamsas.org"; + nsURI = "http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes"; xmlName = "glyph"; org.exolab.castor.xml.util.XMLFieldDescriptorImpl desc = null; org.exolab.castor.mapping.FieldHandler handler = null; diff --git a/src/uk/ac/vamsas/objects/core/InputDescriptor.java b/src/uk/ac/vamsas/objects/core/InputDescriptor.java index 413b38e..5fdd3f8 100644 --- a/src/uk/ac/vamsas/objects/core/InputDescriptor.java +++ b/src/uk/ac/vamsas/objects/core/InputDescriptor.java @@ -57,7 +57,7 @@ public class InputDescriptor extends uk.ac.vamsas.objects.core.RangeTypeDescript { super(); setExtendsWithoutFlatten(new uk.ac.vamsas.objects.core.RangeTypeDescriptor()); - nsURI = "http://www.vamsas.org"; + nsURI = "http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes"; xmlName = "input"; org.exolab.castor.xml.util.XMLFieldDescriptorImpl desc = null; org.exolab.castor.mapping.FieldHandler handler = null; diff --git a/src/uk/ac/vamsas/objects/core/InstanceDescriptor.java b/src/uk/ac/vamsas/objects/core/InstanceDescriptor.java index d4a0db2..3e2bc73 100644 --- a/src/uk/ac/vamsas/objects/core/InstanceDescriptor.java +++ b/src/uk/ac/vamsas/objects/core/InstanceDescriptor.java @@ -57,7 +57,7 @@ public class InstanceDescriptor extends uk.ac.vamsas.objects.core.AppDataDescrip { super(); setExtendsWithoutFlatten(new uk.ac.vamsas.objects.core.AppDataDescriptor()); - nsURI = "http://www.vamsas.org"; + nsURI = "http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes"; xmlName = "Instance"; org.exolab.castor.xml.util.XMLFieldDescriptorImpl desc = null; org.exolab.castor.mapping.FieldHandler handler = null; diff --git a/src/uk/ac/vamsas/objects/core/LinkDescriptor.java b/src/uk/ac/vamsas/objects/core/LinkDescriptor.java index 6f8e6c7..d10e937 100644 --- a/src/uk/ac/vamsas/objects/core/LinkDescriptor.java +++ b/src/uk/ac/vamsas/objects/core/LinkDescriptor.java @@ -56,7 +56,7 @@ public class LinkDescriptor extends org.exolab.castor.xml.util.XMLClassDescripto public LinkDescriptor() { super(); - nsURI = "http://www.vamsas.org"; + nsURI = "http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes"; xmlName = "link"; org.exolab.castor.xml.util.XMLFieldDescriptorImpl desc = null; org.exolab.castor.mapping.FieldHandler handler = null; diff --git a/src/uk/ac/vamsas/objects/core/LockFileDescriptor.java b/src/uk/ac/vamsas/objects/core/LockFileDescriptor.java index daa075d..2197a4f 100644 --- a/src/uk/ac/vamsas/objects/core/LockFileDescriptor.java +++ b/src/uk/ac/vamsas/objects/core/LockFileDescriptor.java @@ -56,7 +56,7 @@ public class LockFileDescriptor extends org.exolab.castor.xml.util.XMLClassDescr public LockFileDescriptor() { super(); - nsURI = "http://www.vamsas.ac.uk/vamsasDocument"; + nsURI = "http://www.vamsas.ac.uk/schemas/1.0/vamsasDocument"; xmlName = "LockFile"; org.exolab.castor.xml.util.XMLFieldDescriptorImpl desc = null; org.exolab.castor.mapping.FieldHandler handler = null; diff --git a/src/uk/ac/vamsas/objects/core/MapDescriptor.java b/src/uk/ac/vamsas/objects/core/MapDescriptor.java index b5db8a3..29c8f5b 100644 --- a/src/uk/ac/vamsas/objects/core/MapDescriptor.java +++ b/src/uk/ac/vamsas/objects/core/MapDescriptor.java @@ -57,7 +57,7 @@ public class MapDescriptor extends uk.ac.vamsas.objects.core.MapListDescriptor { { super(); setExtendsWithoutFlatten(new uk.ac.vamsas.objects.core.MapListDescriptor()); - nsURI = "http://www.vamsas.org"; + nsURI = "http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes"; xmlName = "map"; } //-- uk.ac.vamsas.objects.core.MapDescriptor() diff --git a/src/uk/ac/vamsas/objects/core/MapListDescriptor.java b/src/uk/ac/vamsas/objects/core/MapListDescriptor.java index d199f33..1b761c7 100644 --- a/src/uk/ac/vamsas/objects/core/MapListDescriptor.java +++ b/src/uk/ac/vamsas/objects/core/MapListDescriptor.java @@ -56,7 +56,7 @@ public class MapListDescriptor extends org.exolab.castor.xml.util.XMLClassDescri public MapListDescriptor() { super(); - nsURI = "http://www.vamsas.org"; + nsURI = "http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes"; xmlName = "mapList"; org.exolab.castor.xml.util.XMLFieldDescriptorImpl desc = null; org.exolab.castor.mapping.FieldHandler handler = null; diff --git a/src/uk/ac/vamsas/objects/core/MappingDescriptor.java b/src/uk/ac/vamsas/objects/core/MappingDescriptor.java index 703fcd1..7bd317f 100644 --- a/src/uk/ac/vamsas/objects/core/MappingDescriptor.java +++ b/src/uk/ac/vamsas/objects/core/MappingDescriptor.java @@ -57,7 +57,7 @@ public class MappingDescriptor extends uk.ac.vamsas.objects.core.MapListDescript { super(); setExtendsWithoutFlatten(new uk.ac.vamsas.objects.core.MapListDescriptor()); - nsURI = "http://www.vamsas.org"; + nsURI = "http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes"; xmlName = "mapping"; org.exolab.castor.xml.util.XMLFieldDescriptorImpl desc = null; org.exolab.castor.mapping.FieldHandler handler = null; diff --git a/src/uk/ac/vamsas/objects/core/NewickDescriptor.java b/src/uk/ac/vamsas/objects/core/NewickDescriptor.java index 8f9985e..c8a0436 100644 --- a/src/uk/ac/vamsas/objects/core/NewickDescriptor.java +++ b/src/uk/ac/vamsas/objects/core/NewickDescriptor.java @@ -56,7 +56,7 @@ public class NewickDescriptor extends org.exolab.castor.xml.util.XMLClassDescrip public NewickDescriptor() { super(); - nsURI = "http://www.vamsas.org"; + nsURI = "http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes"; xmlName = "newick"; org.exolab.castor.xml.util.XMLFieldDescriptorImpl desc = null; org.exolab.castor.mapping.FieldHandler handler = null; diff --git a/src/uk/ac/vamsas/objects/core/ParamDescriptor.java b/src/uk/ac/vamsas/objects/core/ParamDescriptor.java index 503c1ca..be792c2 100644 --- a/src/uk/ac/vamsas/objects/core/ParamDescriptor.java +++ b/src/uk/ac/vamsas/objects/core/ParamDescriptor.java @@ -56,7 +56,7 @@ public class ParamDescriptor extends org.exolab.castor.xml.util.XMLClassDescript public ParamDescriptor() { super(); - nsURI = "http://www.vamsas.org"; + nsURI = "http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes"; xmlName = "param"; org.exolab.castor.xml.util.XMLFieldDescriptorImpl desc = null; org.exolab.castor.mapping.FieldHandler handler = null; diff --git a/src/uk/ac/vamsas/objects/core/PosDescriptor.java b/src/uk/ac/vamsas/objects/core/PosDescriptor.java index 758c8cb..4dc928a 100644 --- a/src/uk/ac/vamsas/objects/core/PosDescriptor.java +++ b/src/uk/ac/vamsas/objects/core/PosDescriptor.java @@ -56,7 +56,7 @@ public class PosDescriptor extends org.exolab.castor.xml.util.XMLClassDescriptor public PosDescriptor() { super(); - nsURI = "http://www.vamsas.org"; + nsURI = "http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes"; xmlName = "pos"; org.exolab.castor.xml.util.XMLFieldDescriptorImpl desc = null; org.exolab.castor.mapping.FieldHandler handler = null; diff --git a/src/uk/ac/vamsas/objects/core/PropertyDescriptor.java b/src/uk/ac/vamsas/objects/core/PropertyDescriptor.java index de61324..ad565ea 100644 --- a/src/uk/ac/vamsas/objects/core/PropertyDescriptor.java +++ b/src/uk/ac/vamsas/objects/core/PropertyDescriptor.java @@ -56,7 +56,7 @@ public class PropertyDescriptor extends org.exolab.castor.xml.util.XMLClassDescr public PropertyDescriptor() { super(); - nsURI = "http://www.vamsas.org"; + nsURI = "http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes"; xmlName = "property"; org.exolab.castor.xml.util.XMLFieldDescriptorImpl desc = null; org.exolab.castor.mapping.FieldHandler handler = null; diff --git a/src/uk/ac/vamsas/objects/core/ProvenanceDescriptor.java b/src/uk/ac/vamsas/objects/core/ProvenanceDescriptor.java index f2a4b5d..10d94c9 100644 --- a/src/uk/ac/vamsas/objects/core/ProvenanceDescriptor.java +++ b/src/uk/ac/vamsas/objects/core/ProvenanceDescriptor.java @@ -56,7 +56,7 @@ public class ProvenanceDescriptor extends org.exolab.castor.xml.util.XMLClassDes public ProvenanceDescriptor() { super(); - nsURI = "http://www.vamsas.org"; + nsURI = "http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes"; xmlName = "Provenance"; //-- set grouping compositor @@ -93,7 +93,7 @@ public class ProvenanceDescriptor extends org.exolab.castor.xml.util.XMLClassDes } }; desc.setHandler(handler); - desc.setNameSpaceURI("http://www.vamsas.org"); + desc.setNameSpaceURI("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes"); desc.setRequired(true); desc.setMultivalued(true); addFieldDescriptor(desc); diff --git a/src/uk/ac/vamsas/objects/core/RangeAnnotationDescriptor.java b/src/uk/ac/vamsas/objects/core/RangeAnnotationDescriptor.java index 23a6a83..8ff3c74 100644 --- a/src/uk/ac/vamsas/objects/core/RangeAnnotationDescriptor.java +++ b/src/uk/ac/vamsas/objects/core/RangeAnnotationDescriptor.java @@ -57,7 +57,7 @@ public class RangeAnnotationDescriptor extends uk.ac.vamsas.objects.core.RangeTy { super(); setExtendsWithoutFlatten(new uk.ac.vamsas.objects.core.RangeTypeDescriptor()); - nsURI = "http://www.vamsas.org"; + nsURI = "http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes"; xmlName = "rangeAnnotation"; //-- set grouping compositor @@ -242,7 +242,7 @@ public class RangeAnnotationDescriptor extends uk.ac.vamsas.objects.core.RangeTy } }; desc.setHandler(handler); - desc.setNameSpaceURI("http://www.vamsas.org"); + desc.setNameSpaceURI("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes"); desc.setMultivalued(false); addFieldDescriptor(desc); @@ -280,7 +280,7 @@ public class RangeAnnotationDescriptor extends uk.ac.vamsas.objects.core.RangeTy } }; desc.setHandler(handler); - desc.setNameSpaceURI("http://www.vamsas.org"); + desc.setNameSpaceURI("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes"); desc.setMultivalued(false); addFieldDescriptor(desc); @@ -318,7 +318,7 @@ public class RangeAnnotationDescriptor extends uk.ac.vamsas.objects.core.RangeTy } }; desc.setHandler(handler); - desc.setNameSpaceURI("http://www.vamsas.org"); + desc.setNameSpaceURI("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes"); desc.setMultivalued(false); addFieldDescriptor(desc); @@ -355,7 +355,7 @@ public class RangeAnnotationDescriptor extends uk.ac.vamsas.objects.core.RangeTy } }; desc.setHandler(handler); - desc.setNameSpaceURI("http://www.vamsas.org"); + desc.setNameSpaceURI("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes"); desc.setMultivalued(true); addFieldDescriptor(desc); @@ -390,7 +390,7 @@ public class RangeAnnotationDescriptor extends uk.ac.vamsas.objects.core.RangeTy } }; desc.setHandler(handler); - desc.setNameSpaceURI("http://www.vamsas.org"); + desc.setNameSpaceURI("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes"); desc.setMultivalued(true); addFieldDescriptor(desc); @@ -425,7 +425,7 @@ public class RangeAnnotationDescriptor extends uk.ac.vamsas.objects.core.RangeTy } }; desc.setHandler(handler); - desc.setNameSpaceURI("http://www.vamsas.org"); + desc.setNameSpaceURI("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes"); desc.setMultivalued(true); addFieldDescriptor(desc); @@ -460,7 +460,7 @@ public class RangeAnnotationDescriptor extends uk.ac.vamsas.objects.core.RangeTy } }; desc.setHandler(handler); - desc.setNameSpaceURI("http://www.vamsas.org"); + desc.setNameSpaceURI("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes"); desc.setMultivalued(true); addFieldDescriptor(desc); diff --git a/src/uk/ac/vamsas/objects/core/RangeTypeDescriptor.java b/src/uk/ac/vamsas/objects/core/RangeTypeDescriptor.java index 33e8c0a..4a51b29 100644 --- a/src/uk/ac/vamsas/objects/core/RangeTypeDescriptor.java +++ b/src/uk/ac/vamsas/objects/core/RangeTypeDescriptor.java @@ -56,7 +56,7 @@ public class RangeTypeDescriptor extends org.exolab.castor.xml.util.XMLClassDesc public RangeTypeDescriptor() { super(); - nsURI = "http://www.vamsas.org"; + nsURI = "http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes"; xmlName = "rangeType"; //-- set grouping compositor @@ -93,7 +93,7 @@ public class RangeTypeDescriptor extends org.exolab.castor.xml.util.XMLClassDesc } }; desc.setHandler(handler); - desc.setNameSpaceURI("http://www.vamsas.org"); + desc.setNameSpaceURI("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes"); desc.setRequired(true); desc.setMultivalued(true); addFieldDescriptor(desc); @@ -129,7 +129,7 @@ public class RangeTypeDescriptor extends org.exolab.castor.xml.util.XMLClassDesc } }; desc.setHandler(handler); - desc.setNameSpaceURI("http://www.vamsas.org"); + desc.setNameSpaceURI("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes"); desc.setRequired(true); desc.setMultivalued(true); addFieldDescriptor(desc); diff --git a/src/uk/ac/vamsas/objects/core/ScoreDescriptor.java b/src/uk/ac/vamsas/objects/core/ScoreDescriptor.java index 8659f20..0cdbb7d 100644 --- a/src/uk/ac/vamsas/objects/core/ScoreDescriptor.java +++ b/src/uk/ac/vamsas/objects/core/ScoreDescriptor.java @@ -56,7 +56,7 @@ public class ScoreDescriptor extends org.exolab.castor.xml.util.XMLClassDescript public ScoreDescriptor() { super(); - nsURI = "http://www.vamsas.org"; + nsURI = "http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes"; xmlName = "score"; org.exolab.castor.xml.util.XMLFieldDescriptorImpl desc = null; org.exolab.castor.mapping.FieldHandler handler = null; diff --git a/src/uk/ac/vamsas/objects/core/SegDescriptor.java b/src/uk/ac/vamsas/objects/core/SegDescriptor.java index bb6e76a..8024f02 100644 --- a/src/uk/ac/vamsas/objects/core/SegDescriptor.java +++ b/src/uk/ac/vamsas/objects/core/SegDescriptor.java @@ -56,7 +56,7 @@ public class SegDescriptor extends org.exolab.castor.xml.util.XMLClassDescriptor public SegDescriptor() { super(); - nsURI = "http://www.vamsas.org"; + nsURI = "http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes"; xmlName = "seg"; org.exolab.castor.xml.util.XMLFieldDescriptorImpl desc = null; org.exolab.castor.mapping.FieldHandler handler = null; diff --git a/src/uk/ac/vamsas/objects/core/SequenceDescriptor.java b/src/uk/ac/vamsas/objects/core/SequenceDescriptor.java index 5b2e4b3..56890f1 100644 --- a/src/uk/ac/vamsas/objects/core/SequenceDescriptor.java +++ b/src/uk/ac/vamsas/objects/core/SequenceDescriptor.java @@ -57,7 +57,7 @@ public class SequenceDescriptor extends uk.ac.vamsas.objects.core.SequenceTypeDe { super(); setExtendsWithoutFlatten(new uk.ac.vamsas.objects.core.SequenceTypeDescriptor()); - nsURI = "http://www.vamsas.org"; + nsURI = "http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes"; xmlName = "Sequence"; //-- set grouping compositor @@ -167,7 +167,7 @@ public class SequenceDescriptor extends uk.ac.vamsas.objects.core.SequenceTypeDe } }; desc.setHandler(handler); - desc.setNameSpaceURI("http://www.vamsas.org"); + desc.setNameSpaceURI("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes"); desc.setMultivalued(true); addFieldDescriptor(desc); diff --git a/src/uk/ac/vamsas/objects/core/SequenceTypeDescriptor.java b/src/uk/ac/vamsas/objects/core/SequenceTypeDescriptor.java index 4aa4a86..24ec488 100644 --- a/src/uk/ac/vamsas/objects/core/SequenceTypeDescriptor.java +++ b/src/uk/ac/vamsas/objects/core/SequenceTypeDescriptor.java @@ -56,7 +56,7 @@ public class SequenceTypeDescriptor extends org.exolab.castor.xml.util.XMLClassD public SequenceTypeDescriptor() { super(); - nsURI = "http://www.vamsas.org"; + nsURI = "http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes"; xmlName = "SequenceType"; //-- set grouping compositor @@ -178,7 +178,7 @@ public class SequenceTypeDescriptor extends org.exolab.castor.xml.util.XMLClassD } }; desc.setHandler(handler); - desc.setNameSpaceURI("http://www.vamsas.org"); + desc.setNameSpaceURI("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes"); desc.setRequired(true); desc.setMultivalued(false); addFieldDescriptor(desc); @@ -218,7 +218,7 @@ public class SequenceTypeDescriptor extends org.exolab.castor.xml.util.XMLClassD } }; desc.setHandler(handler); - desc.setNameSpaceURI("http://www.vamsas.org"); + desc.setNameSpaceURI("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes"); desc.setRequired(true); desc.setMultivalued(false); addFieldDescriptor(desc); @@ -258,7 +258,7 @@ public class SequenceTypeDescriptor extends org.exolab.castor.xml.util.XMLClassD } }; desc.setHandler(handler); - desc.setNameSpaceURI("http://www.vamsas.org"); + desc.setNameSpaceURI("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes"); desc.setMultivalued(false); addFieldDescriptor(desc); @@ -295,7 +295,7 @@ public class SequenceTypeDescriptor extends org.exolab.castor.xml.util.XMLClassD } }; desc.setHandler(handler); - desc.setNameSpaceURI("http://www.vamsas.org"); + desc.setNameSpaceURI("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes"); desc.setMultivalued(true); addFieldDescriptor(desc); @@ -330,7 +330,7 @@ public class SequenceTypeDescriptor extends org.exolab.castor.xml.util.XMLClassD } }; desc.setHandler(handler); - desc.setNameSpaceURI("http://www.vamsas.org"); + desc.setNameSpaceURI("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes"); desc.setMultivalued(true); addFieldDescriptor(desc); diff --git a/src/uk/ac/vamsas/objects/core/TreeDescriptor.java b/src/uk/ac/vamsas/objects/core/TreeDescriptor.java index c635f74..00ee704 100644 --- a/src/uk/ac/vamsas/objects/core/TreeDescriptor.java +++ b/src/uk/ac/vamsas/objects/core/TreeDescriptor.java @@ -56,7 +56,7 @@ public class TreeDescriptor extends org.exolab.castor.xml.util.XMLClassDescripto public TreeDescriptor() { super(); - nsURI = "http://www.vamsas.org"; + nsURI = "http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes"; xmlName = "Tree"; //-- set grouping compositor @@ -165,7 +165,7 @@ public class TreeDescriptor extends org.exolab.castor.xml.util.XMLClassDescripto } }; desc.setHandler(handler); - desc.setNameSpaceURI("http://www.vamsas.org"); + desc.setNameSpaceURI("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes"); desc.setMultivalued(false); addFieldDescriptor(desc); @@ -202,7 +202,7 @@ public class TreeDescriptor extends org.exolab.castor.xml.util.XMLClassDescripto } }; desc.setHandler(handler); - desc.setNameSpaceURI("http://www.vamsas.org"); + desc.setNameSpaceURI("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes"); desc.setRequired(true); desc.setMultivalued(true); addFieldDescriptor(desc); @@ -238,7 +238,7 @@ public class TreeDescriptor extends org.exolab.castor.xml.util.XMLClassDescripto } }; desc.setHandler(handler); - desc.setNameSpaceURI("http://www.vamsas.org"); + desc.setNameSpaceURI("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes"); desc.setMultivalued(true); addFieldDescriptor(desc); @@ -273,7 +273,7 @@ public class TreeDescriptor extends org.exolab.castor.xml.util.XMLClassDescripto } }; desc.setHandler(handler); - desc.setNameSpaceURI("http://www.vamsas.org"); + desc.setNameSpaceURI("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes"); desc.setRequired(true); desc.setMultivalued(false); addFieldDescriptor(desc); diff --git a/src/uk/ac/vamsas/objects/core/UserDescriptor.java b/src/uk/ac/vamsas/objects/core/UserDescriptor.java index 1d23629..2630c49 100644 --- a/src/uk/ac/vamsas/objects/core/UserDescriptor.java +++ b/src/uk/ac/vamsas/objects/core/UserDescriptor.java @@ -57,7 +57,7 @@ public class UserDescriptor extends uk.ac.vamsas.objects.core.AppDataDescriptor { super(); setExtendsWithoutFlatten(new uk.ac.vamsas.objects.core.AppDataDescriptor()); - nsURI = "http://www.vamsas.org"; + nsURI = "http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes"; xmlName = "User"; org.exolab.castor.xml.util.XMLFieldDescriptorImpl desc = null; org.exolab.castor.mapping.FieldHandler handler = null; diff --git a/src/uk/ac/vamsas/objects/core/VAMSASDescriptor.java b/src/uk/ac/vamsas/objects/core/VAMSASDescriptor.java index 8c518ba..f5c87ad 100644 --- a/src/uk/ac/vamsas/objects/core/VAMSASDescriptor.java +++ b/src/uk/ac/vamsas/objects/core/VAMSASDescriptor.java @@ -56,7 +56,7 @@ public class VAMSASDescriptor extends org.exolab.castor.xml.util.XMLClassDescrip public VAMSASDescriptor() { super(); - nsURI = "http://www.vamsas.org"; + nsURI = "http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes"; xmlName = "VAMSAS"; //-- set grouping compositor @@ -164,7 +164,7 @@ public class VAMSASDescriptor extends org.exolab.castor.xml.util.XMLClassDescrip } }; desc.setHandler(handler); - desc.setNameSpaceURI("http://www.vamsas.org"); + desc.setNameSpaceURI("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes"); desc.setMultivalued(true); addFieldDescriptor(desc); @@ -199,7 +199,7 @@ public class VAMSASDescriptor extends org.exolab.castor.xml.util.XMLClassDescrip } }; desc.setHandler(handler); - desc.setNameSpaceURI("http://www.vamsas.org"); + desc.setNameSpaceURI("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes"); desc.setMultivalued(true); addFieldDescriptor(desc); diff --git a/src/uk/ac/vamsas/objects/core/VamsasDocumentDescriptor.java b/src/uk/ac/vamsas/objects/core/VamsasDocumentDescriptor.java index 093b688..010626d 100644 --- a/src/uk/ac/vamsas/objects/core/VamsasDocumentDescriptor.java +++ b/src/uk/ac/vamsas/objects/core/VamsasDocumentDescriptor.java @@ -56,7 +56,7 @@ public class VamsasDocumentDescriptor extends org.exolab.castor.xml.util.XMLClas public VamsasDocumentDescriptor() { super(); - nsURI = "http://www.vamsas.ac.uk/vamsasDocument"; + nsURI = "http://www.vamsas.ac.uk/schemas/1.0/vamsasDocument"; xmlName = "VamsasDocument"; //-- set grouping compositor @@ -94,7 +94,7 @@ public class VamsasDocumentDescriptor extends org.exolab.castor.xml.util.XMLClas } }; desc.setHandler(handler); - desc.setNameSpaceURI("http://www.vamsas.ac.uk/vamsasDocument"); + desc.setNameSpaceURI("http://www.vamsas.ac.uk/schemas/1.0/vamsasDocument"); desc.setRequired(true); desc.setMultivalued(false); addFieldDescriptor(desc); @@ -133,7 +133,7 @@ public class VamsasDocumentDescriptor extends org.exolab.castor.xml.util.XMLClas } }; desc.setHandler(handler); - desc.setNameSpaceURI("http://www.vamsas.ac.uk/vamsasDocument"); + desc.setNameSpaceURI("http://www.vamsas.ac.uk/schemas/1.0/vamsasDocument"); desc.setMultivalued(false); addFieldDescriptor(desc); @@ -167,7 +167,7 @@ public class VamsasDocumentDescriptor extends org.exolab.castor.xml.util.XMLClas } }; desc.setHandler(handler); - desc.setNameSpaceURI("http://www.vamsas.org"); + desc.setNameSpaceURI("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes"); desc.setMultivalued(false); addFieldDescriptor(desc); @@ -201,7 +201,7 @@ public class VamsasDocumentDescriptor extends org.exolab.castor.xml.util.XMLClas } }; desc.setHandler(handler); - desc.setNameSpaceURI("http://www.vamsas.org"); + desc.setNameSpaceURI("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes"); desc.setRequired(true); desc.setMultivalued(true); addFieldDescriptor(desc); @@ -237,7 +237,7 @@ public class VamsasDocumentDescriptor extends org.exolab.castor.xml.util.XMLClas } }; desc.setHandler(handler); - desc.setNameSpaceURI("http://www.vamsas.org"); + desc.setNameSpaceURI("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes"); desc.setMultivalued(true); addFieldDescriptor(desc); @@ -272,7 +272,7 @@ public class VamsasDocumentDescriptor extends org.exolab.castor.xml.util.XMLClas } }; desc.setHandler(handler); - desc.setNameSpaceURI("http://www.vamsas.org"); + desc.setNameSpaceURI("http://www.vamsas.ac.uk/schemas/1.0/vamsasTypes"); desc.setMultivalued(true); addFieldDescriptor(desc); -- 1.7.10.2