ontomde-java 2.0.0 → 2.0.4

data/test/test_export_ea7_1_829.rb

@@ -0,0 +1,5 @@
+
+require "#{File.dirname(__FILE__)}/test_export_unitTests.rb"
+
+runOntomdeTest(["./model/model.ea7_1_829.xmi","./model/model_bis.ea7_1_829.xmi"],Modeler::MODELER_EA71)
+

data/test/test_export_ea7_1_833.rb

@@ -0,0 +1,5 @@
+
+require "#{File.dirname(__FILE__)}/test_export_unitTests.rb"
+
+runOntomdeTest(["./model/model.ea7_1_833.xmi","./model/model_bis.ea7_1_833.xmi"],Modeler::MODELER_EA71)
+

data/test/test_export_ea7_5_843.rb

@@ -0,0 +1,5 @@
+
+require "#{File.dirname(__FILE__)}/test_export_unitTests.rb"
+
+runOntomdeTest(["./model/model.ea7_5_843.xmi"],Modeler::MODELER_EA71)
+

data/test/test_export_magicDraw.rb

@@ -0,0 +1,4 @@
+
+require "#{File.dirname(__FILE__)}/test_export_unitTests.rb"
+
+runOntomdeTest("./model/simple1.mdzip.nt")

data/test/test_export_oe530.rb

@@ -1,4 +1,4 @@
 
-require "#{File.dirname(__FILE__)}/uml_test.rb"
+require "#{File.dirname(__FILE__)}/test_export_unitTests.rb"
 
 runOntomdeTest("./model/simple1.oe530.nt",Modeler::MODELER_OE53)

data/test/test_export_oe600.rb

@@ -1,4 +1,4 @@
 
-require "#{File.dirname(__FILE__)}/uml_test.rb"
+require "#{File.dirname(__FILE__)}/test_export_unitTests.rb"
 
 runOntomdeTest("./model/simple1.oe600.nt",Modeler::MODELER_OE60)

data/test/test_export_rsm60.rb

@@ -1,4 +1,4 @@
 
-require "#{File.dirname(__FILE__)}/uml_test.rb"
+require "#{File.dirname(__FILE__)}/test_export_unitTests.rb"
 
 runOntomdeTest("./model/simple1.emx.nt")

data/test/{uml_test.rb → test_export_unitTests.rb}

@@ -1118,9 +1118,14 @@ end
 module TestEvery
   def test_EveryTypedElementHasAType
     err=""
-    i=0
+    os=Set.new
     findEvery( [Muml_Property,Muml_Parameter]).each {|t|
       next unless t.uml_type.empty?
+      os.add(t)
+    }
+    # ordering so every test run is the same (gconf tracking)
+    os.sort { |a,b| a.to_s <=> b.to_s }.each { t
+      i=0
       i=i+1
       err=err+"#{i}: No uml_type found for element #{t.to_s}:#{t.class}\n"
     }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ontomde-java
 version: !ruby/object:Gem::Version 
-  version: 2.0.0
+  version: 2.0.4
 platform: ruby
 authors: 
 - Orange-labs BIZZ/CIL/SAM
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-08 00:00:00 +02:00
+date: 2009-04-08 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 2.0.0
+        version: 2.0.4
     version: 
 description: "ontomde-java is a full-featured UML2 to Java5 code generator library.   A sample raw UML2 source model is available here: http://ontomde.rubyforge.org/website/demo/java5/index.html. This model is included in a running demonstration available from this page: http://ontomde.rubyforge.org/website/demonstration.html  == FEATURES/PROBLEMS:  Managed class modifiers  * interface implements * single class inheritance * attribute  * association * method * inner class"
 email: stephanepierre.carrie -nospam- @orange-ftgroup.com
@@ -32,14 +32,12 @@ extra_rdoc_files:
 - History.txt
 - Manifest.txt
 - README.txt
-- test/model/model_ea71_README.txt
 files: 
 - History.txt
 - Manifest.txt
 - README.txt
 - Rakefile
 - bin/ontomde-java
-- generateRdocFile.sh
 - lib/ontomde-java.rb
 - lib/ontomde-java/crank.rb
 - lib/ontomde-java/crank/context.rb
@@ -140,56 +138,7 @@ files:
 - lib/ontomde-java/struts/webXml.rb
 - lib/ontomde-java/struts/xmlForm.rb
 - lib/ontomde-java/version.rb
-- profiling.xls
-- test/.classpath
-- test/.project
-- test/.settings/org.eclipse.jdt.core.prefs
-- test/Rakefile
-- test/build.xml
-- test/classpath.rb
-- test/lib/junit-4.1.jar
-- test/load1.rb
-- test/load2.rb
-- test/log4j.properties
-- test/model/.project
-- test/model/BigProject.mdzip
-- test/model/BigProject.mdzip.nt
-- test/model/ClassDiagram.EntArch.gif
-- test/model/ClassDiagram.emx.gif
-- test/model/ClassDiagram.mdzip.gif
-- test/model/model_ea71.bis.ea.xmi
-- test/model/model_ea71.ea.xmi
-- test/model/model_ea71.eap
-- test/model/model_ea71_README.txt
-- test/model/multipleInheritance.emx
-- test/model/multipleInheritance.emx.nt
-- test/model/simple1-530.ofp
-- test/model/simple1-includedAsReference.emx
-- test/model/simple1.emx
-- test/model/simple1.emx.fragments.nt
-- test/model/simple1.emx.nt
-- test/model/simple1.mdzip
-- test/model/simple1.mdzip.nt
-- test/model/simple1.oe530.nt
-- test/model/simple1.oe600.nt
-- test/src/RuntimeTest.java
-- test/src/testsLevel1.java
-- test/src/testsLevel2.java
-- test/src/testsLevel3.java
-- test/test-ea7.sh
-- test/test-magicDraw.sh
-- test/test-mi.sh
-- test/test-oe530.sh
-- test/test-oe600.sh
-- test/test-rsm.sh
-- test/test_export_ea71.rb
-- test/test_export_oe530.rb
-- test/test_export_oe600.rb
-- test/test_export_rsm60.rb
-- test/trace
-- test/uml_test.rb
-- test/uml_test.xls
-- test/unit_test.rb
+- lib/ontomde-java/vmware/vso.rb
 has_rdoc: true
 homepage: http://ontomde.rubyforge.org
 post_install_message: 
@@ -218,7 +167,11 @@ signing_key:
 specification_version: 2
 summary: OntoMDE Java5 language cartridge
 test_files: 
-- test/test_export_ea71.rb
+- test/test_export_ea7_1_829.rb
+- test/test_export_ea7_1_833.rb
+- test/test_export_ea7_5_843.rb
+- test/test_export_magicDraw.rb
 - test/test_export_oe530.rb
 - test/test_export_oe600.rb
 - test/test_export_rsm60.rb
+- test/test_export_unitTests.rb

data/generateRdocFile.sh

@@ -1,16 +0,0 @@
-#!/bin/bash
-
-cd `dirname "$0"`
-I=""
-for x in ../ontomde*/lib
-do
-	I="$I -I $x"
-done
-ruby $I ./bin/ontomde-java  --help-rdoc \
-	| grep -v 'Starting onto' \
-	| grep -v 'O.S detected' \
-	| grep -v 'Ruby.*platform.*detected' \
-	> lib/ontomde-java/frontend/command.rdoc  
-	
-#rake${WINDIR:+.bat} install_gem
-

data/test/.classpath

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="build/src/crx.emx.nt"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="build/src/model_ea71.ea.xmi/src/java"/>
-	<classpathentry kind="src" path="build/src/simple1.oe600.nt/src/java"/>
-	<classpathentry kind="src" path="build/src/simple1.oe630.nt/src/java"/>
-	<classpathentry kind="src" path="build/src/simple1.emx.nt/src/java"/>
-	<classpathentry kind="src" path="build/src/multipleInheritance.emx.nt"/>
-	<classpathentry kind="src" path="build/src/simple1.mdzip.nt"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="lib" path="lib/junit-4.1.jar"/>
-	<classpathentry kind="output" path="bin-eclipse"/>
-</classpath>

data/test/.project

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>ontomde-java-test</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>

data/test/.settings/org.eclipse.jdt.core.prefs

@@ -1,23 +0,0 @@
-#Thu Sep 20 19:14:02 CEST 2007
-eclipse.preferences.version=1
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.builder.invalidClasspath=abort
-org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch,*.svn
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.incompleteClasspath=warning

data/test/Rakefile

@@ -1,71 +0,0 @@
-#require '-uml2_java'
-
-desc "generate & compile"
-task :default => [ :generate , :compile ]
-
-desc "compile all"
-task :compile
-
-desc "generate all"
-task :generate
-
-FileList[ "model/*.nt","model/*.ea.xmi" ].each { |modelFileFull|
-  modelfile=modelFileFull[6,modelFileFull.length]
-
-  desc "generate #{modelfile}"
-  task :"#{modelfile}" => [:"generate_#{modelfile}" ] 
-  task :"#{modelfile}" => [:"compile_#{modelfile}", ] 
-
-  task :generate => [ :"generate_#{modelfile}"]
-  task :compile => [ :"compile_#{modelfile}"]
-  
-  
-  desc "generate #{modelfile}"
-  task :"generate_#{modelfile}" do
-    build="build/src/#{modelfile}/"
-
-    FileList["#{build}/**/*.java"].each { |f|
-      File.delete(f)
-    }
-    FileUtils.mkdir_p("build/src")
-
-    ret=system("ontomde-java.bat",
-		"--verbose",
-		"--relational_mapping","none",
-		"--withEnumAsString",
-		"--withGenerateMethodForm",
-		"--withAutoImplementProperty",
-		"--withAutoImplementOperation",
-		"--load","load1.rb" ,
-		"--load","load2.rb" ,
-		"--nt","model/#{modelfile}",
-		"--targetDir",build)
-	puts "return code=#{ret}"
-	raise "Generation error detected" unless ret
-  end
-  
-  desc "compile #{modelfile}"
-  task :"compile_#{modelfile}" do
-    Msg=Array.new
-    build="build/src/#{modelfile}/"
-    target="build/classes/#{modelfile}/"
-    FileList["#{build}/**/*.class"].each { |f|
-      File.delete(f)
-    }
-    FileUtils.mkdir_p("build/classes")
-    FileUtils.mkdir_p(target) 
-    puts "before ant -Dmodel=#{modelfile} compile"
-    raise "*** ERROR *** " unless system("ant.bat","-Dmodel=#{modelfile}","compile")
-    puts "after ant"
-    nc=FileList["#{target}**/*.class"].length
-    Msg << "#{modelfile}: nbr class file=#{nc}\n"
-    
-    if ! File.exist?("#{target}/tests.class")
-      puts "#{modelfile}:  Test KO: #{modelfile}\n"
-    end
-
-    puts  Msg
-    raise "*** ERROR *** " unless system("ant.bat","-Dmodel=#{modelfile}","run")
-  end
-}
-

data/test/build.xml

@@ -1,34 +0,0 @@
-<project name="demo" default="all">
-
-   	<!-- <property name="model" value="simple1.emx.nt"/> -->
-
-	<target name="all" depends="compile,run"/>
-
-	<target name="compile">
-		<mkdir dir="build/classes/${model}"/>
-		<javac  destdir="build/classes/${model}" debug="true">
-			<src path="build/src/${model}/"/>
-			<src path="src/"/>
-			<include name="**/*.java" />
-			<classpath>
-				<fileset dir="lib" includes="**/*.jar"/>
-			</classpath>
-		</javac>
-	</target>
-	
-	<target name="run">
-		<junit printsummary="yes" fork="yes" haltonfailure="no">
-			<formatter type="plain"/>
-			<test name="RuntimeTest"/>
-			<classpath>
-				<fileset dir="lib" includes="**/*.jar"/>
-				<pathelement location="build/classes/${model}"/>
-			</classpath>
-		</junit>
-	</target>
-
-	
-	<target name="clean">
-	</target>
-
-</project>

data/test/classpath.rb

@@ -1,15 +0,0 @@
-require 'nonRuby_hibernate_annotations'
-require 'nonRuby_junit'
-require 'rake'
-
-Dir.mkdir("lib") unless File.exist?("lib")
-
-h=NonRuby::Home[:hibernate_annotations]
-cp("#{h}/hibernate-annotations.jar","lib")
-cp("#{h}/lib/ejb3-persistence.jar","lib")
-
-h=NonRuby::Home[:junit]
-cp("#{h}/junit-4.1.jar","lib")
-
-#NonRuby::copy(:hibernate_annotations,"hibernate-annotations.jar","lib")
-#NonRuby::copy(:hibernate_annotations,"lib/ejb3-persistence.jar","lib")

data/test/load1.rb

@@ -1,3 +0,0 @@
-#load 1
-LOAD1=Hash.new
-

data/test/load2.rb

@@ -1,3 +0,0 @@
-
-# will break if load1 was not called before
-LOAD1["ok"]=true

data/test/log4j.properties

@@ -1,46 +0,0 @@
-### direct log messages to stdout ###
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.Target=System.out
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n
-
-### direct messages to file hibernate.log ###
-#log4j.appender.file=org.apache.log4j.FileAppender
-#log4j.appender.file.File=hibernate.log
-#log4j.appender.file.layout=org.apache.log4j.PatternLayout
-#log4j.appender.file.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n
-
-### set log levels - for more verbose logging change 'info' to 'debug' ###
-
-log4j.rootLogger=warn, stdout
-#log4j.rootLogger=debug, stdout
-
-log4j.logger.org.hibernate=info
-#log4j.logger.org.hibernate=debug
-
-
-### log just the SQL
-log4j.logger.org.hibernate.SQL=debug
-
-#log4j.logger.org.hibernate.engine.CascadingAction=debug
-
-### log JDBC bind parameters ###
-#log4j.logger.org.hibernate.type=debug
-
-### log schema export/update ###
-log4j.logger.org.hibernate.tool.hbm2ddl=debug
-
-### log cache activity ###
-#log4j.logger.org.hibernate.cache=debug
-
-### enable the following line if you want to track down connection ###
-### leakages when using DriverManagerConnectionProvider ###
-#log4j.logger.org.hibernate.connection.DriverManagerConnectionProvider=trace
-
-### annotation logs
-#log4j.logger.org.hibernate.annotation=info
-#log4j.logger.org.hibernate.cfg=info
-#log4j.logger.org.hibernate.cfg.SettingsFactory=info
-#log4j.logger.org.hibernate.cfg.AnnotationBinder=info
-#log4j.logger.org.hibernate.cfg.AnnotationConfiguration=info
-#log4j.logger.org.hibernate.cfg.Ejb3Column=info

data/test/model/.project

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>uml2_java_test</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-	</buildSpec>
-	<natures>
-	</natures>
-</projectDescription>