ontomde-java-frontend 1.0.4 → 1.0.6

data/Rakefile

@@ -1,17 +1,10 @@
 # -*- ruby -*-
 
 require 'rubygems'
-require 'hoe'
+require 'ontomde-hoe'
 require './lib/ontomde-java-frontend/version.rb'
 
-FileList["demo/*"].each { |filename| 
-	puts "filename=#{filename}"
-	File.open("#{filename}/.ontomde","w") { |f|
-		f.write("ontomde_version=_#{Ontomde::Java::Frontend::VERSION}_")
-	}
-}
-
-Hoe.new('ontomde-java-frontend', Ontomde::Java::Frontend::VERSION) do |p|
+OntomdeHoe.new('ontomde-java-frontend', Ontomde::Java::Frontend::VERSION) do |p|
   p.rubyforge_name = 'ontomde'
   p.author = 'Stephane (Pierre) Carrie'
   p.email = 'stephanepierre.carrie@orange-ftgroup.com'
@@ -26,6 +19,7 @@ Hoe.new('ontomde-java-frontend', Ontomde::Java::Frontend::VERSION) do |p|
 	[ 'ontomde-uml2-java',"= #{Ontomde::Java::Frontend::VERSION}"],
 	[ 'ontomde-uml2-jpa',"= #{Ontomde::Java::Frontend::VERSION}"],
 	[ 'ontomde-uml2-struts',"= #{Ontomde::Java::Frontend::VERSION}"],
+        [ 'ontomde-uml2-crank',"= #{Ontomde::Java::Frontend::VERSION}"],
 	[ 'ontomde-uml2-kb',"= #{Ontomde::Java::Frontend::VERSION}"],
 	[ 'ontomde-uml2-kbjava',"= #{Ontomde::Java::Frontend::VERSION}"],
 	[ 'ontomde-uml2-apaCom',"= #{Ontomde::Java::Frontend::VERSION}"],

data/lib/ontomde-java-frontend/command.rb

@@ -22,7 +22,7 @@ DB_TYPE_DISCRIMINATOR=%w[:default,:int]
 DB_TYPE_DISCRIMINATOR_ALIASES={"int"=>:int,"default"=>:default}
 
 module Kernel
-  DEPS= ['ontomde-uml2-jpdl', 'ontomde-uml2-struts', 'ontomde-uml2-ejb2', 'ontomde-uml2-jdo', 'ontomde-uml2-jpa', 'ontomde-uml2-kb', 'ontomde-uml2-kbjava','ontomde-uml2-flex','ontomde-inspector']
+  DEPS= ['ontomde-uml2-jpdl', 'ontomde-uml2-struts', 'ontomde-uml2-ejb2', 'ontomde-uml2-jdo', 'ontomde-uml2-jpa', 'ontomde-uml2-kb', 'ontomde-uml2-kbjava','ontomde-uml2-flex','ontomde-inspector', 'ontomde-uml2-crank']
   def require_deps(f)
     # make sure DEPS lists every libs
     if !DEPS.include?(f)
@@ -45,11 +45,25 @@ module Kernel
   end
 end
 
+#Rubygems allow a specific script version to be passed on command line.
+#Version is passed as a first parameter like : _1.0.1_
+#
+#For testing purposes, this script may be called directly (not through gem).
+#We have to remove the version number which was not removed by gem. 
+def  removeVersionInARGV  
+	return if ARGV.empty?
+	return unless ARGV[0]=~/^_[.0-9]*_$/
+	puts "** WARNING: command line parameter #{ARGV[0]} ignored.\n"
+	ARGV.delete_at(0)
+end
+
 # run java generator command line front end
 # startupFile is the name of the calling script.
 def runJavaFrontEnd(startupFile)
   puts "Starting ontomde v. #{Ontomde::Java::Frontend::VERSION}"
 
+  removeVersionInARGV() 
+
   h3="## "
   options = {}
   options[:testRelativeDir]="src/test/java"
@@ -59,6 +73,7 @@ def runJavaFrontEnd(startupFile)
   options[:verbose]=false
   options[:targetDir]="."
   options[:javaRelativeDir]="./src/java/"
+  options[:flexRelativeDir]="webapp/src/main/flex/"
   options[:webResourcesDir]=options[:javaRelativeDir]
   options[:flex]=false
   options[:mysql]=false
@@ -78,6 +93,7 @@ def runJavaFrontEnd(startupFile)
   options[:useUnzip]=false
   options[:messageCheck]=true
   options[:struts]=false
+  options[:crank]=false 
   options[:ejb2]=false
   options[:security]=false
   options[:javadoc]=true
@@ -321,6 +337,11 @@ ENDHELP
       # if bpm is set, J2EE is mandatory (spring use is deactivated)
       options[:struts_useSpring]=!v
     end
+    
+    opts.on("--[no-]crank","Enable crank generation.","default: --#{options[:crank]?'':'no-'}crank") do |v|
+      options[:crank] = v
+      options[:java_addJavaEnumInterface]=true
+    end
 
     #    opts.on("--ntBPM FILE1.nt,FILE2.nt, ...",Array,"Source BPM model(s) (exported from a BPM modeling tool in nt format)","default: --ntBPM #{options[:ntBPM]}") do |v|
     #      options[:ntBPM].concat(v)
@@ -613,6 +634,10 @@ ENDHELP
       options[:useUnzip]=false
     end
 
+    if options[:crank] #||options[:useUnzip] || options[:messageCheck] 
+      require_deps 'ontomde-uml2-crank'
+    end
+
     if options[:testDataRDFS].nil? && options[:testDataRDF]=~/\.rdf$/
       #guess rdfs file name
       options[:testDataRDFS]=options[:testDataRDF].gsub(/\.rdf$/,'.rdfs')
@@ -645,6 +670,8 @@ ENDHELP
     end
     options[:db]=(options[:rel_mapping] != "none")
     options[:javaDir]=options[:targetDir]+"/"+options[:javaRelativeDir]
+    options[:flexDir]=options[:targetDir]+"/"+options[:flexRelativeDir]
+
     if !options[:jpaConfigDir].nil?
       options[:jpaConfigDir]=options[:targetDir]+"/"+options[:jpaConfigDir]
     end
@@ -710,6 +737,7 @@ ENDHELP
         step_transform40(model)
         step_generate_java(model)
         step_generate_struts(model)
+        step_generate_crank(model)
         step_generate_misc(model)
         step_generate_flex(model)
       end
@@ -850,6 +878,10 @@ def step_transform30(model)
   model.struts_getExceptionHandlerClass if model.context[:struts]
   model.uml_addVersionSignature
 
+  if model.context[:crank]
+    model.crank_generate_context
+    model.crank_generate_validation
+  end
   model.umlx_populateSecuredMethodEnumeration if model.context[:security]
 end
 def step_transform40(model)
@@ -913,8 +945,22 @@ end
 def step_generate_flex(model)
   return unless model.context[:flex]
   say "processing flex"
-  model.flex_generateVO
-  model.flex_generateMXML
-  model.flex_generateImportationAS
+  model.mtk_context(:javaDir => "#{model.context[:flexDir]}/src/", :javaFilePathRegexp => nil) {
+	  model.flex_generateVO
+	  model.flex_generateMXML
+  }
+  model.mtk_context(:javaDir => "#{model.context[:flexDir]}/script/", :javaFilePathRegexp => nil) {
+	  model.flex_generateImportationAS
+  }
+end
+
+def step_generate_crank(model)
+  return if model.context[:excludeNonTestFiles]
+  if(model.context[:crank])
+    model.crank_generate_facesconfig
+    model.crank_generate_facelets
+    model.crank_generate_home
+    
+  end
 end
 

data/lib/ontomde-java-frontend/command.rdoc

@@ -187,6 +187,10 @@ ontomde-java is a command line utility to generate Java Code from a UML2 model s
  
 
 <i>default:</i> --no-bpm
+ --[no-]crank Enable crank generation.
+ 
+
+<i>default:</i> --no-crank
 ===-jpdl FILE1.nt,FILE2.nt, ... :
 
  Source jpdl xml BPM model(s)

data/lib/ontomde-java-frontend/version.rb

@@ -1,7 +1,7 @@
 module Ontomde
   module Java
     module Frontend
-      VERSION = '1.0.4'
+      VERSION = '1.0.6'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ontomde-java-frontend
 version: !ruby/object:Gem::Version 
-  version: 1.0.4
+  version: 1.0.6
 platform: ruby
 authors: 
 - Stephane (Pierre) Carrie
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-03-03 00:00:00 +01:00
+date: 2008-03-25 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -19,7 +19,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.0.4
+        version: 1.0.6
     version: 
 - !ruby/object:Gem::Dependency 
   name: ontomde-uml2
@@ -28,7 +28,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.0.4
+        version: 1.0.6
     version: 
 - !ruby/object:Gem::Dependency 
   name: ontomde-uml2-java
@@ -37,7 +37,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.0.4
+        version: 1.0.6
     version: 
 - !ruby/object:Gem::Dependency 
   name: ontomde-uml2-jpa
@@ -46,7 +46,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.0.4
+        version: 1.0.6
     version: 
 - !ruby/object:Gem::Dependency 
   name: ontomde-uml2-struts
@@ -55,70 +55,70 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.0.4
+        version: 1.0.6
     version: 
 - !ruby/object:Gem::Dependency 
-  name: ontomde-uml2-kb
+  name: ontomde-uml2-crank
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.0.4
+        version: 1.0.6
     version: 
 - !ruby/object:Gem::Dependency 
-  name: ontomde-uml2-kbjava
+  name: ontomde-uml2-kb
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.0.4
+        version: 1.0.6
     version: 
 - !ruby/object:Gem::Dependency 
-  name: ontomde-uml2-apaCom
+  name: ontomde-uml2-kbjava
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.0.4
+        version: 1.0.6
     version: 
 - !ruby/object:Gem::Dependency 
-  name: ontomde-uml2-ejb2
+  name: ontomde-uml2-apaCom
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.0.4
+        version: 1.0.6
     version: 
 - !ruby/object:Gem::Dependency 
-  name: ontomde-uml2-jpdl
+  name: ontomde-uml2-ejb2
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.0.4
+        version: 1.0.6
     version: 
 - !ruby/object:Gem::Dependency 
-  name: ontomde-uml2-flex
+  name: ontomde-uml2-jpdl
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.0.4
+        version: 1.0.6
     version: 
 - !ruby/object:Gem::Dependency 
-  name: hoe
+  name: ontomde-uml2-flex
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        version: 1.5.0
+        version: 1.0.6
     version: 
 description: "This includes  * advanced UML2 to java generator (release) * JPA  (release) * struts (beta)  * jBPM integration * FLEX integration (beta) * junit and tests data  == SYNOPSIS:  $ ontomde-java --help  == INSTALL:"
 email: stephanepierre.carrie@orange-ftgroup.com