active-fedora 9.0.0.beta2 → 9.0.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d60ea93eeb279f9295e64e08e725c95cf5bea026
-  data.tar.gz: 625d2f73009486e3d60b2491a81589f13b11ab4c
+  metadata.gz: 380da0e904e671fecd1e7cc340a7ff9e7e43ca89
+  data.tar.gz: 01155eab5f9d0480eefc945636a17c48707ddae7
 SHA512:
-  metadata.gz: d438e3f43b8b128c721fb4c984ecce6fb8d250fa473ec85e586b51913f2fd27105a74bb8773249e74028c1955d6e882469acf6af2708d35526ab21328c034f6e
-  data.tar.gz: 0a7739691a954a784416251ec56322e7ce3ade16b7387d1d7c1476dcc6141dc54f545a4218f438e18c3c26e0f48b6aa3c4de5590af2a6b2fdc7ea88544094e0d
+  metadata.gz: 33fe88b57b1e02b8173754cbbac2a722f364b33d119375f2a3c1b1a44229040c779938896ac3abd15a58ef0647b591346fe161ab10b1f7e89b076a1f12d52929
+  data.tar.gz: a7b51616edde2428ac50bd8721f82d7db76e70d1532e02613b31e06e20a1b54d1d15826993d98763d3e592c78bc49953090b45805d9596b9dc6f618534f59f27

data/config/jetty.yml

@@ -2,5 +2,5 @@ default:
   startup_wait: 90
   jetty_port: 8983
   java_opts:
-    - "-Xmx256m" 
+    - "-Xmx512m"
     - "-XX:MaxPermSize=128m"

data/lib/active_fedora.rb

@@ -19,12 +19,16 @@ module RDF
   class Literal
     class DateTime < Literal
       ALTERNATIVE_FORMAT   = '%Y-%m-%dT%H:%M:%S'.freeze
+      DOT                  = '.'.freeze
+      Z                    = 'Z'.freeze
+      EMPTY                = ''.freeze
 
       def to_s
         @string ||= begin
-          nano = @object.strftime('%N').sub(/0+\Z/, '')
-          nano = '.' + nano unless nano.blank?
-          @object.strftime(ALTERNATIVE_FORMAT) + nano + 'Z'
+          # Show nanoseconds but remove trailing zeros
+          nano = @object.strftime('%N').sub(/0+\Z/, EMPTY)
+          nano = DOT + nano unless nano.blank?
+          @object.strftime(ALTERNATIVE_FORMAT) + nano + Z
         end
       end
     end
@@ -69,6 +73,7 @@ module ActiveFedora #:nodoc:
     autoload :Persistence
     autoload :QualifiedDublinCoreDatastream
     autoload :Querying
+    autoload :QueryResultBuilder
     autoload :RDF
     autoload_under 'rdf' do
       autoload :RDFDatastream
@@ -91,6 +96,7 @@ module ActiveFedora #:nodoc:
     autoload :Serialization
     autoload :SimpleDatastream
     autoload :SolrInstanceLoader
+    autoload :SolrQueryBuilder
     autoload :SolrService
     autoload :SparqlInsert
     autoload :Predicates
@@ -151,6 +157,7 @@ module ActiveFedora #:nodoc:
       SolrService.reset!
       Predicates.predicate_config = nil
       configurator.init(options)
+      fedora.init_base_path
     end
 
     def config
@@ -224,6 +231,7 @@ module ActiveFedora #:nodoc:
         end
       end
     end
+
   end
 
   self.configurator ||= ActiveFedora::FileConfigurator.new

data/lib/active_fedora/associations/association_scope.rb

@@ -22,10 +22,10 @@ module ActiveFedora
         chain.each_with_index do |reflection, i|
           if reflection.source_macro == :belongs_to
             # Create a partial solr query using the ids. We may add additional filters such as class_name later
-            scope = scope.where( ActiveFedora::SolrService.construct_query_for_ids([owner[reflection.foreign_key]]))
+            scope = scope.where( ActiveFedora::SolrQueryBuilder.construct_query_for_ids([owner[reflection.foreign_key]]))
           elsif reflection.source_macro == :has_and_belongs_to_many
           else
-            scope = scope.where( ActiveFedora::SolrService.construct_query_for_rel(association.send(:find_predicate) => owner.id))
+            scope = scope.where( ActiveFedora::SolrQueryBuilder.construct_query_for_rel(association.send(:find_reflection) => owner.id))
           end
 
           is_first_chain = i == 0

data/lib/active_fedora/associations/belongs_to_association.rb

@@ -42,8 +42,8 @@ module ActiveFedora
           candidate_classes = klass.descendants.select {|d| d.name }
           candidate_classes += [klass] unless klass == ActiveFedora::Base
           model_pairs = candidate_classes.inject([]) { |arr, klass| arr << [:has_model, klass.to_class_uri]; arr }
-          '(' + ActiveFedora::SolrService.construct_query_for_ids(ids) + ') AND (' +
-              ActiveFedora::SolrService.construct_query_for_rel(model_pairs, 'OR') + ')'
+          '(' + ActiveFedora::SolrQueryBuilder.construct_query_for_ids(ids) + ') AND (' +
+              ActiveFedora::SolrQueryBuilder.construct_query_for_rel(model_pairs, 'OR') + ')'
         end
 
         def foreign_key_present?

data/lib/active_fedora/associations/collection_association.rb

@@ -8,7 +8,6 @@ module ActiveFedora
         construct_query
       end
 
-
       # Implements the reader method, e.g. foo.items for Foo.has_many :items
       # @param opts [Boolean, Hash] if true, force a reload
       # @option opts [Symbol] :response_format can be ':solr' to return a solr result.
@@ -264,7 +263,7 @@ module ActiveFedora
       def find_target
         # TODO: don't reify, just store the solr results and lazily reify.
         # For now, we set a hard limit of 1000 results.
-        records = ActiveFedora::SolrService.reify_solr_results(load_from_solr(rows: 1000))
+        records = ActiveFedora::QueryResultBuilder.reify_solr_results(load_from_solr(rows: 1000))
         records.each { |record| set_inverse_instance(record) }
         records
       end
@@ -332,37 +331,38 @@ module ActiveFedora
         def construct_query
 
           #TODO use primary_key instead of id
-          clauses = {find_predicate.to_s => @owner.id}
+          clauses = { find_reflection => @owner.id }
           clauses[:has_model] = @reflection.class_name.constantize.to_class_uri if @reflection.class_name && @reflection.class_name != 'ActiveFedora::Base'
-          @counter_query = @finder_query = ActiveFedora::SolrService.construct_query_for_rel(clauses)
+          @counter_query = @finder_query = ActiveFedora::SolrQueryBuilder.construct_query_for_rel(clauses)
         end
 
 
       private
 
-        def find_predicate
-          if @reflection.options[:predicate]
-            reflection.predicate.to_s
-          elsif @reflection.class_name && @reflection.class_name != 'ActiveFedora::Base' && @reflection.macro != :has_and_belongs_to_many
+        def find_reflection
+          return reflection if @reflection.options[:predicate]
+          if @reflection.class_name && @reflection.class_name != 'ActiveFedora::Base' && @reflection.macro != :has_and_belongs_to_many
             inverse_relation = @owner.class.to_s.underscore.to_sym
             begin
-              find_class_for_relation(@reflection.class_name.constantize)
+              find_reflection_for_relation(@reflection.class_name.constantize)
             rescue NameError
               raise "No :predicate attribute was set or could be inferred for #{@reflection.macro} #{@reflection.name.inspect} on #{@owner.class}"
             end
+          else
+            raise "Couldn't find reflection"
           end
         end
 
-        def find_class_for_relation(klass, inverse_relation=@owner.class.to_s.underscore.to_sym)
+        def find_reflection_for_relation(klass, inverse_relation=@owner.class.to_s.underscore.to_sym)
           raise "Unable to lookup the :predicate attribute for #{@reflection.macro} #{@reflection.name.inspect} on #{@owner.class} because #{klass} specifies \"class_name: 'ActiveFedora::Base'\".  Either specify a specific class_name in #{klass} or set :predicate in the #{@reflection.macro} declaration on #{@owner.class}" if inverse_relation == :'active_fedora/base'
           if klass.reflections.key?(inverse_relation)
             # Try it singular
-            return klass.reflections[inverse_relation].predicate
+            return klass.reflections[inverse_relation]
           elsif klass.reflections.key?(inverse_relation.to_s.pluralize.to_sym)
             # Try it plural
-            return klass.reflections[inverse_relation.to_s.pluralize.to_sym].predicate
+            return klass.reflections[inverse_relation.to_s.pluralize.to_sym]
           end
-          find_class_for_relation(klass, @owner.class.superclass.to_s.underscore.to_sym)
+          find_reflection_for_relation(klass, @owner.class.superclass.to_s.underscore.to_sym)
         end
 
         def create_record(attributes, raise = false)

data/lib/active_fedora/associations/has_and_belongs_to_many_association.rb

@@ -51,10 +51,10 @@ module ActiveFedora
         return [] if ids.blank?
         solr_result = []
         0.step(ids.size,page_size) do |startIdx|
-          query = ActiveFedora::SolrService.construct_query_for_ids(ids.slice(startIdx,page_size))
+          query = ActiveFedora::SolrQueryBuilder.construct_query_for_ids(ids.slice(startIdx,page_size))
           solr_result += ActiveFedora::SolrService.query(query, rows: page_size)
         end
-        return ActiveFedora::SolrService.reify_solr_results(solr_result)
+        return ActiveFedora::QueryResultBuilder.reify_solr_results(solr_result)
       end
 
       # In a HABTM, just look in the RDF, no need to run a count query from solr.

data/lib/active_fedora/associations/rdf.rb

@@ -54,10 +54,10 @@ module ActiveFedora
       def filter_by_class(candidate_uris)
         return [] if candidate_uris.empty?
         ids = candidate_uris.map {|uri| ActiveFedora::Base.uri_to_id(uri) }
-        results = ActiveFedora::SolrService.query(ActiveFedora::SolrService.construct_query_for_ids(ids), rows: 10000)
+        results = ActiveFedora::SolrService.query(ActiveFedora::SolrQueryBuilder.construct_query_for_ids(ids), rows: 10000)
 
         docs = results.select do |result|
-          ActiveFedora::SolrService.classes_from_solr_document(result).any? { |klass|
+          ActiveFedora::QueryResultBuilder.classes_from_solr_document(result).any? { |klass|
             class_ancestors(klass).include? reflection.klass
           }
         end

data/lib/active_fedora/cleaner.rb

@@ -31,7 +31,7 @@ module ActiveFedora
     end
 
     def self.root_resource_path
-      ActiveFedora.fedora.base_path.sub('/', '')
+      ActiveFedora.fedora.root_resource_path
     end
 
     def self.connection
@@ -48,11 +48,7 @@ module ActiveFedora
     end
 
     def self.reinitialize_repo
-      begin
-        ActiveFedora.fedora.connection.put(root_resource_path, "")
-      rescue Ldp::HttpError => exception
-        log "#reinitialize_repo in spec_helper.rb raised #{exception}"
-      end
+      ActiveFedora.fedora.init_base_path
     end
 
     def self.log(message)

data/lib/active_fedora/fedora.rb

@@ -15,5 +15,23 @@ module ActiveFedora
     def connection
       @connection ||= Ldp::Client.new(host)
     end
+
+    SLASH = '/'.freeze
+    BLANK = ''.freeze
+
+    # Call this to create a Container Resource to act as the base path for this connection
+    def init_base_path
+        connection.get(root_resource_path)
+        ActiveFedora::Base.logger.info "Attempted to init base path `#{root_resource_path}`, but it already exists" if ActiveFedora::Base.logger
+        return false
+    rescue Ldp::NotFound
+      connection.put(root_resource_path, BLANK).success?
+    end
+
+    # Remove a leading slash from the base_path
+    def root_resource_path
+      @root_resource_path ||= base_path.sub(SLASH, BLANK)
+    end
+
   end
 end

data/lib/active_fedora/fedora_attributes.rb

@@ -6,11 +6,11 @@ module ActiveFedora
       include RDF::Indexing
       include ActiveTriples::Properties
       include ActiveTriples::Reflection
-      delegate :rdf_subject,  :get_values, to: :resource
+      delegate :rdf_subject, :get_values, to: :resource
 
-      property :has_model, predicate: ::RDF::URI.new("http://fedora.info/definitions/v4/rels-ext#hasModel")
-      property :create_date, predicate: ActiveFedora::RDF::Fcrepo.created
-      property :modified_date, predicate: ActiveFedora::RDF::Fcrepo.lastModified
+      property :has_model, predicate: ActiveFedora::RDF::Fcrepo::Model.hasModel
+      property :create_date, predicate: ActiveFedora::RDF::Fcrepo4.created
+      property :modified_date, predicate: ActiveFedora::RDF::Fcrepo4.lastModified
 
       def create_date
         super.first

data/lib/active_fedora/file.rb

@@ -254,6 +254,9 @@ module ActiveFedora
         payload = behaves_like_io?(content) ? content.read : content
         headers = { 'Content-Type' => mime_type }
         headers['Content-Disposition'] = "attachment; filename=\"#{@original_name}\"" if @original_name
+        # Setting the content-length is required until we figure out why Faraday 
+        # is not doing this automatically for files uploaded via ActionDispatch.
+        headers['Content-Length'] = payload.size.to_s if uploaded_file?(payload)
         ldp_source.content = payload
         if new_record?
           ldp_source.create do |req|
@@ -292,6 +295,10 @@ module ActiveFedora
 
       private
 
+      def uploaded_file?(payload)
+        defined?(ActionDispatch::Http::UploadedFile) and payload.instance_of?(ActionDispatch::Http::UploadedFile)
+      end
+
       def local_or_remote_content(ensure_fetch = true)
         return @content if new_record?
 

data/lib/active_fedora/fixity_service.rb

@@ -25,7 +25,7 @@ module ActiveFedora
 
     def get_fixity_response_from_fedora
       uri = target + "/fcr:fixity"
-      ActiveFedora.fedora.connection.get(uri)
+      ActiveFedora.fedora.connection.get(encoded_url(uri))
     end
 
     def fixity_graph
@@ -36,5 +36,13 @@ module ActiveFedora
       ::RDF::URI("http://fedora.info/definitions/v4/repository#status")
     end
 
+    def encoded_url uri
+      if uri.match("fcr:versions")
+        uri.gsub(/fcr:versions/,"fcr%3aversions")
+      else
+        uri
+      end
+    end
+
   end
 end

data/lib/active_fedora/indexing_service.rb

@@ -17,7 +17,7 @@ module ActiveFedora
     end
 
     def self.profile_solr_name
-      ActiveFedora::SolrService.solr_name("object_profile", :displayable)
+      @profile_solr_name ||= ActiveFedora::SolrQueryBuilder.solr_name("object_profile", :displayable)
     end
 
 
@@ -26,7 +26,7 @@ module ActiveFedora
       Solrizer.set_field(solr_doc, 'system_create', c_time, :stored_sortable)
       Solrizer.set_field(solr_doc, 'system_modified', m_time, :stored_sortable)
       Solrizer.set_field(solr_doc, 'active_fedora_model', object.class.inspect, :stored_sortable)
-      solr_doc.merge!(SolrService::HAS_MODEL_SOLR_FIELD => object.has_model)
+      solr_doc.merge!(QueryResultBuilder::HAS_MODEL_SOLR_FIELD => object.has_model)
       solr_doc.merge!(SOLR_DOCUMENT_ID.to_sym => object.id)
       solr_doc.merge!(self.class.profile_solr_name => object.to_json)
       object.attached_files.each do |name, file|
@@ -61,10 +61,5 @@ module ActiveFedora
       end
       solr_doc
     end
-
-    def solr_name(*args)
-      ActiveFedora::SolrService.solr_name(*args)
-    end
-
   end
 end

data/lib/active_fedora/loadable_from_json.rb

@@ -20,6 +20,10 @@ module ActiveFedora
           @hash[k.first] = v
         end
       end
+
+      def uri= uri
+        @uri = uri
+      end
     end
 
     class SolrBackedResource

data/lib/active_fedora/om_datastream.rb

@@ -34,10 +34,6 @@ module ActiveFedora
       solr_doc.merge super({}).each_with_object({}) { |(key, value), new| new[[prefix,key].join] = value }
     end
 
-    def generate_solr_symbol(base, data_type)
-      ActiveFedora::SolrService.solr_name([prefix,base].join, type: data_type)
-    end
-
     # ** Experimental **
     #@return [Boolean] true if either the key for name exists in solr or if its string value exists
     #@param [String] name Name of key to look for

data/lib/active_fedora/qualified_dublin_core_datastream.rb

@@ -152,7 +152,7 @@ module ActiveFedora
       @fields.each do |field_key, field_info|
         things = send(field_key)
         if things
-          field_symbol = ActiveFedora::SolrService.solr_name(field_key, type: field_info[:type])
+          field_symbol = ActiveFedora::SolrQueryBuilder.solr_name(field_key, type: field_info[:type])
           things.val.each do |val|
             ::Solrizer::Extractor.insert_solr_field_value(solr_doc, field_symbol, val )
           end

data/lib/active_fedora/query_result_builder.rb

@@ -0,0 +1,56 @@
+module ActiveFedora
+  module QueryResultBuilder
+    def self.lazy_reify_solr_results(solr_results, opts = {})
+      Enumerator.new do |yielder|
+        solr_results.each do |hit|
+          yielder.yield(reify_solr_result(hit, opts))
+        end
+      end
+    end
+
+    def self.reify_solr_results(solr_results, opts = {})
+      solr_results.collect { |hit| reify_solr_result(hit, opts) }
+    end
+
+    def self.reify_solr_result(hit, opts = {})
+      klass = class_from_solr_document(hit)
+      klass.find(hit[SOLR_DOCUMENT_ID], cast: true)
+    end
+
+    #Returns all possible classes for the solr object
+    def self.classes_from_solr_document(hit, opts = {})
+      classes = []
+
+      hit[HAS_MODEL_SOLR_FIELD].each { |value| classes << Model.from_class_uri(value) }
+
+      classes.compact
+    end
+
+    #Returns the best singular class for the solr object
+    def self.class_from_solr_document(hit, opts = {})
+      #Set the default starting point to the class specified, if available.
+      best_model_match = Model.from_class_uri(opts[:class]) unless opts[:class].nil?
+      Array(hit[HAS_MODEL_SOLR_FIELD]).each do |value|
+
+        model_value = Model.from_class_uri(value)
+
+        if model_value
+
+          # Set as the first model in case opts[:class] was nil
+          best_model_match ||= model_value
+
+          # If there is an inheritance structure, use the most specific case.
+          if best_model_match > model_value
+            best_model_match = model_value
+          end
+        end
+      end
+
+      ActiveFedora::Base.logger.warn "Could not find a model for #{hit["id"]}, defaulting to ActiveFedora::Base" unless best_model_match if ActiveFedora::Base.logger
+      best_model_match || ActiveFedora::Base
+    end
+
+    HAS_MODEL_SOLR_FIELD = SolrQueryBuilder.solr_name("has_model", :symbol).freeze
+
+  end
+end

data/lib/active_fedora/querying.rb

@@ -9,7 +9,7 @@ module ActiveFedora
     end
 
     def default_sort_params
-      [ActiveFedora::SolrService.solr_name(:system_create, :stored_sortable, type: :date)+' asc']
+      [ActiveFedora::SolrQueryBuilder.solr_name(:system_create, :stored_sortable, type: :date)+' asc']
     end
 
   end

data/lib/active_fedora/rdf.rb

@@ -3,11 +3,12 @@ module ActiveFedora
     extend ActiveSupport::Autoload
     autoload :DatastreamIndexing
     autoload :Fcrepo
+    autoload :Fcrepo4
     autoload :Ldp
     autoload :Indexing
     autoload :Identifiable
-    autoload :ObjectResource
     autoload :Persistence
     autoload :RelsExt
+    autoload :ProjectHydra
   end
 end

data/lib/active_fedora/rdf/fcrepo.rb

@@ -1,12 +1,326 @@
+# -*- encoding: utf-8 -*-
+# This file generated automatically using vocab-fetch from github.com:fcrepo3/fcrepo/master/fcrepo-server/src/main/resources/rdfs/fedora_relsext_ontology.rdfs
+# and edited for clarity and additional terms published in different serializations of the voabularies
 require 'rdf'
-class ActiveFedora::RDF::Fcrepo < RDF::StrictVocabulary("http://fedora.info/definitions/v4/repository#")
-
-    # Property definitions
-    property :hasContent, comment: %(Defining where the fedora object has content.)
-    property :mimeType
-
-    property :created
-    property :lastModified
-    property :hasChild
+module ActiveFedora::RDF
+  module Fcrepo
+    class System < ::RDF::StrictVocabulary("info:fedora/fedora-system:")
+      term :"ContentModel-3.0",
+        comment: %(Base Fedora 3 CModel cModel).freeze,
+        label: "Fedora 3 Content Model".freeze,
+        subClassOf: "info:fedora/fedora-system:def/model#FedoraObject".freeze,
+        type: "info:fedora/fedora-system:def/model#FedoraObject".freeze
+      term :"FedoraObject-3.0",
+        comment: %(Base Fedora 3 Object cModel).freeze,
+        label: "Fedora 3 Object".freeze,
+        subClassOf: "info:fedora/fedora-system:def/model#FedoraObject".freeze,
+        type: "info:fedora/fedora-system:def/model#FedoraObject".freeze
+      term :"ServiceDefinition-3.0",
+        comment: %(Fedora 3 Service Definition/BDef cModel).freeze,
+        label: "Fedora 3 Service Definition".freeze,
+        subClassOf: "info:fedora/fedora-system:def/model#FedoraObject".freeze,
+        type: "info:fedora/fedora-system:def/model#FedoraObject".freeze
+      term :"ServiceDeployment-3.0",
+        comment: %(Fedora 3 Service Deployment/BMech cModel).freeze,
+        label: "Fedora 3 Service Deployment".freeze,
+        subClassOf: "info:fedora/fedora-system:def/model#FedoraObject".freeze,
+        type: "info:fedora/fedora-system:def/model#FedoraObject".freeze
+    end
+    class Model < ::RDF::StrictVocabulary("info:fedora/fedora-system:def/model#")
+      # Class definitions
+      term :FedoraObject,
+        comment: %(The base type of all objects in Fedora).freeze,
+        label: "FedoraObject".freeze,
+        subClassOf: "rdfs:Resource".freeze,
+        type: "rdfs:Class".freeze
+      term :Datastream,
+        comment: %(Binary data associated with a Fedora object).freeze,
+        label: "Datastream".freeze,
+        subClassOf: "rdfs:Resource".freeze,
+        type: "rdfs:Class".freeze
+      term :ExtProperty,
+        comment: %(Reification of an extension property of a Fedora object used in messaging).freeze,
+        label: "ExtProperty".freeze,
+        subClassOf: "rdf:Property".freeze,
+        type: "rdfs:Class".freeze
+      term :State,
+        comment: %(The state of a Fedora object or datastream).freeze,
+        label: "State".freeze,
+        subClassOf: "rdfs:Resource".freeze,
+        type: "rdfs:Class".freeze
+      term :Active,
+        comment: %(State of an object available in the repository).freeze,
+        label: "Active".freeze,
+        subClassOf: "rdfs:Resource".freeze,
+        type: "info:fedora/fedora-system:def/model#State".freeze
+      term :Deleted,
+        comment: %(State of an object that should be considered deleted, but is not purged).freeze,
+        label: "Deleted".freeze,
+        subClassOf: "rdfs:Resource".freeze,
+        type: "info:fedora/fedora-system:def/model#State".freeze
+      term :Inactive,
+        comment: %(State of an object that should be considered temporarily unavailable).freeze,
+        label: "Inactive".freeze,
+        subClassOf: "rdfs:Resource".freeze,
+        type: "info:fedora/fedora-system:def/model#State".freeze
+      # Property definitions
+      property :altIds,
+        comment: %(The alternate IDs for a datastream).freeze,
+        label: "Alternate IDs".freeze,
+        domain: "info:fedora/fedora-system:def/model#Datastream",
+        range: "xsd:string".freeze,
+        type: "rdf:Property".freeze
+      property :controlGroup,
+        comment: %(indicates whether a Datastream's content is inline XML (X), Managed (M), Referenced (R) or External (E)).freeze,
+        label: "controlGroup".freeze,
+        domain: "info:fedora/fedora-system:def/model#Datastream",
+        range: "xsd:string".freeze,
+        type: "rdf:Property".freeze
+      property :createdDate,
+        comment: %(The UTC datetime an object was created).freeze,
+        label: "createdDate".freeze,
+        domain: "info:fedora/fedora-system:def/model#FedoraObject",
+        range: "xsd:dateTimeStamp".freeze,
+        type: "rdf:Property".freeze
+      property :definesMethod,
+        comment: %(indicates the name of a service method defined in this interface).freeze,
+        label: "definesMethod".freeze,
+        domain: "info:fedora/fedora-system:ServiceDefinition-3.0".freeze,
+        range: "xsd:NCName".freeze,
+        type: "rdf:Property".freeze
+      property :digest,
+        comment: %(indicates the checksum digest of a datastream's contents or the keyword 'none').freeze,
+        label: "digest".freeze,
+        domain: "info:fedora/fedora-system:def/model#Datastream",
+        range: "xsd:string".freeze,
+        type: "rdf:Property".freeze
+      property :digestType,
+        comment: %(indicates either the checksum algorithm or the keyword DISABLED).freeze,
+        label: "digestType".freeze,
+        domain: "info:fedora/fedora-system:def/model#Datastream",
+        range: "xsd:string".freeze,
+        type: "rdf:Property".freeze
+      property :downloadFilename,
+        comment: %(indicates the name to be used when downloading a datastream's contents).freeze,
+        label: "downloadFilename".freeze,
+        domain: "info:fedora/fedora-system:def/model#Datastream",
+        range: "xsd:string".freeze,
+        type: "rdf:Property".freeze
+      property :extProperty,
+        comment: %(indicates an extension property of an object in Fedora in messaging).freeze,
+        label: "extProperty".freeze,
+        domain: "info:fedora/fedora-system:def/model#FedoraObject".freeze,
+        range: "info:fedora/fedora-system:def/model#ExtProperty".freeze,
+        type: "rdf:Property".freeze
+      property :formatURI,
+        comment: %(A URI indicating the format of a datastream's content).freeze,
+        label: "formatURI".freeze,
+        type: "rdf:Property".freeze
+      property :hasModel,
+        comment: %(Indicates the Fedora 3 CModels for this object).freeze,
+        label: "hasModel".freeze,
+        subPropertyOf: "rdf:type".freeze,
+        domain: "info:fedora/fedora-system:FedoraObject-3.0".freeze,
+        range: "info:fedora/fedora-system:ContentModel-3.0".freeze,
+        type: "rdf:Property".freeze
+      property :hasService,
+        comment: %(indicates the Fedora 3 Service Definitions applicable to this CModel).freeze,
+        label: "hasService".freeze,
+        domain: "info:fedora/fedora-system:ContentModel-3.0".freeze,
+        range: "info:fedora/fedora-system:ServiceDefinition-3.0".freeze,
+        type: "rdf:Property".freeze
+      property :isContractorOf,
+        comment: %(indicates the Fedora 3 Content Models this deployment applies to).freeze,
+        label: "".freeze,
+        domain: "info:fedora/fedora-system:ServiceDeployment-3.0".freeze,
+        range: "info:fedora/fedora-system:ContentModel-3.0".freeze,
+        type: "rdf:Property".freeze
+      property :isDeploymentOf,
+        comment: %(indicates the Fedora 3 Service Definitions this deployment implements).freeze,
+        label: "isDeploymentOf".freeze,
+        domain: "info:fedora/fedora-system:ServiceDeployment-3.0".freeze,
+        range: "info:fedora/fedora-system:ServiceDefinition-3.0".freeze,
+        type: "rdf:Property".freeze
+      property :label,
+        comment: %(The label applied to a Fedora object).freeze,
+        label: "label".freeze,
+        domain: "info:fedora/fedora-system:def/model#FedoraObject".freeze,
+        range: "xsd:string".freeze,
+        type: "rdf:Property".freeze
+      property :length,
+        comment: %(indicates the length of a datastream's contents).freeze,
+        label: "length".freeze,
+        domain: "info:fedora/fedora-system:def/model#Datastream".freeze,
+        range: "xsd:nonNegativeInteger".freeze,
+        type: "rdf:Property".freeze
+      property :ownerId,
+        comment: %(indicates the owner of an object).freeze,
+        label: "ownerId".freeze,
+        type: "rdf:Property".freeze
+      property :state,
+        comment: %(indicates the state of the object or datastream).freeze,
+        label: "state".freeze,
+        domain: ["info:fedora/fedora-system:def/model#FedoraObject".freeze,"info:fedora/fedora-system:def/model#Datastream".freeze],
+        range: "info:fedora/fedora-system:def/model#State".freeze,
+        type: "rdf:Property".freeze
+      property :versionable,
+        comment: %(indicates whether a datastream's property and contents changes are being tracked as versions).freeze,
+        label: "versionable".freeze,
+        domain: "info:fedora/fedora-system:def/model#Datastream".freeze,
+        range: "xsd:boolean".freeze,
+        type: "rdf:Property".freeze
+    end
+    class RelsExt < ::RDF::StrictVocabulary("info:fedora/fedora-system:def/relations-external#")
 
+      # Property definitions
+      property :fedoraRelationship,
+        comment: %(The primitive property for all object-to-object relationships in the fedora ontology).freeze,
+        label: "Fedora Relationship".freeze,
+        type: "rdf:Property".freeze
+      property :hasAnnotation,
+        comment: %(A refinement of the generic descriptive relationship indicating a commentary relationship between fedora objects.  The subject is a fedora object that is being commented on and the predicate is a fedora object that represents an annotation or comment about the subject. ).freeze,
+        label: "Has Annotation".freeze,
+        subPropertyOf: "info:fedora/fedora-system:def/relations-external#hasDescription".freeze,
+        "owl:inverseOf" => %(info:fedora/fedora-system:def/relations-external#isAnnotationOf).freeze,
+        type: "rdf:Property".freeze
+      property :hasCollectionMember,
+        label: "Has Collection Member".freeze,
+        subPropertyOf: "info:fedora/fedora-system:def/relations-external#hasMember".freeze,
+        "owl:inverseOf" => %(info:fedora/fedora-system:def/relations-external#isMemberOfCollection).freeze,
+        type: "rdf:Property".freeze
+      property :hasConstituent,
+        label: "Has Constituent".freeze,
+        subPropertyOf: "info:fedora/fedora-system:def/relations-external#hasPart".freeze,
+        "owl:inverseOf" => %(info:fedora/fedora-system:def/relations-external#isConstituentOf).freeze,
+        type: "rdf:Property".freeze
+      property :hasDependent,
+        label: "Has Dependent".freeze,
+        subPropertyOf: "info:fedora/fedora-system:def/relations-external#fedoraRelationship".freeze,
+        "owl:inverseOf" => %(info:fedora/fedora-system:def/relations-external#isDependentOf).freeze,
+        type: "rdf:Property".freeze
+      property :hasDerivation,
+        label: "Has Derivation".freeze,
+        subPropertyOf: "info:fedora/fedora-system:def/relations-external#fedoraRelationship".freeze,
+        "owl:inverseOf" => %(info:fedora/fedora-system:def/relations-external#isDerivationOf).freeze,
+        type: "rdf:Property".freeze
+      property :hasDescription,
+        comment: %(A generic descriptive relationship between fedora objects.  The subject is a fedora object that is being described in some manner and the predicate is a fedora object that represents a descriptive entity that is about the subject. ).freeze,
+        label: "Has Description".freeze,
+        subPropertyOf: "info:fedora/fedora-system:def/relations-external#fedoraRelationship".freeze,
+        "owl:inverseOf" => %(info:fedora/fedora-system:def/relations-external#isDescriptionOf).freeze,
+        type: "rdf:Property".freeze
+      property :hasEquivalent,
+        label: "Has Equivalent".freeze,
+        subPropertyOf: "info:fedora/fedora-system:def/relations-external#fedoraRelationship".freeze,
+        type: "rdf:Property".freeze
+      property :hasMember,
+        label: "Has Member".freeze,
+        subPropertyOf: "info:fedora/fedora-system:def/relations-external#hasPart/".freeze,
+        "owl:inverseOf" => %(info:fedora/fedora-system:def/relations-external#isMemberOf).freeze,
+        type: "rdf:Property".freeze
+      property :hasMetadata,
+        comment: %(A refinement of the generic descriptive relationship indicating a metadata relationship between fedora objects.  The subject is a fedora object and the predicate is a fedora object that represents metadata about the subject. ).freeze,
+        label: "Has Metadata".freeze,
+        subPropertyOf: "info:fedora/fedora-system:def/relations-external#hasDescription".freeze,
+        "owl:inverseOf" => %(info:fedora/fedora-system:def/relations-external#isMetadataFor).freeze,
+        type: "rdf:Property".freeze
+      property :hasPart,
+        label: "Has Part".freeze,
+        subPropertyOf: "info:fedora/fedora-system:def/relations-external#fedoraRelationship".freeze,
+        "owl:inverseOf" => %(info:fedora/fedora-system:def/relations-external#isPartOf).freeze,
+        type: "rdf:Property".freeze
+      property :hasSubset,
+        label: "Has Subset".freeze,
+        subPropertyOf: "info:fedora/fedora-system:def/relations-external#hasMember".freeze,
+        "owl:inverseOf" => %(info:fedora/fedora-system:def/relations-external#isSubsetOf).freeze,
+        type: "rdf:Property".freeze
+      property :isAnnotationOf,
+        comment: %(A refinement of the generic descriptive relationship indicating a commentary relationship between fedora objects.  The subject is a fedora object that represents an annotation or comment and the predicate is a fedora object that is being commented upon by the subject.).freeze,
+        label: "Is Annotation Of".freeze,
+        subPropertyOf: "info:fedora/fedora-system:def/relations-external#isDescriptionOf".freeze,
+        "owl:inverseOf" => %(info:fedora/fedora-system:def/relations-external#hasAnnotation).freeze,
+        type: "rdf:Property".freeze
+      property :isConstituentOf,
+        label: "Is Constituent Of".freeze,
+        subPropertyOf: "info:fedora/fedora-system:def/relations-external#isPartOf".freeze,
+        "owl:inverseOf" => %(info:fedora/fedora-system:def/relations-external#hasConstituent).freeze,
+        type: "rdf:Property".freeze
+      property :isDependentOf,
+        label: "Is Dependent Of".freeze,
+        subPropertyOf: "info:fedora/fedora-system:def/relations-external#fedoraRelationship".freeze,
+        "owl:inverseOf" => %(info:fedora/fedora-system:def/relations-external#hasDependent).freeze,
+        type: "rdf:Property".freeze
+      property :isDerivationOf,
+        label: "Is Derivation Of".freeze,
+        subPropertyOf: "info:fedora/fedora-system:def/relations-external#fedoraRelationship".freeze,
+        "owl:inverseOf" => %(info:fedora/fedora-system:def/relations-external#hasDerivation).freeze,
+        type: "rdf:Property".freeze
+      property :isDescriptionOf,
+        comment: %(A generic descriptive relationship between fedora objects.  The subject is a fedora object that represents a descriptive entity and the predicate is a fedora object that is being described in some manner by the subject.).freeze,
+        label: "Is Description Of".freeze,
+        subPropertyOf: "info:fedora/fedora-system:def/relations-external#fedoraRelationship".freeze,
+        "owl:inverseOf" => %(info:fedora/fedora-system:def/relations-external#hasDescription).freeze,
+        type: "rdf:Property".freeze
+      property :isMemberOf,
+        label: "Is Member Of".freeze,
+        subPropertyOf: "info:fedora/fedora-system:def/relations-external#isPartOf".freeze,
+        "owl:inverseOf" => %(info:fedora/fedora-system:def/relations-external#hasMember).freeze,
+        type: "rdf:Property".freeze
+      property :isMemberOfCollection,
+        label: "Is Member Of Collection".freeze,
+        subPropertyOf: "info:fedora/fedora-system:def/relations-external#isMemberOf".freeze,
+        "owl:inverseOf" => %(info:fedora/fedora-system:def/relations-external#hasCollectionMember).freeze,
+        type: "rdf:Property".freeze
+      property :isMetadataFor,
+        comment: %(A refinement of the generic descriptive relationship indicating a metadata relationship between fedora objects.  The subject is a fedora object that represents metadata and the predicate is a fedora object for which the subject serves as metadata.).freeze,
+        label: "Is Metadata For".freeze,
+        subPropertyOf: "info:fedora/fedora-system:def/relations-external#isDescriptionOf".freeze,
+        "owl:inverseOf" => %(info:fedora/fedora-system:def/relations-external#hasMetadata).freeze,
+        type: "rdf:Property".freeze
+      property :isPartOf,
+        label: "Is Part Of".freeze,
+        subPropertyOf: "info:fedora/fedora-system:def/relations-external#fedoraRelationship".freeze,
+        "owl:inverseOf" => %(info:fedora/fedora-system:def/relations-external#hasPart).freeze,
+        type: "rdf:Property".freeze
+      property :isSubsetOf,
+        label: "Is Subset Of".freeze,
+        subPropertyOf: "info:fedora/fedora-system:def/relations-external#isMemberOf".freeze,
+        "owl:inverseOf" => %(info:fedora/fedora-system:def/relations-external#hasSubset).freeze,
+        type: "rdf:Property".freeze
+    end
+    class View < ::RDF::StrictVocabulary("info:fedora/fedora-system:def/view#")
+      property :disseminates,
+        comment: %(A property used to indicate that an object contains a datastream).freeze,
+        label: "disseminates".freeze,
+        domain: "info:fedora/fedora-system:FedoraObject-3.0".freeze,
+        range: "info:fedora/fedora-system:def/model#Datastream".freeze,
+        type: "rdf:Property".freeze      
+      property :disseminationType,
+        comment: %(A property whose object is common to all Datastreams of a given DSID).freeze,
+        label: "dissemination type".freeze,
+        type: "rdf:Property".freeze
+      property :isVolatile,
+        comment: %(A property indicating that a datastream's content is a reference to content external to the repository).freeze,
+        label: "isVolatile".freeze,
+        domain: "info:fedora/fedora-system:def/model#Datastream".freeze,
+        range: "xsd:boolean".freeze,
+        type: "rdf:Property".freeze
+      property :lastModifiedDate,
+        comment: %(UTC datetime of the last change to an object or most recent version of this datastream).freeze,
+        label: "lastModifiedDate".freeze,
+        domain: ["info:fedora/fedora-system:def/model#FedoraObject".freeze,"info:fedora/fedora-system:def/model#Datastream".freeze],
+        range: "xsd:dateTimeStamp".freeze,
+        type: "rdf:Property".freeze
+      property :mimeType,
+        comment: %(The MIME type of this datastream's content).freeze,
+        label: "mimeType".freeze,
+        domain: "info:fedora/fedora-system:def/model#Datastream".freeze,
+        range: "xsd:string".freeze,
+        type: "rdf:Property".freeze
+      property :version,
+        comment: %(indicates Fedora server version in messaging).freeze,
+        label: "Server version".freeze,
+        type: "rdf:Property".freeze
+    end
+  end
 end