0
@@ -5,7 +5,8 @@ module Waves
0
       def self.included( app )
0
         
0
         app.module_eval do
0
-          extend Autocode; extend Reloadable
0
+
0
+          include Autocode
0
           
0
           include Waves::Foundations::Simple
0
           include Waves::Layers::DefaultErrors
0
@@ -13,7 +14,7 @@ module Waves
0
                          
0
           # Set autoloading from default.rb files
0
           autoinit :Configurations do
0
-      	    autoload_class true, app.configurations["Default"]
0
+      	    autoload_class
0
             autoload_module :Mapping
0
           end          
0
           

0
@@ -7,41 +7,21 @@ module Waves
0
         app.module_eval do
0
           include Autocode
0
                     
0
-          autocreate( :Models, Module.new { 
0
-            include Autocode; include Waves::Foundations::Reflection 
0
-          })
0
-          autocreate( :Views, Module.new { 
0
-            include Autocode; include Waves::Foundations::Reflection
0
-            include Waves::Views::Mixin 
0
-            autocreate( :Default, Class.new )
0
+          # leave it to the ORM layers to add ORM-specific initializers
0
+          autocreate( :Models, Module.new { include Autocode; autocreate_class; autoload_class })
0
+          
0
+          autocreate( :Views, Module.new {
0
+            include Autocode; include Waves::Views::Mixin 
0
+            autocreate_class; autoload_class
0
           })
0
+          
0
           autocreate( :Controllers, Module.new { 
0
-            include Autocode; include Waves::Foundations::Reflection
0
-            include Waves::Controllers::Mixin 
0
-            autocreate( :Default, Class.new )
0
+            include Autocode; include Waves::Controllers::Mixin 
0
+            autocreate_class; autoload_class
0
           })
0
-          autocreate( :Helpers, Module.new {
0
-            extend Autocode; include Reflection 
0
-            autocreate( :Default, Module.new )
0
-          })
0
-          
0
-      		# merge these inits with the above now that they are in the same file
0
-      		autoinit :Views do
0
-            autoload_class true, app.views["Default"]
0
-            autocreate true, app::Views::Default
0
-          end
0
-          
0
-          autoinit :Controllers do
0
-            autoload_class true, app.controllers["Default"]
0
-            autocreate true, app::Controllers::Default
0
-          end
0
-
0
-      	  autoinit :Helpers do
0
-      	    autoload_module true, :exemplar => app.helpers["Default"]
0
-      	  end
0
-      	  
0
           
0
-            
0
+          autocreate( :Helpers, Module.new { include Autocode; autocreate_class; autoload_class })
0
+                      
0
         end
0
       end
0
     end