ontomde-core 2.0.0 → 2.0.4

data/Manifest.txt

@@ -9,7 +9,12 @@ lib/ontomde-core/bootstrap_rdfs.rb
 lib/ontomde-core/clone.rb
 lib/ontomde-core/completion.rb
 lib/ontomde-core/context.rb
-lib/ontomde-core/converter-ea/XMI2RDFS.xslt
+lib/ontomde-core/converter-ea/7_1_829/XMI2RDFS.xslt
+lib/ontomde-core/converter-ea/7_1_829/XMI2RDFS_step2.xslt
+lib/ontomde-core/converter-ea/7_1_833/XMI2RDFS.xslt
+lib/ontomde-core/converter-ea/7_1_833/XMI2RDFS_step2.xslt
+lib/ontomde-core/converter-ea/7_5_843/XMI2RDFS.xslt
+lib/ontomde-core/converter-ea/7_5_843/XMI2RDFS_step2.xslt
 lib/ontomde-core/converter-ea/msxsl.exe
 lib/ontomde-core/customERB.rb
 lib/ontomde-core/custom_method_missing.rb
@@ -82,12 +87,6 @@ lib/ontomde-core/inspector/rails/script/process/spawner
 lib/ontomde-core/inspector/rails/script/runner
 lib/ontomde-core/inspector/rails/script/server
 lib/ontomde-core/inspector/rails/test/test_helper.rb
-lib/ontomde-core/inspector/rails/vendor/plugins/auto_complete/README
-lib/ontomde-core/inspector/rails/vendor/plugins/auto_complete/Rakefile
-lib/ontomde-core/inspector/rails/vendor/plugins/auto_complete/init.rb
-lib/ontomde-core/inspector/rails/vendor/plugins/auto_complete/lib/auto_complete.rb
-lib/ontomde-core/inspector/rails/vendor/plugins/auto_complete/lib/auto_complete_macros_helper.rb
-lib/ontomde-core/inspector/rails/vendor/plugins/auto_complete/test/auto_complete_test.rb
 lib/ontomde-core/inspector/setup_rails.sh
 lib/ontomde-core/log.rb
 lib/ontomde-core/meta.rb

data/lib/ontomde-core/completion.rb

@@ -2,7 +2,7 @@
 class Class
   def getAddedMethods(base=nil)
     begin
-      b=""
+      b=''
 
       cmd="#{self.name}.new(::Crdf_Repository.new(),'abc')"
       c=eval cmd
@@ -30,7 +30,7 @@ def getCompletionFile(&loadModules)
     c=Class.new
 
     puts <<TPL
-module #{o.name.gsub(/^C/,"M") }#{o.getAddedMethods.collect {|m|
+module #{o.name.gsub(/^C/,'M') }#{o.getAddedMethods.collect {|m|
     %{
     def #{m.to_s} ; end}
     }}
@@ -39,9 +39,9 @@ TPL
   }
 end
 
-require "erb"
+require 'erb'
 getCompletionFile {
   require 'ontomde-uml2'
   m=Crdf_Repository.new
   m.loadUml2
-}
+}

data/lib/ontomde-core/converter-ea/{XMI2RDFS.xslt → 7_1_829/XMI2RDFS.xslt}

@@ -5,6 +5,11 @@
 	<!-- Create Defined and used Stereotypes for later creation of missing stereotype definitions -->
 	<xsl:key name="definedStereotypes" match="packagedElement[@xmi:type='uml:Stereotype']" use="@name"/>
 	<xsl:key name="usedStereotypes" match="*[@stereotype]" use="@stereotype" />
+	<xsl:key name="ExtensionElementIdRef" match="//xmi:Extension//element" use="@xmi:idref"/>
+	<xsl:key name="ExtensionAttributeIdRef" match="//xmi:Extension//attribute" use="@xmi:idref"/>
+	<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"/>
 
 	<!-- Profile -->
 	<xsl:template name="Profile" xmlns:uml="http://schema.omg.org/spec/UML/2.1/uml.xml">
@@ -40,15 +45,15 @@
 	<!-- GeneralClass -->
 	<xsl:template name="GeneralClass">
 		<!-- Documentation -->
-		<xsl:if test="//xmi:Extension//element[@xmi:idref = current()/@xmi:id]/properties/@documentation">
+		<xsl:if test="key('ExtensionElementIdRef',current()/@xmi:id)/properties/@documentation">
 			<xsl:call-template name="Comment">
-				<xsl:with-param name="body" select="//xmi:Extension//element[@xmi:idref = current()/@xmi:id]/properties/@documentation"/>
+				<xsl:with-param name="body" select="key('ExtensionElementIdRef',current()/@xmi:id)/properties/@documentation"/>
 			</xsl:call-template>
 		</xsl:if>
 		<!-- Stereotype -->
 		<rdf:Description rdf:about="{@xmi:id}" ns0:name="{@name}">
-			<xsl:if test="//xmi:Extension//element[@xmi:idref = current()/@xmi:id]/properties/@stereotype">
-				<ns0:appliedStereotype rdf:resource="{//xmi:Extension//element[@xmi:idref = current()/@xmi:id]/properties/@stereotype}"/>
+			<xsl:if test="key('ExtensionElementIdRef',current()/@xmi:id)/properties/@stereotype">
+				<ns0:appliedStereotype rdf:resource="{key('ExtensionElementIdRef',current()/@xmi:id)/properties/@stereotype}"/>
 			</xsl:if>
 			<ns0:visibility rdf:resource="http://uml/2#visibilityKind_{@visibility}"/>
 			<xsl:if test="@isAbstract='true'">
@@ -165,9 +170,9 @@
 	<!-- Enumeration -->
 	<xsl:template name="Enumeration">
 		<!-- Documentation -->
-		<xsl:if test="//xmi:Extension//element[@xmi:idref = current()/@xmi:id]/properties/@documentation">
+		<xsl:if test="key('ExtensionElementIdRef',current()/@xmi:id)/properties/@documentation">
 			<xsl:call-template name="Comment">
-				<xsl:with-param name="body" select="//xmi:Extension//element[@xmi:idref = current()/@xmi:id]/properties/@documentation"/>
+				<xsl:with-param name="body" select="key('ExtensionElementIdRef',current()/@xmi:id)/properties/@documentation"/>
 			</xsl:call-template>
 		</xsl:if>
 		<rdf:Description rdf:about="{@xmi:id}" ns0:name="{@name}">
@@ -176,11 +181,11 @@
 		</rdf:Description>
 		<xsl:for-each select="ownedAttribute">
 			<!-- ownedLiteral -->
-			<xsl:if test="//xmi:Extension//attribute[@xmi:idref = current()/@xmi:id]/stereotype/@stereotype='enum'">
+			<xsl:if test="key('ExtensionAttributeIdRef',current()/@xmi:id)/stereotype/@stereotype='enum'">
 				<xsl:call-template name="Literal"/>
 			</xsl:if>
 			<!-- ownedAttribute -->
-			<xsl:if test="not(//xmi:Extension//attribute[@xmi:idref = current()/@xmi:id]/stereotype/@stereotype='enum')">
+			<xsl:if test="not(key('ExtensionAttributeIdRef',current()/@xmi:id)/stereotype/@stereotype='enum')">
 				<rdf:Description rdf:about="{../@xmi:id}">
 					<ns0:ownedAttribute rdf:resource="{@xmi:id}"/>
 				</rdf:Description>
@@ -197,7 +202,7 @@
 		</rdf:Description>
 		<xsl:choose>
 			<xsl:when test="@association">
-				<xsl:variable name="connector" select="//xmi:Extension//connector[@xmi:idref = current()/@association]"/>
+				<xsl:variable name="connector" select="key('ExtensionConnectorIdRef',current()/@association)"/>
 				<xsl:variable name="thisEnd" select="$connector/source[role/@name=current()/@name]|$connector/target[role/@name=current()/@name]"/>
 				<xsl:variable name="otherEnd" select="$connector/source[not(role/@name=current()/@name)]|$connector/target[not(role/@name=current()/@name)]"/>
 				
@@ -278,7 +283,7 @@
 				</rdf:Description>
 			</xsl:when>
 			<xsl:otherwise>
-				<xsl:variable name="attribute" select="//xmi:Extension//attribute[@xmi:idref = current()/@xmi:id]"/>
+				<xsl:variable name="attribute" select="key('ExtensionAttributeIdRef',current()/@xmi:id)"/>
 				<!-- Documentation -->
 				<xsl:if test="$attribute/documentation/@value">
 					<xsl:call-template name="Comment">
@@ -352,9 +357,9 @@
 	<!-- Literal -->
 	<xsl:template name="Literal">
 		<!-- Documentation -->
-		<xsl:if test="//xmi:Extension//attribute[@xmi:idref = current()/@xmi:id]/documentation/@value">
+		<xsl:if test="key('ExtensionAttributeIdRef',current()/@xmi:id)/documentation/@value">
 			<xsl:call-template name="Comment">
-				<xsl:with-param name="body" select="//xmi:Extension//attribute[@xmi:idref = current()/@xmi:id]/documentation/@value"/>
+				<xsl:with-param name="body" select="key('ExtensionAttributeIdRef', current()/@xmi:id)/documentation/@value"/>
 			</xsl:call-template>
 		</xsl:if>
 		<rdf:Description rdf:about="{../@xmi:id}">
@@ -368,7 +373,7 @@
 	</xsl:template>
 	<!-- ownedEnd -->
 	<xsl:template name="ownedEnd">
-		<xsl:variable name="connector" select="//xmi:Extension//connector[@xmi:idref = current()/@association]"/>
+		<xsl:variable name="connector" select="key('ExtensionConnectorIdRef',current()/@association)"/>
 		<rdf:Description rdf:about="{@xmi:id}">
 			<rdf:type rdf:resource="http://uml/2#Property"/>
 			<xsl:if test="@name">
@@ -437,9 +442,9 @@
 	<!-- Operation -->
 	<xsl:template name="Operation">
 		<!-- Documentation -->
-		<xsl:if test="//xmi:Extension//operation[@xmi:idref = current()/@xmi:id]/documentation/@value">
+		<xsl:if test="key('ExtensionOperationIdRef',current()/@xmi:id)/documentation/@value">
 			<xsl:call-template name="Comment">
-				<xsl:with-param name="body" select="//xmi:Extension//operation[@xmi:idref = current()/@xmi:id]/documentation/@value"/>
+				<xsl:with-param name="body" select="key('ExtensionOperationIdRef',current()/@xmi:id)/documentation/@value"/>
 			</xsl:call-template>
 		</xsl:if>
 		<rdf:Description rdf:about="{@xmi:id}" ns0:name="{@name}">
@@ -447,9 +452,9 @@
 			<ns0:visibility rdf:resource="http://uml/2#visibilityKind_{@visibility}"/>
 		</rdf:Description>
 		<!-- Stereotype -->
-		<xsl:if test="//xmi:Extension//operation[@xmi:idref = current()/@xmi:id]/stereotype/@stereotype">
+		<xsl:if test="key('ExtensionOperationIdRef',current()/@xmi:id)/stereotype/@stereotype">
 			<rdf:Description rdf:about="{@xmi:id}">
-				<ns0:appliedStereotype rdf:resource="{//xmi:Extension//operation[@xmi:idref = current()/@xmi:id]/stereotype/@stereotype}"/>
+				<ns0:appliedStereotype rdf:resource="{key('ExtensionOperationIdRef',current()/@xmi:id)/stereotype/@stereotype}"/>
 			</rdf:Description>
 		</xsl:if>
 		<xsl:if test="@isAbstract='true'">
@@ -468,7 +473,7 @@
 		<!-- raisedException -->
 		<xsl:variable name="id" select="string(@xmi:id)"/>
 		
-		<xsl:for-each select="//xmi:Extension//operation[@xmi:idref = current()/@xmi:id]/tags/tag[@name='throws']">
+		<xsl:for-each select="key('ExtensionOperationIdRef',current()/@xmi:id)/tags/tag[@name='throws']">
 			<xsl:variable name="exceptionName" select="current()"/>
 			<xsl:variable name="classRaised" select="//packagedElement[@xmi:type='uml:Class' and @name=current()/@value]/@xmi:id"/>
 			<xsl:choose>
@@ -491,7 +496,7 @@
 						</rdf:Description>
 						<rdf:Description rdf:about="{$method/@xmi:id}_{generate-id($exceptionName)}">
 							<rdf:type rdf:resource="http://uml/2#Class"/>
-							<ns0:name>FIX_UML_MODEL_unknown_exception_<xsl:value-of select="$exceptionName"/>_thown_by_<xsl:value-of select="$method/@name"/></ns0:name>
+							<ns0:name>FIX_UML_MODEL_unknown_exception_<xsl:value-of select="$exceptionName"/>_thrown_by_<xsl:value-of select="$method/@name"/></ns0:name>
 						</rdf:Description>
 				</xsl:otherwise>
 			</xsl:choose>
@@ -500,9 +505,9 @@
 	<!-- Parameter -->
 	<xsl:template name="Parameter">
 		<!-- Documentation -->
-		<xsl:if test="//xmi:Extension//parameter[@xmi:idref = current()/@xmi:id]/documentation/@value">
+		<xsl:if test="key('ExtensionParameterIdRef',current()/@xmi:id)/documentation/@value">
 			<xsl:call-template name="Comment">
-				<xsl:with-param name="body" select="//xmi:Extension//parameter[@xmi:idref = current()/@xmi:id]/documentation/@value"/>
+				<xsl:with-param name="body" select="key('ExtensionParameterIdRef',current()/@xmi:id)/documentation/@value"/>
 			</xsl:call-template>
 		</xsl:if>
 		<rdf:Description rdf:about="{@xmi:id}" ns0:name="{@name}">
@@ -514,9 +519,9 @@
 		</rdf:Description>
 		<!-- BUG Export XMI EA
 		<xsl:if test="not(@type)">
-			<xsl:if test="//xmi:Extension//parameter[@xmi:idref = current()/@xmi:id]/properties/@type != 'void'">
+			<xsl:if test="key('ExtensionParameterIdRef',current()/@xmi:id)/properties/@type != 'void'">
 				<rdf:Description rdf:about="{@xmi:id}">
-					<ns0:type rdf:resource="_{//xmi:Extension//parameter[@xmi:idref = current()/@xmi:id]/properties/@type}DataType"/>
+					<ns0:type rdf:resource="_{key('ExtensionParameterIdRef',current()/@xmi:id)/properties/@type}DataType"/>
 				</rdf:Description>
 			</xsl:if>
 
@@ -559,9 +564,9 @@
 
 	<xsl:template match="packagedElement[@xmi:type='uml:StateMachine']">	
 		<xsl:call-template name="ownedMember"/>
-		<xsl:if test="//xmi:Extension//element[@xmi:idref = current()/@xmi:id]/properties/@documentation">
+		<xsl:if test="key('ExtensionElementIdRef',current()/@xmi:id)/properties/@documentation">
 			<xsl:call-template name="Comment">
-				<xsl:with-param name="body" select="//xmi:Extension//element[@xmi:idref = current()/@xmi:id]/properties/@documentation"/>
+				<xsl:with-param name="body" select="key('ExtensionElementIdRef',current()/@xmi:id)/properties/@documentation"/>
 			</xsl:call-template>
 		</xsl:if>		
 		
@@ -581,9 +586,9 @@
 									<xsl:call-template name="transition"/>
 								</ns0:transition>
 							</xsl:for-each>
-							<xsl:if test="//xmi:Extension//element[@xmi:idref = current()/@xmi:id]/properties/@documentation">
+							<xsl:if test="key('ExtensionElementIdRef',current()/@xmi:id)/properties/@documentation">
 								<xsl:call-template name="CommentDescription">
-								<xsl:with-param name="body" select="//xmi:Extension//element[@xmi:idref = current()/@xmi:id]/properties/@documentation"/>
+								<xsl:with-param name="body" select="key('ExtensionElementIdRef',current()/@xmi:id)/properties/@documentation"/>
 								</xsl:call-template>
 							</xsl:if>
 						</rdf:Description>
@@ -618,9 +623,9 @@
 					<rdf:type rdf:resource="http://uml/2#State"/>
 				</xsl:otherwise>
 			</xsl:choose>
-			<xsl:if test="//xmi:Extension//element[@xmi:idref = current()/@xmi:id]/properties/@documentation">
+			<xsl:if test="key('ExtensionElementIdRef',current()/@xmi:id)/properties/@documentation">
 				<xsl:call-template name="CommentDescription">
-					<xsl:with-param name="body" select="//xmi:Extension//element[@xmi:idref = current()/@xmi:id]/properties/@documentation"/>
+					<xsl:with-param name="body" select="key('ExtensionElementIdRef',current()/@xmi:id)/properties/@documentation"/>
 				</xsl:call-template>
 			</xsl:if>
 		</rdf:Description>
@@ -635,9 +640,9 @@
 			<ns0:source rdf:resource="{@source}"/>
 			<ns0:target rdf:resource="{@target}"/>
 			<!--
-			<xsl:if test="//xmi:Extension//attribute[@xmi:idref = current()/@xmi:id]/documentation/@value">
+			<xsl:if test="key('ExtensionAttributeIdRef',current()/@xmi:id)/documentation/@value">
 				<xsl:call-template name="CommentDescription">
-					<xsl:with-param name="body" select="//xmi:Extension//attribute[@xmi:idref = current()/@xmi:id]/documentation/@value"/>
+					<xsl:with-param name="body" select="key('ExtensionAttributeIdRef',current()/@xmi:id)/documentation/@value"/>
 				</xsl:call-template>
 			</xsl:if>
 			-->
@@ -735,12 +740,12 @@
 			</rdf:Description>
 			<xsl:if test="@direction = 'return'">
 				<!-- returnTypeCardinality -->
-				<xsl:if test="//xmi:Extension//operation[@xmi:idref = current()/../@xmi:id]/tags/tag[@name='returnTypeCardinality']">
+				<xsl:if test="key('ExtensionOperationIdRef',current()/../@xmi:id)/tags/tag[@name='returnTypeCardinality']">
 					<rdf:Description rdf:about="{@xmi:id}">
 						<ns0:lowerValue rdf:resource="_lowerValue{@xmi:id}"/>
 						<ns0:upperValue rdf:resource="_upperValue{@xmi:id}"/>
 					</rdf:Description>
-					<xsl:variable name="card" select="string(//xmi:Extension//operation[@xmi:idref = current()/../@xmi:id]/tags/tag[@name='returnTypeCardinality']/@value)"/>
+					<xsl:variable name="card" select="string(key('ExtensionOperationIdRef',current()/../@xmi:id)/tags/tag[@name='returnTypeCardinality']/@value)"/>
 					<xsl:variable name="lower" select="string(substring-before($card, '..'))"/>
 					<xsl:variable name="upper" select="string(substring-after($card, '..'))"/>
 					<rdf:Description rdf:about="_lowerValue{@xmi:id}">
@@ -763,7 +768,7 @@
 					</rdf:Description>
 				</xsl:if>
 				<!-- returnTypeIsOrdered -->
-				<xsl:if test="//xmi:Extension//operation[@xmi:idref = current()/../@xmi:id]/tags/tag[@name='returnTypeIsOrdered']">
+				<xsl:if test="key('ExtensionOperationIdRef',current()/../@xmi:id)/tags/tag[@name='returnTypeIsOrdered']">
 					<rdf:Description rdf:about="{@xmi:id}">
 						<ns0:isOrdered>true</ns0:isOrdered>
 					</rdf:Description>

data/lib/ontomde-core/converter-ea/7_1_829/XMI2RDFS_step2.xslt

@@ -0,0 +1,24 @@
+<?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:output method="xml" version="1.0" encoding="UTF-8" indent="yes"/>
+	
+
+	<xsl:template match="*|@*">
+		<xsl:copy>
+			<xsl:apply-templates select="@*"/>
+			<xsl:apply-templates select="node()"/>
+		</xsl:copy>
+	</xsl:template> 
+	<xsl:template match="@rdf:about[starts-with(.,'EA')]">
+		<xsl:attribute name="rdf:about">
+			<xsl:value-of select="concat('http://EA#',.)"/>
+		</xsl:attribute>
+	</xsl:template>
+	<xsl:template match="@rdf:resource[starts-with(.,'EA')]">
+		<xsl:attribute name="rdf:resource">
+			<xsl:value-of select="concat('http://EA#',.)"/>
+		</xsl:attribute>
+	</xsl:template>
+	
+
+</xsl:stylesheet>