lib/openehr/rm/composition/content.rb in openehr-1.2.7 vs lib/openehr/rm/composition/content.rb in openehr-1.2.8

@@ -1,24 +1,23 @@
-$:.unshift(File.dirname(__FILE__)) unless
-  $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
+$:.unshift(File.dirname(__FILE__))
 # rm::composition::content
 # content module
 # http://www.openehr.org/uml/release-1.0.1/Browsable/_9_5_1_76d0249_1140524925046_706492_3290Report.html
 # refs #58
-include OpenEHR::RM::Common::Archetyped
 
 module OpenEHR
   module RM
     module Composition
       module Content
+        class ContentItem < OpenEHR::RM::Common::Archetyped::Locatable
 
-        class ContentItem < Locatable
-
         end
 
         require 'content/navigation'
         require 'content/entry'
 
+        include Navigation
+        include Entry
       end # end of Content
     end # end of Composition
   end # end of RM
 end # end of OpenEHR