ontomde-core 1.0.6 → 2.0.0

data/lib/ontomde-core/inspector/rails/public/robots.txt

@@ -0,0 +1,5 @@
+# See http://www.robotstxt.org/wc/norobots.html for documentation on how to use the robots.txt file
+#
+# To ban all spiders from the entire site uncomment the next two lines:
+# User-Agent: *
+# Disallow: /

data/lib/ontomde-core/inspector/rails/script/about

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+require File.dirname(__FILE__) + '/../config/boot'
+require 'commands/about'

data/lib/ontomde-core/inspector/rails/script/console

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+require File.dirname(__FILE__) + '/../config/boot'
+require 'commands/console'

data/lib/ontomde-core/inspector/rails/script/destroy

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+require File.dirname(__FILE__) + '/../config/boot'
+require 'commands/destroy'

data/lib/ontomde-core/inspector/rails/script/generate

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+require File.dirname(__FILE__) + '/../config/boot'
+require 'commands/generate'

data/lib/ontomde-core/inspector/rails/script/performance/benchmarker

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+require File.dirname(__FILE__) + '/../../config/boot'
+require 'commands/performance/benchmarker'

data/lib/ontomde-core/inspector/rails/script/performance/profiler

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+require File.dirname(__FILE__) + '/../../config/boot'
+require 'commands/performance/profiler'

data/lib/ontomde-core/inspector/rails/script/performance/request

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+require File.dirname(__FILE__) + '/../../config/boot'
+require 'commands/performance/request'

data/lib/ontomde-core/inspector/rails/script/plugin

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+require File.dirname(__FILE__) + '/../config/boot'
+require 'commands/plugin'

data/lib/ontomde-core/inspector/rails/script/process/inspector

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+require File.dirname(__FILE__) + '/../../config/boot'
+require 'commands/process/inspector'

data/lib/ontomde-core/inspector/rails/script/process/reaper

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+require File.dirname(__FILE__) + '/../../config/boot'
+require 'commands/process/reaper'

data/lib/ontomde-core/inspector/rails/script/process/spawner

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+require File.dirname(__FILE__) + '/../../config/boot'
+require 'commands/process/spawner'

data/lib/ontomde-core/inspector/rails/script/runner

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+require File.dirname(__FILE__) + '/../config/boot'
+require 'commands/runner'

data/lib/ontomde-core/inspector/rails/script/server

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+require File.dirname(__FILE__) + '/../config/boot'
+require 'commands/server'

data/lib/ontomde-core/inspector/rails/test/test_helper.rb

@@ -0,0 +1,38 @@
+ENV["RAILS_ENV"] = "test"
+require File.expand_path(File.dirname(__FILE__) + "/../config/environment")
+require 'test_help'
+
+class Test::Unit::TestCase
+  # Transactional fixtures accelerate your tests by wrapping each test method
+  # in a transaction that's rolled back on completion.  This ensures that the
+  # test database remains unchanged so your fixtures don't have to be reloaded
+  # between every test method.  Fewer database queries means faster tests.
+  #
+  # Read Mike Clark's excellent walkthrough at
+  #   http://clarkware.com/cgi/blosxom/2005/10/24#Rails10FastTesting
+  #
+  # Every Active Record database supports transactions except MyISAM tables
+  # in MySQL.  Turn off transactional fixtures in this case; however, if you
+  # don't care one way or the other, switching from MyISAM to InnoDB tables
+  # is recommended.
+  #
+  # The only drawback to using transactional fixtures is when you actually 
+  # need to test transactions.  Since your test is bracketed by a transaction,
+  # any transactions started in your code will be automatically rolled back.
+  self.use_transactional_fixtures = true
+
+  # Instantiated fixtures are slow, but give you @david where otherwise you
+  # would need people(:david).  If you don't want to migrate your existing
+  # test cases which use the @david style and don't mind the speed hit (each
+  # instantiated fixtures translates to a database query per test method),
+  # then set this back to true.
+  self.use_instantiated_fixtures  = false
+
+  # Setup all fixtures in test/fixtures/*.(yml|csv) for all tests in alphabetical order.
+  #
+  # Note: You'll currently still have to declare fixtures explicitly in integration tests
+  # -- they do not yet inherit this setting
+  fixtures :all
+
+  # Add more helper methods to be used by all tests here...
+end

data/lib/ontomde-core/inspector/rails/vendor/plugins/auto_complete/README

@@ -0,0 +1,23 @@
+Example:
+
+  # Controller
+  class BlogController < ApplicationController
+    auto_complete_for :post, :title
+  end
+
+  # View
+  <%= text_field_with_auto_complete :post, title %>
+
+By default, auto_complete_for limits the results to 10 entries,
+and sorts by the given field.
+
+auto_complete_for takes a third parameter, an options hash to
+the find method used to search for the records:
+
+  auto_complete_for :post, :title, :limit => 15, :order => 'created_at DESC'
+
+For more examples, see script.aculo.us:
+* http://script.aculo.us/demos/ajax/autocompleter
+* http://script.aculo.us/demos/ajax/autocompleter_customized
+
+Copyright (c) 2007 David Heinemeier Hansson, released under the MIT license   

data/lib/ontomde-core/inspector/rails/vendor/plugins/auto_complete/Rakefile

@@ -0,0 +1,22 @@
+require 'rake' 
+require 'rake/testtask' 
+require 'rake/rdoctask' 
+ 
+desc 'Default: run unit tests.' 
+task :default => :test 
+ 
+desc 'Test auto_complete plugin.' 
+Rake::TestTask.new(:test) do |t| 
+  t.libs << 'lib' 
+  t.pattern = 'test/**/*_test.rb' 
+  t.verbose = true 
+end 
+ 
+desc 'Generate documentation for auto_complete plugin.' 
+Rake::RDocTask.new(:rdoc) do |rdoc| 
+  rdoc.rdoc_dir = 'rdoc' 
+  rdoc.title    = 'Auto Complete' 
+  rdoc.options << '--line-numbers' << '--inline-source' 
+  rdoc.rdoc_files.include('README') 
+  rdoc.rdoc_files.include('lib/**/*.rb') 
+end

data/lib/ontomde-core/inspector/rails/vendor/plugins/auto_complete/init.rb

@@ -0,0 +1,2 @@
+ActionController::Base.send :include, AutoComplete
+ActionController::Base.helper AutoCompleteMacrosHelper

data/lib/ontomde-core/inspector/rails/vendor/plugins/auto_complete/lib/auto_complete.rb

@@ -0,0 +1,47 @@
+module AutoComplete      
+  
+  def self.included(base)
+    base.extend(ClassMethods)
+  end
+
+  #
+  # Example:
+  #
+  #   # Controller
+  #   class BlogController < ApplicationController
+  #     auto_complete_for :post, :title
+  #   end
+  #
+  #   # View
+  #   <%= text_field_with_auto_complete :post, title %>
+  #
+  # By default, auto_complete_for limits the results to 10 entries,
+  # and sorts by the given field.
+  # 
+  # auto_complete_for takes a third parameter, an options hash to
+  # the find method used to search for the records:
+  #
+  #   auto_complete_for :post, :title, :limit => 15, :order => 'created_at DESC'
+  #
+  # For help on defining text input fields with autocompletion, 
+  # see ActionView::Helpers::JavaScriptHelper.
+  #
+  # For more examples, see script.aculo.us:
+  # * http://script.aculo.us/demos/ajax/autocompleter
+  # * http://script.aculo.us/demos/ajax/autocompleter_customized
+  module ClassMethods
+    def auto_complete_for(object, method, options = {})
+      define_method("auto_complete_for_#{object}_#{method}") do
+        find_options = { 
+          :conditions => [ "LOWER(#{method}) LIKE ?", '%' + params[object][method].downcase + '%' ], 
+          :order => "#{method} ASC",
+          :limit => 10 }.merge!(options)
+        
+        @items = object.to_s.camelize.constantize.find(:all, find_options)
+
+        render :inline => "<%= auto_complete_result @items, '#{method}' %>"
+      end
+    end
+  end
+  
+end

data/lib/ontomde-core/inspector/rails/vendor/plugins/auto_complete/lib/auto_complete_macros_helper.rb

@@ -0,0 +1,143 @@
+module AutoCompleteMacrosHelper      
+  # Adds AJAX autocomplete functionality to the text input field with the 
+  # DOM ID specified by +field_id+.
+  #
+  # This function expects that the called action returns an HTML <ul> list,
+  # or nothing if no entries should be displayed for autocompletion.
+  #
+  # You'll probably want to turn the browser's built-in autocompletion off,
+  # so be sure to include an <tt>autocomplete="off"</tt> attribute with your text
+  # input field.
+  #
+  # The autocompleter object is assigned to a Javascript variable named <tt>field_id</tt>_auto_completer.
+  # This object is useful if you for example want to trigger the auto-complete suggestions through
+  # other means than user input (for that specific case, call the <tt>activate</tt> method on that object). 
+  # 
+  # Required +options+ are:
+  # <tt>:url</tt>::                  URL to call for autocompletion results
+  #                                  in url_for format.
+  # 
+  # Addtional +options+ are:
+  # <tt>:update</tt>::               Specifies the DOM ID of the element whose 
+  #                                  innerHTML should be updated with the autocomplete
+  #                                  entries returned by the AJAX request. 
+  #                                  Defaults to <tt>field_id</tt> + '_auto_complete'
+  # <tt>:with</tt>::                 A JavaScript expression specifying the
+  #                                  parameters for the XMLHttpRequest. This defaults
+  #                                  to 'fieldname=value'.
+  # <tt>:frequency</tt>::            Determines the time to wait after the last keystroke
+  #                                  for the AJAX request to be initiated.
+  # <tt>:indicator</tt>::            Specifies the DOM ID of an element which will be
+  #                                  displayed while autocomplete is running.
+  # <tt>:tokens</tt>::               A string or an array of strings containing
+  #                                  separator tokens for tokenized incremental 
+  #                                  autocompletion. Example: <tt>:tokens => ','</tt> would
+  #                                  allow multiple autocompletion entries, separated
+  #                                  by commas.
+  # <tt>:min_chars</tt>::            The minimum number of characters that should be
+  #                                  in the input field before an Ajax call is made
+  #                                  to the server.
+  # <tt>:on_hide</tt>::              A Javascript expression that is called when the
+  #                                  autocompletion div is hidden. The expression
+  #                                  should take two variables: element and update.
+  #                                  Element is a DOM element for the field, update
+  #                                  is a DOM element for the div from which the
+  #                                  innerHTML is replaced.
+  # <tt>:on_show</tt>::              Like on_hide, only now the expression is called
+  #                                  then the div is shown.
+  # <tt>:after_update_element</tt>:: A Javascript expression that is called when the
+  #                                  user has selected one of the proposed values. 
+  #                                  The expression should take two variables: element and value.
+  #                                  Element is a DOM element for the field, value
+  #                                  is the value selected by the user.
+  # <tt>:select</tt>::               Pick the class of the element from which the value for 
+  #                                  insertion should be extracted. If this is not specified,
+  #                                  the entire element is used.
+  # <tt>:method</tt>::               Specifies the HTTP verb to use when the autocompletion
+  #                                  request is made. Defaults to POST.
+  def auto_complete_field(field_id, options = {})
+    function =  "var #{field_id}_auto_completer = new Ajax.Autocompleter("
+    function << "'#{field_id}', "
+    function << "'" + (options[:update] || "#{field_id}_auto_complete") + "', "
+    function << "'#{url_for(options[:url])}'"
+    
+    js_options = {}
+    js_options[:tokens] = array_or_string_for_javascript(options[:tokens]) if options[:tokens]
+    js_options[:callback]   = "function(element, value) { return #{options[:with]} }" if options[:with]
+    js_options[:indicator]  = "'#{options[:indicator]}'" if options[:indicator]
+    js_options[:select]     = "'#{options[:select]}'" if options[:select]
+    js_options[:paramName]  = "'#{options[:param_name]}'" if options[:param_name]
+    js_options[:frequency]  = "#{options[:frequency]}" if options[:frequency]
+    js_options[:method]     = "'#{options[:method].to_s}'" if options[:method]
+
+    { :after_update_element => :afterUpdateElement, 
+      :on_show => :onShow, :on_hide => :onHide, :min_chars => :minChars }.each do |k,v|
+      js_options[v] = options[k] if options[k]
+    end
+
+    function << (', ' + options_for_javascript(js_options) + ')')
+
+    javascript_tag(function)
+  end
+  
+  # Use this method in your view to generate a return for the AJAX autocomplete requests.
+  #
+  # Example action:
+  #
+  #   def auto_complete_for_item_title
+  #     @items = Item.find(:all, 
+  #       :conditions => [ 'LOWER(description) LIKE ?', 
+  #       '%' + request.raw_post.downcase + '%' ])
+  #     render :inline => "<%= auto_complete_result(@items, 'description') %>"
+  #   end
+  #
+  # The auto_complete_result can of course also be called from a view belonging to the 
+  # auto_complete action if you need to decorate it further.
+  def auto_complete_result(entries, field, phrase = nil)
+    return unless entries
+    items = entries.map { |entry| content_tag("li", phrase ? highlight(entry[field], phrase) : h(entry[field])) }
+    content_tag("ul", items.uniq)
+  end
+  
+  # Wrapper for text_field with added AJAX autocompletion functionality.
+  #
+  # In your controller, you'll need to define an action called
+  # auto_complete_for to respond the AJAX calls,
+  # 
+  def text_field_with_auto_complete(object, method, tag_options = {}, completion_options = {})
+    (completion_options[:skip_style] ? "" : auto_complete_stylesheet) +
+    text_field(object, method, tag_options) +
+    content_tag("div", "", :id => "#{object}_#{method}_auto_complete", :class => "auto_complete") +
+    auto_complete_field("#{object}_#{method}", { :url => { :action => "auto_complete_for_#{object}_#{method}" } }.update(completion_options))
+  end
+
+  private
+    def auto_complete_stylesheet
+      content_tag('style', <<-EOT, :type => Mime::CSS)
+        div.auto_complete {
+          width: 350px;
+          background: #fff;
+        }
+        div.auto_complete ul {
+          border:1px solid #888;
+          margin:0;
+          padding:0;
+          width:100%;
+          list-style-type:none;
+        }
+        div.auto_complete ul li {
+          margin:0;
+          padding:3px;
+        }
+        div.auto_complete ul li.selected {
+          background-color: #ffb;
+        }
+        div.auto_complete ul strong.highlight {
+          color: #800; 
+          margin:0;
+          padding:0;
+        }
+      EOT
+    end
+
+end   

data/lib/ontomde-core/inspector/rails/vendor/plugins/auto_complete/test/auto_complete_test.rb

@@ -0,0 +1,67 @@
+require File.expand_path(File.join(File.dirname(__FILE__), '../../../../test/test_helper')) 
+
+class AutoCompleteTest < Test::Unit::TestCase
+  include AutoComplete
+  include AutoCompleteMacrosHelper
+  
+  include ActionView::Helpers::UrlHelper
+  include ActionView::Helpers::TagHelper
+  include ActionView::Helpers::TextHelper
+  include ActionView::Helpers::FormHelper
+  include ActionView::Helpers::CaptureHelper
+  
+  def setup
+    @controller = Class.new do
+      def url_for(options)
+        url =  "http://www.example.com/"
+        url << options[:action].to_s if options and options[:action]
+        url
+      end
+    end
+    @controller = @controller.new
+  end
+
+
+  def test_auto_complete_field
+    assert_dom_equal %(<script type=\"text/javascript\">\n//<![CDATA[\nvar some_input_auto_completer = new Ajax.Autocompleter('some_input', 'some_input_auto_complete', 'http://www.example.com/autocomplete', {})\n//]]>\n</script>),
+      auto_complete_field("some_input", :url => { :action => "autocomplete" });
+    assert_dom_equal %(<script type=\"text/javascript\">\n//<![CDATA[\nvar some_input_auto_completer = new Ajax.Autocompleter('some_input', 'some_input_auto_complete', 'http://www.example.com/autocomplete', {tokens:','})\n//]]>\n</script>),
+      auto_complete_field("some_input", :url => { :action => "autocomplete" }, :tokens => ',');
+    assert_dom_equal %(<script type=\"text/javascript\">\n//<![CDATA[\nvar some_input_auto_completer = new Ajax.Autocompleter('some_input', 'some_input_auto_complete', 'http://www.example.com/autocomplete', {tokens:[',']})\n//]]>\n</script>),
+      auto_complete_field("some_input", :url => { :action => "autocomplete" }, :tokens => [',']);  
+    assert_dom_equal %(<script type=\"text/javascript\">\n//<![CDATA[\nvar some_input_auto_completer = new Ajax.Autocompleter('some_input', 'some_input_auto_complete', 'http://www.example.com/autocomplete', {minChars:3})\n//]]>\n</script>),
+      auto_complete_field("some_input", :url => { :action => "autocomplete" }, :min_chars => 3);
+    assert_dom_equal %(<script type=\"text/javascript\">\n//<![CDATA[\nvar some_input_auto_completer = new Ajax.Autocompleter('some_input', 'some_input_auto_complete', 'http://www.example.com/autocomplete', {onHide:function(element, update){alert('me');}})\n//]]>\n</script>),
+      auto_complete_field("some_input", :url => { :action => "autocomplete" }, :on_hide => "function(element, update){alert('me');}");
+    assert_dom_equal %(<script type=\"text/javascript\">\n//<![CDATA[\nvar some_input_auto_completer = new Ajax.Autocompleter('some_input', 'some_input_auto_complete', 'http://www.example.com/autocomplete', {frequency:2})\n//]]>\n</script>),
+      auto_complete_field("some_input", :url => { :action => "autocomplete" }, :frequency => 2);
+    assert_dom_equal %(<script type=\"text/javascript\">\n//<![CDATA[\nvar some_input_auto_completer = new Ajax.Autocompleter('some_input', 'some_input_auto_complete', 'http://www.example.com/autocomplete', {afterUpdateElement:function(element,value){alert('You have chosen: '+value)}})\n//]]>\n</script>),
+      auto_complete_field("some_input", :url => { :action => "autocomplete" }, 
+        :after_update_element => "function(element,value){alert('You have chosen: '+value)}");
+    assert_dom_equal %(<script type=\"text/javascript\">\n//<![CDATA[\nvar some_input_auto_completer = new Ajax.Autocompleter('some_input', 'some_input_auto_complete', 'http://www.example.com/autocomplete', {paramName:'huidriwusch'})\n//]]>\n</script>),
+      auto_complete_field("some_input", :url => { :action => "autocomplete" }, :param_name => 'huidriwusch');
+    assert_dom_equal %(<script type=\"text/javascript\">\n//<![CDATA[\nvar some_input_auto_completer = new Ajax.Autocompleter('some_input', 'some_input_auto_complete', 'http://www.example.com/autocomplete', {method:'get'})\n//]]>\n</script>),
+      auto_complete_field("some_input", :url => { :action => "autocomplete" }, :method => :get);
+  end
+  
+  def test_auto_complete_result
+    result = [ { :title => 'test1'  }, { :title => 'test2'  } ]
+    assert_equal %(<ul><li>test1</li><li>test2</li></ul>), 
+      auto_complete_result(result, :title)
+    assert_equal %(<ul><li>t<strong class=\"highlight\">est</strong>1</li><li>t<strong class=\"highlight\">est</strong>2</li></ul>), 
+      auto_complete_result(result, :title, "est")
+    
+    resultuniq = [ { :title => 'test1'  }, { :title => 'test1'  } ]
+    assert_equal %(<ul><li>t<strong class=\"highlight\">est</strong>1</li></ul>), 
+      auto_complete_result(resultuniq, :title, "est")
+  end
+  
+  def test_text_field_with_auto_complete
+    assert_match %(<style type="text/css">),
+      text_field_with_auto_complete(:message, :recipient)
+
+    assert_dom_equal %(<input id=\"message_recipient\" name=\"message[recipient]\" size=\"30\" type=\"text\" /><div class=\"auto_complete\" id=\"message_recipient_auto_complete\"></div><script type=\"text/javascript\">\n//<![CDATA[\nvar message_recipient_auto_completer = new Ajax.Autocompleter('message_recipient', 'message_recipient_auto_complete', 'http://www.example.com/auto_complete_for_message_recipient', {})\n//]]>\n</script>),
+      text_field_with_auto_complete(:message, :recipient, {}, :skip_style => true)
+  end
+  
+end

data/lib/ontomde-core/inspector/setup_rails.sh

@@ -0,0 +1,39 @@
+#!/bin/bash
+
+cd `dirname "$0"`
+HERE=`pwd`
+RAILS_VERSION=2.0.2
+
+cd "$HERE"
+
+echo "********** PROXY:${http_proxy:-none\\n**********\\n********** http_proxy is not set.\\n********** Please set http_proxy if you are behind a firewall.\\n**********\\n********** (example http_proxy=http://yourproxy:yourport)\\n**********}" | sed 's/\\n/\n/g'
+
+gem${WINDIR:+.bat} install --no-rdoc --no-ri --version "= $RAILS_VERSION" rails
+
+
+
+cd "$HERE"
+echo "******************************"
+echo "Never overwrite existing files"
+echo "         (answer N)"
+echo "******************************"
+
+TOBESAVED="rails/app/controllers/application.rb rails/config/routes.rb rails/config/environment.rb"
+for x in $TOBESAVED
+do
+	mv $x $x.save
+done
+rails${WINDIR:+.bat} "_${RAILS_VERSION}_"  rails
+rm -f rails/public/index.html
+
+for x in $TOBESAVED
+do
+	mv $x.save $x
+done
+
+cd "$HERE/rails"
+ruby script/plugin install auto_complete
+
+#if index.html is here there will be no redirection to /mtk
+rm -f public/index.html
+

data/lib/ontomde-core/inspector.rb

@@ -0,0 +1,21 @@
+require 'ontomde-core'
+
+module Kernel
+  def model_for_inspector
+    return @@model_for_inspector
+  end
+  def set_model_for_inspector(model)
+    @@model_for_inspector=model
+  end
+end
+
+module Mrdf_Repository
+  def inspector_start_daemon(fileName)
+    
+    set_model_for_inspector(self)
+    Dir.chdir(File.dirname(__FILE__))
+    Dir.chdir("inspector/rails")
+    load("script/server")
+  end
+end
+

data/lib/ontomde-core/meta.rb

@@ -139,7 +139,8 @@ class Crdf_Resource
   # range: array of types
   # value: a value
   # property: name of the property, value comes from (used in error message)
-  def check_rdfType(range,value,property)
+  # src : owner of the property being processed
+  def check_rdfType(range,value,property,src=nil)
     return if value.nil?
     return if range.empty?
     range.each { |r|
@@ -150,7 +151,7 @@ class Crdf_Resource
       <<END
 
 ********* ILLEGAL ASSIGNEMENT TYPE **********
-** property #{property}
+** property #{property} for uri=#{src.nil? ? "" : src.rdf_uri}
 ** has a range of (valid value types)
 ** [ #{range} ]
 ** which is not compatible with type #{value.class.name}
@@ -281,7 +282,7 @@ END
 
     if (true)
       ret << %{def #{sym_short}_typeOk?(val)
-				check_rdfType(#{range_array},val,:#{sym_short})
+				check_rdfType(#{range_array},val,:#{sym_short},self)
 			end
       }
     else
@@ -289,7 +290,7 @@ END
       # investigate reason of multiple execution
       ret << %{RANGE_#{sym_short}=#{range_array}
 			def #{sym_short}_typeOk?(val)
-				check_rdfType(RANGE_#{sym_short},val,:#{sym_short})
+				check_rdfType(RANGE_#{sym_short},val,:#{sym_short},self)
 			end
       }
     end
@@ -345,7 +346,7 @@ END
 end
 
 
-module Mrdf_Model
+module Mrdf_Repository
   def mtk_object_message
     return ""
   end

data/lib/ontomde-core/resource.rb

@@ -28,12 +28,12 @@ class Crdf_Resource #< Crdfs_Resource
   include Mrdf_Resource
   attr_reader :uri
   attr_reader :nbrItem
-  attr_reader :rdf_model
+  attr_reader :rdf_Repository
   @@nbrItem=0
 
   # Utiliser pour un hack
-  def force_rdf_model=(m)
-    @rdf_model=m
+  def force_rdf_Repository=(m)
+    @rdf_Repository=m
   end
 
   # Returns a new empty attribute array
@@ -57,13 +57,13 @@ class Crdf_Resource #< Crdfs_Resource
     end
     
     model[uri]=self
-    @rdf_model=model
+    @rdf_Repository=model
     @uri=uri
     @@nbrItem=@@nbrItem+1
   end
 
   #List of non resetable variables
-  @@NonResetableVariables=['@rdf_model','@rdf_type','@uri']
+  @@NonResetableVariables=['@rdf_Repository','@rdf_type','@uri',"@ext_isReferencedBy"]
 
   #Return true if v is a restable property.
   def isResetable?(v)
@@ -165,7 +165,7 @@ class Crdf_Resource
   #Retrieves a uri from a ruby identifier
   def getRubyNameInverse(identifier)
     found=nil
-    rdf_model.each { |k,c|
+    rdf_Repository.each { |k,c|
       next if c.getRubyName!=identifier.to_s
       log.error("Ruby name clash for #{identifier} and #{k}") unless found.nil?
       found=k

data/lib/ontomde-core/resourceSet.rb

@@ -1,4 +1,4 @@
-module Mrdf_Model
+module Mrdf_Repository
 end
 
 class Crdf_Resource
@@ -9,8 +9,8 @@ class Crdf_Resource
 end
 
 #Class meant to store every element of a model.
-class Crdf_Model  #< Hash
-  include Mrdf_Model
+class Crdf_Repository  #< Hash
+  include Mrdf_Repository
   attr_reader :updateCount
 
   attr :typeIndex
@@ -98,10 +98,10 @@ class Crdf_Model  #< Hash
   end
 
   # internal use
-  def parse(nt,modeData)
-    if modeData
+  def parseNT(nt,modeData)
+    if modeData # MODE_parseModelStream_POPULATE_FIELDS
       parseModeData(nt)
-    else
+    else # MODE_parseModelStream_CREATE_INSTANCES
       parseModeResource(nt)
     end
   end
@@ -164,6 +164,7 @@ class Crdf_Model  #< Hash
   def generateClassesFromMetamodel(outRubyModelFileName)
     #log.debug("ecriture du metamodele dans: #{outRubyModelFileName}")
     mtk_default_context(:logFileWrite => false) { mtk_writeSession(outRubyModelFileName) {
+        mtk_addTempFileToDelete(outRubyModelFileName)
         f=self
         f.write <<END
 # Start of file #{outRubyModelFileName}

data/lib/ontomde-core/triplet.rb

@@ -6,6 +6,7 @@ class UriNamespace
     # Les 1er sont prioritaire pour unalias ??
     @urialiases=Hash.new(nil)
     @urialiases["http:\/\/uml\/2"]="uml"
+    #@urialiases["http://schema.omg.org/spec/UML/2.1"]="uml"
     #@urialiases["http:\/\/uml\/1.4"]="uml"
     @urialiases["http:\/\/www.w3.org\/2000\/01\/rdf-schema"]="rdfs"
     @urialiases["http:\/\/www.w3.org\/1999\/02\/22-rdf-syntax-ns"]="rdf"
@@ -14,6 +15,7 @@ class UriNamespace
     @urialiases["http:\/\/ft\/uml\/2"]="umlx"
     @urialiases["http:\/\/kb"]="ukb"
     @urialiases["http:\/\/orange-ftgroup.com\/2007\/rd\/xmda\/bpm"]="bpm"
+    @urialiases["http:\/\/protege.stanford.edu\/soa"]="soa"
   end
 
   # Returns unaliases uri for uri

data/lib/ontomde-core/version.rb

@@ -1,5 +1,5 @@
 module Ontomde
   module Core
-    VERSION='1.0.6'
+    VERSION='2.0.0'
   end
 end

data/test/protege/test_demo.rb

@@ -36,7 +36,7 @@ end
 DATADIR=File.dirname(__FILE__)
 
 # load meta-model from file
-model=Crdf_Model.new
+model=Crdf_Repository.new
 model.loadMetaModelFromFile("#{DATADIR}/etatCivil.rdfs",true)
 
 # load model from file