lib/ddr/models.rb in ddr-models-2.1.0 vs lib/ddr/models.rb in ddr-models-2.1.1

@@ -35,11 +35,10 @@
     autoload :Base
     autoload :ChecksumInvalid, 'ddr/models/error'
     autoload :ContentModelError, 'ddr/models/error'
     autoload :DerivativeGenerationFailure, 'ddr/models/error'
     autoload :Describable
-    autoload :EffectiveLicense
     autoload :Error
     autoload :EventLoggable
     autoload :FileManagement
     autoload :FindingAid
     autoload :FixityCheckable
@@ -50,15 +49,21 @@
     autoload :HasContent
     autoload :HasMultiresImage
     autoload :HasStructMetadata
     autoload :HasThumbnail
     autoload :Indexing
-    autoload :InheritedLicense
-    autoload :License
     autoload :SolrDocument
     autoload :StructDiv
     autoload :Structure
     autoload :YearFacet
+
+    autoload_under "licenses" do
+      autoload :AdminPolicyLicense
+      autoload :EffectiveLicense
+      autoload :License
+      autoload :InheritedLicense
+      autoload :ParentLicense
+    end
 
     # Base directory of default external file store
     mattr_accessor :external_file_store
 
     # Base directory of external file store for multires image derivatives