ontomde-core 2.0.4 → 2.0.5

data/Manifest.txt

@@ -93,8 +93,10 @@ lib/ontomde-core/meta.rb
 lib/ontomde-core/profil.rb
 lib/ontomde-core/resource.rb
 lib/ontomde-core/resourceSet.rb
+lib/ontomde-core/threads.rb
 lib/ontomde-core/triplet.rb
 lib/ontomde-core/version.rb
+lib/ontomde-core/xslt.rb
 test/protege/demo.sh
 test/protege/etatCivil.pprj
 test/protege/etatCivil.rdf

data/lib/ontomde-core.rb

@@ -19,6 +19,8 @@ require "#{here}/fileTypes.rb"
 require "#{here}/helper.rb"
 require "#{here}/context.rb"
 require "#{here}/delayed.rb"
+require "#{here}/threads.rb"
+require "#{here}/xslt.rb"
 
 #MTKRunner.rb
 #require "#{here}/profil.rb"

data/lib/ontomde-core/context.rb

@@ -39,7 +39,7 @@ FINCODE
 end
 
 module Mrdf_Repository
-  @@context=WarningHash.new()
+  Thread.current["@@context"]=WarningHash.new()
 
   #returns context hastable.
   #
@@ -52,7 +52,7 @@ module Mrdf_Repository
   # Please refer to #mtk_context method for information on 
   # how to populate context.
   def context
-    return @@context
+    return Thread.current["@@context"]
   end
 
   # Similar to mtk_context but preserves already defined context.
@@ -60,7 +60,7 @@ module Mrdf_Repository
   def mtk_default_context(*additional_context,&block)
     filtered_context=Array.new
     additional_context.each { |item| item.each { |k,v|
-        next if @@context.include?(k)
+        next if Thread.current["@@context"].include?(k)
         filtered_context << item
       }}
     mtk_context(*filtered_context,&block)
@@ -93,13 +93,13 @@ module Mrdf_Repository
   #    puts context[:build] # BUILD_ONE
   #  }
   def mtk_context(*additional_context,&block)
-    context_save=@@context
-    @@context=context_save.clone
+    context_save=Thread.current["@@context"]
+    Thread.current["@@context"]=context_save.clone
     additional_context.each { |item| item.each { |k,v|
-        @@context[k]=v
+        Thread.current["@@context"][k]=v
       }}
     yield
-    @@context=context_save
+    Thread.current["@@context"]=context_save
     return nil
   end
 

data/lib/ontomde-core/converter-ea/7_1_833/XMI2RDFS.xslt

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="2.0" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:uml="http://schema.omg.org/spec/UML/2.1" xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ns0="http://uml/2#">
+<xsl:stylesheet version="2.0" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:uml="http://schema.omg.org/spec/UML/2.1" xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ns0="http://uml/2#"
+xmlns:thecustomprofile="http://www.sparxsystems.com/profiles/thecustomprofile/1.0">
 	<xsl:output method="xml" version="1.0" encoding="UTF-8" indent="yes"/>
 	
 	<!-- Create Defined and used Stereotypes for later creation of missing stereotype definitions -->
@@ -10,6 +11,7 @@
 	<xsl:key name="ExtensionConnectorIdRef" match="//xmi:Extension//connector" use="@xmi:idref"/>
 	<xsl:key name="ExtensionOperationIdRef" match="//xmi:Extension//operation" use="@xmi:idref"/>
 	<xsl:key name="ExtensionParameterIdRef" match="//xmi:Extension//parameter" use="@xmi:idref"/>
+	<xsl:key name="CustomProfile" match="//thecustomprofile:*" use="@*"/>
 
 	<!-- Profile -->
 	<xsl:template name="Profile" xmlns:uml="http://schema.omg.org/spec/UML/2.1/uml.xml">
@@ -56,9 +58,9 @@
 		</xsl:if>
 		<!-- Stereotype -->
 		<rdf:Description rdf:about="{@xmi:id}" ns0:name="{@name}">
-			<xsl:if test="key('ExtensionElementIdRef',current()/@xmi:id)/properties/@stereotype">
-				<ns0:appliedStereotype rdf:resource="{key('ExtensionElementIdRef',current()/@xmi:id)/properties/@stereotype}"/>
-			</xsl:if>
+			<xsl:for-each select="key('ExtensionElementIdRef',current()/@xmi:id)/properties/@stereotype">
+				<ns0:appliedStereotype><xsl:attribute name="rdf:resource"><xsl:value-of select="."/></xsl:attribute></ns0:appliedStereotype>
+			</xsl:for-each>
 			<ns0:visibility rdf:resource="http://uml/2#visibilityKind_{@visibility}"/>
 			<xsl:if test="@isAbstract='true'">
 				<ns0:isAbstract>true</ns0:isAbstract>
@@ -80,6 +82,7 @@
 				<ns0:supplier rdf:resource="{@supplier}"/>
 				<ns0:realizingClassifier rdf:resource="{@realizingClassifier}"/>
 				<ns0:implementingClassifier rdf:resource="{@client}"/>
+				<xsl:call-template name="MyAppliedStereotypes"/>			
 			</rdf:Description>
 		</xsl:for-each>
 		<!-- ownedAttribute -->
@@ -87,6 +90,17 @@
 		<!-- ownedOperation -->
 		<xsl:apply-templates select="ownedOperation"/>
 	</xsl:template>
+	
+<!-- looks for stereotype using two different methods -->
+<xsl:template name="MyAppliedStereotypes">
+				<xsl:for-each select="key('ExtensionElementIdRef',current()/@xmi:id)/properties/@stereotype">
+					<ns0:appliedStereotype><xsl:attribute name="rdf:resource"><xsl:value-of select="."/></xsl:attribute></ns0:appliedStereotype>
+				</xsl:for-each>	
+				<xsl:for-each select="key('CustomProfile',@xmi:id)">
+					<ns0:appliedStereotype><xsl:attribute name="rdf:resource"><xsl:value-of select="substring-after(name(),':')"/></xsl:attribute></ns0:appliedStereotype>
+				</xsl:for-each>
+	</xsl:template>
+	
 	<!-- Comment -->
 	<xsl:template name="Comment">
 		<xsl:param name="body"/>

data/lib/ontomde-core/fileLoader.rb

@@ -192,29 +192,27 @@ END
   
  def translateEAXMI_to_NT(eaxmifile,ea_version)
     translatedfile="#{eaxmifile}_tmp.nt"
-    param1="#{eaxmifile} -o #{translatedfile}_prestep2 #{File.dirname(__FILE__)}\\converter-ea\\#{ea_version}\\XMI2RDFS.xslt"
-    #step2 is for getting rid of file://xxx
-    param2="#{translatedfile}_prestep2 -o #{translatedfile} #{File.dirname(__FILE__)}\\converter-ea\\#{ea_version}\\XMI2RDFS_step2.xslt"
+    f1="#{translatedfile}_deleteMe_prestep2"
+    mtk_addTempFileToDelete(translatedfile)
+    mtk_addTempFileToDelete(f1)
+     
+    # load xslt engine
+    xslt=Mtk_xslt::XsltProcessor.new
+
+    puts "  :starting Enterprise Architect XMI conversion using xslt:#{xslt.name}"
+
+    #step1 transforms xmi into xml-rdf
+    xslt1="#{File.dirname(__FILE__)}\\converter-ea\\#{ea_version}\\XMI2RDFS.xslt"
+    in1=eaxmifile
+    out1=f1
+    xslt.transform(xslt1,in1,out1)
+
+    #step2 is for getting rid of uri such as: file://xxx
+    xslt2="#{File.dirname(__FILE__)}\\converter-ea\\#{ea_version}\\XMI2RDFS_step2.xslt"
+    in2=out1
+    out2=translatedfile
+    xslt.transform(xslt2,in2,out2)
 
-    if ! OS_IS_WINDOWS
-      #we are not under windows
-      #built in rapper cannot be used (it is for windows)
-      #we use rapper available in path.
-      raise Exception.new('TODO: use xslt under linux')
-    elsif PLATFORM_IS_JAVA
-      #We are under windows but under jruby
-      cmd1="#{File.dirname(__FILE__)}\\converter-ea\\msxsl.exe "+param1.tr('/','\\\\')
-      cmd2="#{File.dirname(__FILE__)}\\converter-ea\\msxsl.exe "+param2.tr('/','\\\\')
-    else
-      #We are under windows but under Matz Ruby Implementation (MRI)
-      cmd1="#{File.dirname(__FILE__)}\\converter-ea\\msxsl.exe "+param1.tr('/','\\\\')
-      cmd2="#{File.dirname(__FILE__)}\\converter-ea\\msxsl.exe "+param2.tr('/','\\\\')
-    end
-    puts "  :starting Enterprise Architect XMI conversion using msxml"
-    [cmd1,cmd2].each { |cmd| 
-      ret=system(cmd)
-      raise Exception.new("\n***\n***Error running command\n***\n***#{cmd}\n***Please check that no msxml process is running in background\n***\n") unless ret
-    }
     puts "  :done with Enterprise Architect file conversion"
     return translateXMLRDF_to_NT(translatedfile)
   end
@@ -233,7 +231,7 @@ END
   def translateXMLRDF_to_NT(srcFileName)
     # added version number to avoid cache reuse when upgrading
     fileName="#{srcFileName}.#{Ontomde::Core::VERSION}.cache.deleteMe.nt"
-    useCache=context[:useTranslateToNtCache,true]
+    useCache=context[:useTranslateToNtCache,false]
     mtk_addTempFileToDelete(fileName) unless useCache 
     if( useCache && File.exists?(fileName) && File.mtime(fileName) > File.mtime(srcFileName) )
       puts "INFO:Using cache in #{fileName}"

data/lib/ontomde-core/helper.rb

@@ -80,11 +80,11 @@ module Mmtk_helper
 
     ret=nil
     mtk_context(:mtk_out=>file,:mtk_fileName=>fileName) {
-      @@mtk_out=context[:mtk_out] # perf
+      #@@mtk_out=context[:mtk_out] # perf
       yield
-      ret=@@mtk_out.to_s
+      ret=context[:mtk_out].to_s
     }
-    @@mtk_out=context.get(:mtk_out) # perf
+    #@@mtk_out=context.get(:mtk_out) # perf
     return ret
   end
 
@@ -141,20 +141,20 @@ module Mmtk_helper
       file=NullFileWriter.instance
       #log.debug { "Simulating Write to #{fileName} (because context[:dryRun]==true)" }
       mtk_context(:mtk_out=>file,:mtk_fileName=>fileName,:protectedReverse=>protectedReverse) {
-        @@mtk_out=context[:mtk_out] # perf
+        #@@mtk_out=context[:mtk_out] # perf
         yield
       }
-      @@mtk_out=context.get(:mtk_out) # perf
+      #@@mtk_out=context.get(:mtk_out) # perf
       return
     end
     File.open(fileName+TEMP_FILE_SUFFIX,File::CREAT|File::TRUNC|File::RDWR, 0644) {
       |file|
       mtk_context(:mtk_out=>file,:mtk_fileName=>fileName,:protectedReverse=>protectedReverse) {
         #log.debug { "Writing #{fileName}" }
-        @@mtk_out=context[:mtk_out] # perf
+        #@@mtk_out=context[:mtk_out] # perf
         yield
       }
-      @@mtk_out=context.get(:mtk_out) # perf
+      #@@mtk_out=context.get(:mtk_out) # perf
     }
     #Temporary file has been corectly generated.
     unusedData=protectedReverse.unusedData
@@ -304,8 +304,9 @@ You must take the appropriate actions before re-running generator.
 
   # Write string to the current file opened by mtk_writeSession.
   def write(str)
-    if !@@mtk_out.nil?
-      @@mtk_out.write(str)
+    o=context[:mtk_out]
+    if !o.nil?
+      o.write(str)
       return
     end
     raise Warning.new(), <<END

data/lib/ontomde-core/resource.rb

@@ -178,8 +178,18 @@ class Crdf_Resource
 
   #Transforms a uri to a valid ruby identifier.
   #cf. getRubyNameInverse
+  @@CacheGetRubyName=Hash.new
+
+  def freeCacheGetRubyName
+  	@@CacheGetRubyName=Hash.new
+  end
   def getRubyName
-    return @uri.tr('^a-zA-Z0-9','_')
+    x=@@CacheGetRubyName[@uri]
+    if x.nil?
+      x=@uri.tr('^a-zA-Z0-9','_')
+      @@CacheGetRubyName[@uri]=x
+    end
+    return x
     #return @rdf_label if @rdf_label
     #return self.class.to_s # bootstrap
   end

data/lib/ontomde-core/threads.rb

@@ -0,0 +1,55 @@
+# Multi-threading is necessary for taking advantage of multi cpu/core 
+# * MRI does not take advantage of multi core so you will not see any gain
+# * JRUBY does use native thread and thus will benefit of threading.
+#
+# I have personnaly gainned 15% of global ontomde execution time on a
+# dual CPU with anti-virus using between 25% and 90% of one core. 
+# Benefit should be more noticeable with a quad core.
+#
+# (may 2009)
+#
+
+module Enumerable 
+  PLATFORM_IS_JAVA=!(RUBY_PLATFORM.index('java').nil?)
+  THREAD_NUMBER= ENV['ONTOMDE_THREADS'].nil? ? (PLATFORM_IS_JAVA ? 4 : 1) : ENV['ONTOMDE_THREADS'].to_int
+  def eachInThread(res,nbThread=THREAD_NUMBER,&proc)
+	if(res.context[:mtkThread,false])
+		puts "!! WARNING: recursive multi-thread request ignored" 
+		nbThread=1
+	end	
+	if(nbThread<=1 || (size < (nbThread*2)) ) 
+		each &proc
+		return 
+	end	
+
+	t=Array.new
+	(0..(nbThread-1)).each { |i|
+		t[i]=Array.new
+	}
+	# split collection in nbThread collections
+	i=0
+	each { |elt|
+		t[i].push(elt)
+		i=(i+1)%nbThread
+	}
+	
+	# run one thread for each sub-collection
+	rt=Array.new
+	(0..(nbThread-1)).each { |i|
+		puts "!Starting thread #{i} for #{t[i].size} elements"
+		rt.push(Thread.new(i,t[i],res.context) {  |ii,tas,ctx|
+			Thread.current["@@context"]=ctx
+			res.mtk_context(:mtkThread  => true) {
+				tas.each &proc
+			#puts "!thread #{ii} done."
+			}})
+		
+	}
+
+	puts "!waiting for unfinished parallel tasks"
+	rt.each { |th|
+		th.join
+	}
+  end
+
+end

data/lib/ontomde-core/version.rb

@@ -1,5 +1,5 @@
 module Ontomde
   module Core
-    VERSION='2.0.4'
+    VERSION='2.0.5'
   end
 end

data/lib/ontomde-core/xslt.rb

@@ -0,0 +1,87 @@
+
+
+PLATFORM_IS_JAVA=!(RUBY_PLATFORM.index('java').nil?)
+OS_IS_WINDOWS=!(ENV['OS'].nil? ? true : ENV['OS'].index('Windows').nil?)
+
+
+if OS_IS_WINDOWS
+	module Mtk_xslt
+	  class XsltProcessor
+	    def name
+		return "msxml"
+	    end
+	    def transform(xslt,infile,outfile)
+		    param="#{infile} -o #{outfile} #{xslt}"
+		    cmd="#{File.dirname(__FILE__)}\\converter-ea\\msxsl.exe "+param.tr('/','\\\\')
+		    ret=system(cmd)
+		    raise Exception.new("\n***\n***Error running command\n***\n***#{cmd}\n***Please check that no msxml process is running in background\n***\n") unless ret
+	    end
+	  end # XsltProcessor
+	end 
+elsif PLATFORM_IS_JAVA
+	# Jruby version
+
+	#from:
+	#  http://kfahlgren.com/blog/2007/03/02/borrowing-javas-xslt-support-for-ruby/
+
+	require 'java'
+	module Mtk_xslt
+	  include_class "javax.xml.transform.TransformerFactory"
+	  include_class "javax.xml.transform.Transformer"
+	  include_class "javax.xml.transform.stream.StreamSource"
+	  include_class "javax.xml.transform.stream.StreamResult"
+	  include_class "java.lang.System"
+
+
+	  class Saxon 
+	    def transform(xslt,infile,outfile)
+	      transformer = @tf.newTransformer(StreamSource.new(xslt))
+	      transformer.transform(StreamSource.new(infile), StreamResult.new(outfile))
+	    end
+	    def name
+		return "jruby/saxon"
+	    end
+	    TRANSFORMER_FACTORY_IMPL = "net.sf.saxon.TransformerFactoryImpl"
+	    def initialize
+	      System.setProperty("javax.xml.transform.TransformerFactory", TRANSFORMER_FACTORY_IMPL)
+	      @tf = TransformerFactory.newInstance
+	      raise Exception.new("\n*** *******\n*** ERROR loading saxon into jruby.\n*** This error may be caused by missing Saxon jars in jruby lib directory\n*** *******") if @tf.nil?
+	    end
+	  end
+	  class Xalan 
+	    def transform(xslt,infile,outfile)
+	      transformer = @tf.newTransformer(StreamSource.new(xslt))
+	      transformer.transform(StreamSource.new(infile), StreamResult.new(outfile))
+	    end
+	    def name
+		return "jruby/xalanl"
+	    end
+	    TRANSFORMER_FACTORY_IMPL = "org.apache.xalan.processor.TransformerFactoryImpl"
+	    def initialize
+	      System.setProperty("javax.xml.transform.TransformerFactory", TRANSFORMER_FACTORY_IMPL)
+	      @tf = TransformerFactory.newInstance
+	      raise Exception.new("\n*** *******\n*** ERROR loading saxon into jruby.\n*** This error may be caused by missing xalan jars in jruby lib directory\n*** *******") if @tf.nil?
+	    end
+	  end
+	  #class XsltProcessor < Saxon ; end
+	  class XsltProcessor < Xalan ; end
+	end 
+
+	# if you wanted to run this from the command line, do something like
+	# $ jruby lib/jxslt.rb a.xsl in.xml out.xml
+	#xalan = Mtk_xslt::XsltProcessor.new
+	#xalan.transform(*ARGV)
+	#saxon = JXslt::Saxon.new
+	#saxon.transform(*ARGV)
+
+else
+	# XSLT is not available
+	module Mtk_xslt
+	  class XsltProcessor
+		  def initialize
+		    raise Exception.new("\n***\n***XSLT is not available on your platform. Currently supported platform are JRUBY and Windows\n***\n***") 
+		  end
+	  end
+	end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ontomde-core
 version: !ruby/object:Gem::Version 
-  version: 2.0.4
+  version: 2.0.5
 platform: ruby
 authors: 
 - Orange-labs BIZZ/CIL/SAM
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-08 00:00:00 +02:00
+date: 2009-04-23 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -130,8 +130,10 @@ files:
 - lib/ontomde-core/profil.rb
 - lib/ontomde-core/resource.rb
 - lib/ontomde-core/resourceSet.rb
+- lib/ontomde-core/threads.rb
 - lib/ontomde-core/triplet.rb
 - lib/ontomde-core/version.rb
+- lib/ontomde-core/xslt.rb
 - test/protege/demo.sh
 - test/protege/etatCivil.pprj
 - test/protege/etatCivil.rdf