lib/ddr/auth.rb in ddr-models-2.0.0.pre.1 vs lib/ddr/auth.rb in ddr-models-2.0.0.pre.2

@@ -19,12 +19,10 @@
     autoload :Group
     autoload :GrouperGateway
     autoload :Groups
     autoload :InheritedRoles
     autoload :LdapGateway
-    autoload :LegacyPermissions
-    autoload :LegacyRoles
     autoload :Permissions
     autoload :RemoteGroups
     autoload :ResourceRoles
     autoload :RoleBasedAccessControlsEnforcement
     autoload :Roles
@@ -40,9 +38,17 @@
       autoload :DatastreamAbilityDefinitions
       autoload :EventAbilityDefinitions
       autoload :ItemAbilityDefinitions
       autoload :RoleBasedAbilityDefinitions
       autoload :SuperuserAbilityDefinitions
+    end
+
+    autoload_under 'legacy' do
+      autoload :AbstractLegacyPermissions
+      autoload :LegacyAuthorization
+      autoload :LegacyDefaultPermissions
+      autoload :LegacyPermissions
+      autoload :LegacyRoles
     end
 
     # Name of group whose members are authorized to act as superuser
     mattr_accessor :superuser_group