Changeset 556

Timestamp:

06/29/10 12:21:22 (14 years ago)

Author:

oschonef

Message:

• re-work virtual collection properties
  • remove visibility and origin
  • add purpose, reproducibility and reproducibility_notice and preliminary generated_by
• update / re-formatted XML schema to reflect these changes
• change internal XML representation of virtual collections
  • rename "ResourceProxy?" to "Resource"
  • drop id attribute
• update virtual collection registry query language to be able to search new properties
• update CMDI representation of virtual collections
• clean up Resource-set handling and virtual collection validator

HEADS UP: changes are not backwards compatible and require new database layout

Location:

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main

Files:

• java/eu/clarin/cmdi/virtualcollectionregistry/VirtualCollectionRegistry.java (modified) (1 diff)
• java/eu/clarin/cmdi/virtualcollectionregistry/VirtualCollectionRegistryMarshaller.java (modified) (3 diffs)
• java/eu/clarin/cmdi/virtualcollectionregistry/model/GeneratedBy.java (added)
• java/eu/clarin/cmdi/virtualcollectionregistry/model/Resource.java (modified) (3 diffs)
• java/eu/clarin/cmdi/virtualcollectionregistry/model/VirtualCollection.java (modified) (10 diffs)
• java/eu/clarin/cmdi/virtualcollectionregistry/model/VirtualCollectionValidator.java (modified) (4 diffs)
• java/eu/clarin/cmdi/virtualcollectionregistry/query/ASTPredicate.java (modified) (1 diff)
• java/eu/clarin/cmdi/virtualcollectionregistry/query/WhereClauseBuilder.java (modified) (2 diffs)
• jjtree/eu/clarin/cmdi/virtualcollectionregistry/query/QueryParser.jjt (modified) (14 diffs)
• resources/META-INF/VirtualCollection.xsd (modified) (1 diff)

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/VirtualCollectionRegistry.java

@@ -129 +129 @@
             new VirtualCollectionValidator();
         validator.validate(vc);
-
         try {
             EntityManager em = datastore.getEntityManager();

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/VirtualCollectionRegistryMarshaller.java

@@ -222 +222 @@
         for (Resource resource : vc.getResources()) {
             output.writeStartElement(NS_CMDI, "ResourceProxy");
-            output.writeAttribute("id", resource.getIdForXml());
+            output.writeAttribute("id", "r" + resource.getId());
             output.writeStartElement(NS_CMDI, "ResourceType");
             switch (resource.getType()) {
@@ -259 +259 @@
         output.writeCharacters(df.format(vc.getCreationDate()));
         output.writeEndElement(); // "CreationDate" element
-        output.writeStartElement(NS_CMDI, "Visibility");
-        switch (vc.getVisibility()) {
-        case ADVERTISED:
-            output.writeCharacters("advertised");
-            break;
-        case NON_ADVERTISED:
-            output.writeCharacters("non-advertised");
-            break;
-        } // switch
-        output.writeEndElement(); // "Visibility" element
-        if (vc.getOrigin() != null) {
-            output.writeStartElement(NS_CMDI, "Origin");
-            output.writeCharacters(vc.getOrigin());
-            output.writeEndElement(); // "Visibility" element
-        }
         if (vc.getCreator() != null) {
             Creator creator = vc.getCreator();
@@ -299 +284 @@
             }
         }
+        if (vc.getPurpose() != null) {
+            output.writeStartElement(NS_CMDI, "Purpose");
+            switch (vc.getPurpose()) {
+            case RESEARCH:
+                output.writeCharacters("research");
+                break;
+            case REFERENCE:
+                output.writeCharacters("reference");
+                break;
+            case SAMPLE:
+                output.writeCharacters("sample");
+                break;
+            case FUTURE_USE:
+                output.writeCharacters("future-use");
+                break;
+            } // switch (purpose)
+            output.writeEndElement(); // "Purpose" element
+        }
+        if (vc.getReproducibility() != null) {
+            output.writeStartElement(NS_CMDI, "Reproducibility");
+            switch (vc.getReproducibility()) {
+            case INTENDED:
+                output.writeCharacters("intended");
+                break;
+            case FLUCTUATING:
+                output.writeCharacters("fluctuating");
+                break;
+            case UNTENDED:
+                output.writeCharacters("untended");
+                break;
+            } // switch (purpose)
+            output.writeEndElement(); // "Reproducibility" element
+        }
+        if (vc.getReproducibilityNotice() != null) {
+            output.writeStartElement(NS_CMDI, "ReproducibilityNotice");
+            output.writeCharacters(vc.getReproducibilityNotice());
+            output.writeEndElement(); // "ReproducibilityNotice" element
+        }
         output.writeEndElement(); // "VirtualCollection" element
         output.writeEndElement(); // "Components" element

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/model/Resource.java

@@ -11 +11 @@
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlID;
 import javax.xml.bind.annotation.XmlType;
 
@@ -50 +48 @@
     }
 
-    @XmlID
-    @XmlAttribute(name = "id")
-    public String getIdForXml() {
-        return "r" + id;
-    }
-
     public void setType(ResourceType type) {
         if (type == null) {
@@ -80 +72 @@
     }
 
-    protected int getSignature() {
-        return new HashCodeBuilder(799, 51).append(type).append(ref)
-                .toHashCode();
+    @Override
+    public boolean equals(Object other) {
+        if ((other != null) && (other instanceof Resource)) {
+            final Resource r = (Resource) other;
+            return r.type.equals(this.type) && r.ref.equals(this.ref);
+        }
+        return false;
+    }
+    
+    @Override
+    public int hashCode() {
+        return new HashCodeBuilder(799, 51)
+            .append(type)
+            .append(ref)
+            .toHashCode();
     }
 

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/model/VirtualCollection.java

@@ -2 +2 @@
 
 import java.util.Date;
-import java.util.HashMap;
 import java.util.LinkedHashSet;
 import java.util.Set;
@@ -71 +70 @@
 @XmlRootElement(name = "VirtualCollection")
 @XmlAccessorType(XmlAccessType.NONE)
-@XmlType(propOrder = { "name", "description", "creationDate", "visibility",
-                       "type", "origin", "creator", "resources" })
+@XmlType(propOrder = { "name", "description", "creationDate", "type",
+                       "creator", "purpose", "reproducibility",
+                       "reproducibilityNotice", "resources", "generatedBy" })
 @XmlSeeAlso({ Creator.class,
+              GeneratedBy.class,
               Resource.class,
               PersistentIdentifier.class })
@@ -91 +92 @@
         DEAD
     } // enum State
-    @XmlType(namespace = "urn:x-vcr:virtualcollection:visibility")
-    @XmlEnum(String.class)
-    public static enum Visibility {
-        @XmlEnumValue("advertised")
-        ADVERTISED,
-        @XmlEnumValue("non-advertised")
-        NON_ADVERTISED;
-    } // enum Visibility
     @XmlType(namespace = "urn:x-vcr:virtualcollection:type")
     @XmlEnum(String.class)
@@ -106 +99 @@
         @XmlEnumValue("intensional")
         INTENSIONAL
+    }
+    @XmlType(namespace = "urn:x-vcr:virtualcollection:purpose")
+    @XmlEnum(String.class)
+    public static enum Purpose {
+        @XmlEnumValue("research")
+        RESEARCH,
+        @XmlEnumValue("reference")
+        REFERENCE,
+        @XmlEnumValue("sample")
+        SAMPLE,
+        @XmlEnumValue("future-use")
+        FUTURE_USE
+    }
+    @XmlType(namespace = "urn:x-vcr:virtualcollection:reproducability")
+    @XmlEnum(String.class)
+    public static enum Reproducibility {
+        @XmlEnumValue("intended")
+        INTENDED,
+        @XmlEnumValue("fluctuating")
+        FLUCTUATING,
+        @XmlEnumValue("untended")
+        UNTENDED
     }
     @Id
@@ -135 +150 @@
     @Temporal(TemporalType.DATE)
     private Date creationDate;
-    @Column(name = "visibility")
-    @Enumerated(EnumType.ORDINAL)
-    private Visibility visibility = Visibility.ADVERTISED;
     @Column(name = "type")
     @Enumerated(EnumType.ORDINAL)
     private Type type = Type.EXTENSIONAL;
-    @Column(name = "origin")
-    private String origin;
     @Embedded
     private Creator creator;
+    @Column(name = "purpose")
+    @Enumerated(EnumType.ORDINAL)
+    private Purpose purpose;
+    @Column(name = "reproducibility")
+    @Enumerated(EnumType.ORDINAL)
+    private Reproducibility reproducibility;
+    @Column(name = "reproducibility_notice")
+    private String reproducibilityNotice;
     @OneToMany(cascade = CascadeType.ALL,
-               fetch = FetchType.LAZY)
+               fetch = FetchType.LAZY,
+               orphanRemoval = true)
     @JoinColumn(name = "vc_id",
                 nullable = false)
     @OrderBy("id")
     private Set<Resource> resources = new LinkedHashSet<Resource>();
+    @Embedded
+    private GeneratedBy generatedby;
     @Column(name = "created",
             nullable = false,
@@ -259 +280 @@
     }
 
-    public void setVisibility(Visibility visibility) {
-        if (visibility == null) {
-            throw new NullPointerException("visibility == null");
-        }
-        this.visibility = visibility;
-    }
-
-    @XmlElement(name = "Visibility")
-    public Visibility getVisibility() {
-        return visibility;
-    }
-
     public void setType(Type style) {
         if (style == null) {
@@ -283 +292 @@
     }
 
-    public void setOrigin(String origin) {
-        this.origin = origin;
-    }
-
-    @XmlElement(name = "Origin")
-    public String getOrigin() {
-        return origin;
-    }
-
     public void setCreator(Creator creator) {
         this.creator = creator;
@@ -301 +301 @@
     }
 
+    public void setPurpose(Purpose purpose) {
+        this.purpose = purpose;
+    }
+    
+    @XmlElement(name = "Purpose")
+    public Purpose getPurpose() {
+        return purpose;
+    }
+    
+    public void setReproducibility(Reproducibility reproducibility) {
+        this.reproducibility = reproducibility;
+    }
+
+    @XmlElement(name = "Reproducability")
+    public Reproducibility getReproducibility() {
+        return reproducibility;
+    }
+
+    public void setReproducibilityNotice(String reproducibilityNotice) {
+        this.reproducibilityNotice = reproducibilityNotice;
+    }
+
+    @XmlElement(name = "ReproducibilityNotice")
+    public String getReproducibilityNotice() {
+        return reproducibilityNotice;
+    }
+
     @XmlElementWrapper(name = "Resources")
-    @XmlElements({ @XmlElement(name = "ResourceProxy", type = Resource.class) })
+    @XmlElements({ @XmlElement(name = "Resource", type = Resource.class) })
     public Set<Resource> getResources() {
         return resources;
+    }
+
+    public void setGeneratedBy(GeneratedBy generatedby) {
+        this.generatedby = generatedby;
+    }
+
+    @XmlElement(name = "GeneratedBy")
+    public GeneratedBy getGeneratedBy() {
+        return generatedby;
     }
 
@@ -333 +369 @@
         this.setDescription(vc.getDescription());
         this.setCreationDate(vc.getCreationDate());
-        this.setVisibility(vc.getVisibility());
         this.setType(vc.getType());
-        this.setOrigin(vc.getOrigin());
         Creator c = vc.getCreator();
         if (c != null) {
@@ -344 +378 @@
             this.creator = null;
         }
-
-        HashMap<Integer, Resource> old_res =
-            new HashMap<Integer, Resource>(this.resources.size());
-        for (Resource r : this.resources) {
-            old_res.put(r.getSignature(), r);
-
-        }
-        HashMap<Integer, Resource> new_res =
-            new HashMap<Integer, Resource>(vc.getResources().size());
-        for (Resource r : vc.getResources()) {
-            new_res.put(r.getSignature(), r);
-        }
-        for (Resource r : new_res.values()) {
-            if (!old_res.containsKey(r.getSignature())) {
-                resources.add(r);
-            }
-        }
-        for (Resource r : old_res.values()) {
-            if (!new_res.containsKey(r.getSignature())) {
-                resources.remove(r);
-            }
-        }
+        this.setPurpose(vc.getPurpose());
+        this.setReproducibility(vc.getReproducibility());
+        this.setReproducibilityNotice(vc.getReproducibilityNotice());
+
+        // add all new resources to set
+        this.resources.addAll(vc.resources);
+        // purge all deleted members
+        this.resources.retainAll(vc.resources);
     }
 

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/model/VirtualCollectionValidator.java

@@ -1 +1 @@
 package eu.clarin.cmdi.virtualcollectionregistry.model;
 
-import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Set;
 
 import eu.clarin.cmdi.virtualcollectionregistry.VirtualCollectionRegistryException;
@@ -7 +8 @@
 
 public class VirtualCollectionValidator {
-    private HashMap<Integer, Resource> uniqueResources =
-        new HashMap<Integer, Resource>();
-    private HashMap<String, Resource> uniqueResourceRefs =
-        new HashMap<String, Resource>();
+    private Set<String> uniqueResourceRefs = new HashSet<String>(512);
 
     public void validate(VirtualCollection vc)
@@ -27 +25 @@
         }
         for (Resource resource : vc.getResources()) {
-            int signature = resource.getSignature();
-            if (uniqueResources.containsKey(signature)) {
-                throw new VirtualCollectionRegistryUsageException(
-                        "collection contains non-unique resources");
-            }
-            uniqueResources.put(signature, resource);
             String ref = resource.getRef();
             if ((ref == null) || ref.trim().isEmpty()) {
@@ -38 +30 @@
                         "collection contains resource with empty ResourceRef");
             }
-            if (uniqueResourceRefs.containsKey(ref)) {
+            if (uniqueResourceRefs.contains(ref)) {
                 throw new VirtualCollectionRegistryUsageException(
                         "collection contains non-unique ResourceRefs");
             }
-            uniqueResourceRefs.put(ref, resource);
+            uniqueResourceRefs.add(ref);
         }
     }
 
     private void reset() {
-        uniqueResources.clear();
         uniqueResourceRefs.clear();
     }

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/query/ASTPredicate.java

@@ -55 +55 @@
             sb.append("vc_state");
             break;
+        case QueryParserConstants.VC_PURPOSE:
+            sb.append("vc_purpose");
+            break;
+        case QueryParserConstants.VC_REPRODUCIBILITY:
+            sb.append("vc_reproducibility");
+            break;
         case QueryParserConstants.VC_MODIFIED:
             sb.append("vc_modified");

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/query/WhereClauseBuilder.java

@@ -132 +132 @@
         case QueryParserConstants.VC_STATE:
             predicate = makeStatePredicate(data,
+                    node.getOperator(), node.getValue());
+            break;
+        case QueryParserConstants.VC_PURPOSE:
+            predicate = makePurposePredicate(data,
+                    node.getOperator(), node.getValue());
+            break;
+        case QueryParserConstants.VC_REPRODUCIBILITY:
+            predicate = makeReproducibilityPredicate(data,
                     node.getOperator(), node.getValue());
             break;
@@ -208 +216 @@
                 return data.getBuilder().notEqual(attribute, state);
             }
+        default:
+            throw new InternalError("bad operator");
+        } // switch (operator)
+    }
+
+    private static Predicate makePurposePredicate(Data data, int operator,
+            String value) {
+        VirtualCollection.Purpose purpose = null;
+        if ("research".equalsIgnoreCase(value)) {
+            purpose = VirtualCollection.Purpose.RESEARCH;
+        } else if ("reference".equalsIgnoreCase(value)) {
+            purpose = VirtualCollection.Purpose.REFERENCE;
+        } else if ("sample".equalsIgnoreCase(value)) {
+            purpose = VirtualCollection.Purpose.SAMPLE;
+        } else if ("future-use".equalsIgnoreCase(value)) {
+            purpose = VirtualCollection.Purpose.FUTURE_USE;
+        } else {
+            throw new InternalError("bad value");
+        }
+        Expression<VirtualCollection.Purpose> attribute =
+            data.getRoot().get(VirtualCollection_.purpose);
+        switch (operator) {
+        case QueryParserConstants.EQ:
+            return data.getBuilder().equal(attribute, purpose);
+        case QueryParserConstants.NE:
+            return data.getBuilder().notEqual(attribute, purpose);
+        default:
+            throw new InternalError("bad operator");
+        } // switch (operator)
+    }
+
+    private static Predicate makeReproducibilityPredicate(Data data, 
+            int operator, String value) {
+        VirtualCollection.Reproducibility reproducability = null;
+        if ("intended".equalsIgnoreCase(value)) {
+            reproducability = VirtualCollection.Reproducibility.INTENDED;
+        } else if ("fluctuating".equalsIgnoreCase(value)) {
+            reproducability = VirtualCollection.Reproducibility.FLUCTUATING;
+        } else if ("untended".equalsIgnoreCase(value)) {
+            reproducability = VirtualCollection.Reproducibility.UNTENDED;
+        } else {
+            throw new InternalError("bad value");
+        }
+        Expression<VirtualCollection.Reproducibility> attribute =
+            data.getRoot().get(VirtualCollection_.reproducibility);
+        switch (operator) {
+        case QueryParserConstants.EQ:
+            return data.getBuilder().equal(attribute, reproducability);
+        case QueryParserConstants.NE:
+            return data.getBuilder().notEqual(attribute, reproducability);
         default:
             throw new InternalError("bad operator");

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/jjtree/eu/clarin/cmdi/virtualcollectionregistry/query/QueryParser.jjt

@@ -6 +6 @@
     VISITOR           = true;
 }
-
 PARSER_BEGIN(QueryParser)
 package eu.clarin.cmdi.virtualcollectionregistry.query;
-
 public class QueryParser {
     public QueryParser(String s) {
@@ -16 +14 @@
 } // class QueryParser
 PARSER_END(QueryParser)
-
 /*
-  (vc.)name:         STRING, EQ, NE
-  (vc.)desciption:   STRING, EQ, NE
-  (vc.)created:      DATE,   EQ, NE, GT, GE, LT, LE
-  {vc.}modified:     DATE,   EQ, NE, GT, GE, LT, LE
-  (vc.)state:        { "public", "private", "deleted"}, EQ, NE
+  (vc.)name:           STRING, EQ, NE
+  (vc.)desciption:     STRING, EQ, NE
+  (vc.)created:        ISO-DATE, EQ, NE, GT, GE, LT, LE
+  {vc.}modified:       ISO-DATE, EQ, NE, GT, GE, LT, LE
+  (vc.)state:          { "public", "private", "deleted" }, EQ, NE
+  {vc.}purpose:        { "research", "reference",
+                         "sample", "future-use" } EQ, NE
+  {vc.}reproducability { "intended", "fluctuating", "untended"} EQ, NE
   (cr.)creator:      STRING, EQ, NE
   {cr.}email:        STRING, EQ, NE
   {cr.}organization: STRING, EQ, NE
 */
-
 SKIP: {
     " "
@@ -34 +33 @@
     | "\r"
 }
-
 TOKEN: {
       <VC_NAME: "name">
@@ -41 +39 @@
     | <VC_MODIFIED: "modified">
     | <VC_STATE: "state">
+    | <VC_PURPOSE: "purpose">
+    | <VC_REPRODUCIBILITY: "reproducibility">
     | <CR_NAME: "creator">
     | <CR_ORGANIZATION: "organization">
@@ -51 +51 @@
     | <GE: ">=">
     | <LT: "<">
-    | <LE: "<="> 
+    | <LE: "<=">
     | <LPAREN: "(">
     | <RPAREN: ")">
@@ -57 +57 @@
     | <STATE_PRIVATE: "private">
     | <STATE_DELETED: "deleted">
+    | <PURPOSE_RESEARCH: "research">
+    | <PURPOSE_REFERENCE: "reference">
+    | <PURPOSE_SAMPLE: "sample">
+    | <PURPOSE_FUTURE_USE: "future-use">
+    | <REPRODUCIBILITY_INTENDED: "intended">
+    | <REPRODUCIBILITY_FLUCTUATING: "fluctuating">
+    | <REPRODUCIBILITY_UNTENDED: "untended">
     | <#DIGIT: ["0"-"9"]>
     | <ISO_DATE: <DIGIT> <DIGIT> <DIGIT> <DIGIT> "-"
@@ -63 +70 @@
                  <DIGIT> <DIGIT> ":"
                  <DIGIT> <DIGIT> ":"
-                 <DIGIT> <DIGIT> "Z">    
+                 <DIGIT> <DIGIT> "Z">
     | <QUOTED_STRING: "\"" (~["\""])+ "\"" >
 }
-
 ASTStart start() #Start : {
 }
@@ -73 +79 @@
     { return jjtThis; }
 }
-
 private void expressionOr() : {
 }
@@ -79 +84 @@
     (expressionAnd() (<OR> expressionAnd())*) #Or(>1)
 }
-
 private void expressionAnd() : {
 }
@@ -85 +89 @@
     (term() (<AND> term())*) #And(>1)
 }
-
 private void term() : {
 }
@@ -92 +95 @@
     | (<LPAREN> expressionOr() <RPAREN>)
 }
-
 private void predicate() #Predicate : {
     Token attribute = null;
@@ -123 +125 @@
          | operator = <LE> )
          value = <ISO_DATE> )
+     | ( attribute = <VC_PURPOSE>
+        ( operator = <EQ>
+        | operator = <NE> )
+        ( value = <PURPOSE_RESEARCH>
+        | value = <PURPOSE_REFERENCE>
+        | value = <PURPOSE_SAMPLE>
+        | value = <PURPOSE_FUTURE_USE> ) )
+     | ( attribute = <VC_REPRODUCIBILITY>
+        ( operator = <EQ>
+        | operator = <NE> )
+        ( value = <REPRODUCIBILITY_INTENDED>
+        | value = <REPRODUCIBILITY_FLUCTUATING>
+        | value = <REPRODUCIBILITY_UNTENDED> ) )
     )
     {
@@ -128 +143 @@
             throw new ParseException("internal error while parsing query");
         }
-
         // strip quotes from QUOTED_STRING
         String v = value.image;
@@ -134 +148 @@
             v = v.substring(1, v.length() - 1);
         }
-
         jjtThis.setAttribute(attribute.kind);
         jjtThis.setOperator(operator.kind);

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/resources/META-INF/VirtualCollection.xsd

@@ -1 +1 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+  elementFormDefault="qualified">
 
-        <xs:element name="VirtualCollection" type="VirtualCollectionType" />
+  <xs:element name="VirtualCollections">
+    <xs:complexType>
+      <xs:sequence maxOccurs="unbounded">
+        <xs:element ref="VirtualCollection" />
+      </xs:sequence>
+      <xs:attribute name="totalCount" type="xs:integer" />
+      <xs:attribute name="offset" type="xs:integer" />
+      <xs:attribute name="result">
+        <xs:simpleType>
+          <xs:restriction base="xs:string">
+            <xs:enumeration value="full" />
+            <xs:enumeration value="partial" />
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
 
-        <xs:element name="VirtualCollections" type="VirtualCollectionsType" />
-
-        <xs:complexType name="VirtualCollectionsType">
-                <xs:sequence maxOccurs="unbounded">
-                        <xs:element ref="VirtualCollection" />
-                </xs:sequence>
-                <xs:attribute name="totalCount" type="xs:integer" />
-                <xs:attribute name="offset" type="xs:integer" />
-                <xs:attribute name="result">
-                        <xs:simpleType>
-                                <xs:restriction base="xs:string">
-                                        <xs:enumeration value="full" />
-                                        <xs:enumeration value="partial" />
-                                </xs:restriction>
-                        </xs:simpleType>
-                </xs:attribute>
-        </xs:complexType>
-
-        <xs:complexType name="VirtualCollectionType">
-                <xs:sequence>
-                        <xs:element name="Name" type="xs:string" />
-                        <xs:element minOccurs="0" name="Description" type="xs:string" />
-                        <xs:element minOccurs="0" name="CreationDate" type="xs:date" />
-                        <xs:element minOccurs="0" name="Visibility" type="VisibilityType" />
-                        <xs:element name="Type" type="TypeType" />
-                        <xs:element minOccurs="0" name="Origin" type="xs:string" />
-                        <xs:element minOccurs="0" name="Creator" type="CreatorType" />
-                        <xs:element name="Resources" type="ResourcesType" />
-                </xs:sequence>
-                <xs:attribute name="id" type="xs:long" use="optional" />
-        <xs:attribute name="persistentId" type="xs:string" use="optional" />
-                <xs:attribute name="state" type="xs:string" use="optional" />
-        </xs:complexType>
-
-
-        <xs:complexType name="ResourcesType">
-                <xs:sequence maxOccurs="unbounded">
-                        <xs:element name="ResourceProxy" type="ResourceType" />
-                </xs:sequence>
-        </xs:complexType>
-
-        <xs:complexType name="ResourceType">
-                <xs:sequence>
-                        <xs:element name="ResourceType" type="ResourceTypeType" />
-                        <xs:element name="ResourceRef" type="ResourceRefType" />
-                </xs:sequence>
-                <xs:attribute name="id" type="xs:ID" use="required" />
-        </xs:complexType>
-
-        <xs:complexType name="CreatorType">
-                <xs:sequence>
-                        <xs:element name="Name" type="xs:string" />
-                        <xs:element minOccurs="0" name="Email" type="xs:string" />
-                        <xs:element minOccurs="0" name="Organisation" type="xs:string" />
-                </xs:sequence>
-                <xs:attribute name="ref" type="xs:IDREF" />
-        </xs:complexType>
-
-        <xs:simpleType name="ResourceTypeType">
-                <xs:restriction base="xs:string">
-                        <xs:enumeration value="Metadata" />
-                        <xs:enumeration value="Resource" />
-                </xs:restriction>
-        </xs:simpleType>
-
-        <xs:simpleType name="ResourceRefType">
-                <xs:restriction base="xs:anyURI" />
-        </xs:simpleType>
-
-        <xs:simpleType name="VisibilityType">
-                <xs:restriction base="xs:string">
-                        <xs:enumeration value="advertised" />
-                        <xs:enumeration value="non-advertised" />
-                </xs:restriction>
-        </xs:simpleType>
-
-        <xs:simpleType name="TypeType">
-                <xs:restriction base="xs:string">
-                        <xs:enumeration value="extensional" />
-                        <xs:enumeration value="intensional" />
-                </xs:restriction>
-        </xs:simpleType>
-
+  <xs:element name="VirtualCollection">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element name="Name" type="xs:string" />
+        <xs:element minOccurs="0" name="Description" type="xs:string" />
+        <xs:element minOccurs="0" name="CreationDate" type="xs:date" />
+        <xs:element name="Type">
+          <xs:simpleType>
+            <xs:restriction base="xs:string">
+              <xs:enumeration value="extensional" />
+              <xs:enumeration value="intensional" />
+            </xs:restriction>
+          </xs:simpleType>
+        </xs:element>
+        <xs:element minOccurs="0" name="Creator">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element name="Name" type="xs:string" />
+              <xs:element minOccurs="0" name="Email" type="xs:string" />
+              <xs:element minOccurs="0" name="Organisation"
+                type="xs:string" />
+            </xs:sequence>
+            <xs:attribute name="ref" type="xs:IDREF" />
+          </xs:complexType>
+        </xs:element>
+        <xs:element minOccurs="0" name="Purpose">
+          <xs:simpleType>
+            <xs:restriction base="xs:string">
+              <xs:enumeration value="research" />
+              <xs:enumeration value="reference" />
+              <xs:enumeration value="sample" />
+              <xs:enumeration value="future-use" />
+              <!-- to be extended -->
+            </xs:restriction>
+          </xs:simpleType>
+        </xs:element>
+        <xs:element minOccurs="0" name="Reproducibility">
+          <xs:simpleType>
+            <xs:restriction base="xs:string">
+              <xs:enumeration value="intended" />
+              <xs:enumeration value="fluctuating" />
+              <xs:enumeration value="untended" />
+            </xs:restriction>
+          </xs:simpleType>
+        </xs:element>
+        <xs:element minOccurs="0" name="ReproducibilityNotice"
+          type="xs:string" />
+        <xs:element name="Resources">
+          <xs:complexType>
+            <xs:sequence maxOccurs="unbounded">
+              <xs:element name="Resource">
+                <xs:complexType>
+                  <xs:sequence>
+                    <xs:element name="ResourceType">
+                      <xs:simpleType>
+                        <xs:restriction base="xs:string">
+                          <xs:enumeration value="Metadata" />
+                          <xs:enumeration value="Resource" />
+                        </xs:restriction>
+                      </xs:simpleType>
+                    </xs:element>
+                    <xs:element name="ResourceRef">
+                      <xs:simpleType>
+                        <xs:restriction base="xs:anyURI" />
+                      </xs:simpleType>
+                    </xs:element>
+                  </xs:sequence>
+                </xs:complexType>
+              </xs:element>
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
+        <xs:element name="GeneratedBy" minOccurs="0">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element name="Description" type="xs:string" />
+              <xs:element name="Query" maxOccurs="1"
+                minOccurs="0">
+                <xs:complexType>
+                  <xs:sequence>
+                    <xs:any namespace="##any" processContents="lax" />
+                  </xs:sequence>
+                  <xs:attribute name="profile" type="xs:string"
+                    use="optional" />
+                </xs:complexType>
+              </xs:element>
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
+      </xs:sequence>
+      <xs:attribute name="id" type="xs:long" use="optional" />
+      <xs:attribute name="persistentId" type="xs:string"
+        use="optional" />
+      <xs:attribute name="state" use="optional">
+        <xs:simpleType>
+          <xs:restriction base="xs:string">
+            <xs:enumeration value="private" />
+            <xs:enumeration value="public-pending" />
+            <xs:enumeration value="public" />
+            <xs:enumeration value="deleted" />
+            <xs:enumeration value="dead" />
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
 </xs:schema>