ontomde-uml2-jpa 1.0.4 → 1.0.6

data/Rakefile

@@ -1,10 +1,10 @@
 # -*- ruby -*-
 
 require 'rubygems'
-require 'hoe'
+require 'ontomde-hoe'
 require './lib/ontomde-uml2-jpa/version.rb'
 
-Hoe.new('ontomde-uml2-jpa', Ontomde::Uml2::Jpa::VERSION) do |p|
+OntomdeHoe.new('ontomde-uml2-jpa', Ontomde::Uml2::Jpa::VERSION) do |p|
   p.rubyforge_name = 'ontomde'
   p.author = 'Stephane (Pierre) Carrie'
   p.email = 'stephanepierre.carrie@orange-ftgroup.com'

data/lib/ontomde-uml2-jpa/jpa.rb

@@ -189,7 +189,7 @@ module Mrdf_Model
 
   def db_saveDB_DISCRIMINATOR
     return unless context[:dbTypeDiscriminator]==:int
-    mtk_writeSession("#{context[:targetDir]}/#{context[:dbDiscriminatorCacheRelFile]}") {
+    mtk_writeSession("#{context[:dbDiscriminatorCacheRelFile]}") {
       write <<END
 # saved discriminator numbers
 # This file is read and rewritten by generator
@@ -434,6 +434,7 @@ END
 
 end
 module Muml_Classifier
+
   def jpa_addPersistenceId!
     #return unless uml_generalization.empty?
     return unless context[:db_useOptimisticLocking,true]
@@ -450,6 +451,10 @@ module Muml_Classifier
     gettter = p.java_AttributeGlobalGetter
     #removed ? : operator to make checkstyle happy.
     gettter[0].java_code = %{if(#{p.java_Name} == null) { return Long.valueOf(0);} else {return #{p.java_Name};}}
+    
+    stereo = umlx_package.umlx_createAndAddStereotype(rdf_uri+"Equals", "EqualsValue")
+    p.uml_appliedStereotype = stereo
+    
   end
 end
 module Muml_Property

data/lib/ontomde-uml2-jpa/mapping.rb

@@ -39,6 +39,13 @@ module Muml_Property
   def jpa_isPersistent?
     return true
   end
+  def jpa_addRelationCascadeType(isIncludeType=true)
+    if (isIncludeType)
+      return DEFAULT_CASCADE_I
+    else
+      return DEFAULT_CASCADE
+    end     
+  end
   def jpa_addPersistenceUnidirOneToOne!(ah)
     #TODO: unicity constraint
     ah.java_annotation_add("@OneToOne(cascade=CascadeType.ALL) /*TPL: 101*/")
@@ -46,28 +53,28 @@ module Muml_Property
   end
 
   def jpa_addPersistenceUnidirOneToMany!(ah)
-    ah.java_annotation_add(%{@OneToMany(cascade=CascadeType.ALL,fetch=FetchType.EAGER) /*TPL:102*/})
+    ah.java_annotation_add(%{@OneToMany(fetch=FetchType.EAGER #{jpa_addRelationCascadeType(true)}) /*TPL:102*/})
     jpa_addJoinTable(ah)
   end
   DEFAULT_CASCADE="(cascade=CascadeType.ALL)"
   DEFAULT_CASCADE_I=",cascade=CascadeType.ALL"
   def jpa_addPersistenceUnidirManyToOne!(ah)
-    ah.java_annotation_add("@ManyToOne #{DEFAULT_CASCADE} /*TPL:104*/")
+    ah.java_annotation_add("@ManyToOne #{jpa_addRelationCascadeType(false)} /*TPL:104*/")
     jpa_addJoinColumn!(ah)
   end
 
   def jpa_addPersistenceUnidirManyToMany!(ah)
-    ah.java_annotation_add("@ManyToMany #{DEFAULT_CASCADE} /*TPL:105*/")
+    ah.java_annotation_add("@ManyToMany #{jpa_addRelationCascadeType(false)} /*TPL:105*/")
     jpa_addJoinTable(ah)
     jpa_addJoinColumn!(ah)
   end
   def jpa_addPersistenceBidirManyToManyMaster!(ah)
-    ah.java_annotation_add("@ManyToMany #{DEFAULT_CASCADE}/*TPL:106*/")
+    ah.java_annotation_add("@ManyToMany #{jpa_addRelationCascadeType(false)}/*TPL:106*/")
     jpa_addJoinColumn!(ah)
     jpa_addJoinTable(ah)
   end
   def jpa_addPersistenceBidirManyToManySlave!(ah)
-    ah.java_annotation_add("@ManyToMany #{DEFAULT_CASCADE}/*TPL:107*/")
+    ah.java_annotation_add("@ManyToMany #{jpa_addRelationCascadeType(false)}/*TPL:107*/")
     jpa_addJoinColumn!(ah)
     #Do not add join column !
     #(or you will get 2 join tables)
@@ -75,30 +82,30 @@ module Muml_Property
   end
 
   def jpa_addPersistenceBidirOneToOneMaster!(ah)
-    ah.java_annotation_add(%{@OneToOne #{DEFAULT_CASCADE}/*TPL:108*/})
+    ah.java_annotation_add(%{@OneToOne #{jpa_addRelationCascadeType(false)}/*TPL:108*/})
     jpa_addJoinColumn!(ah)
   end
   def jpa_addPersistenceBidirOneToOneSlave!(ah)
-    ah.java_annotation_add(%{@OneToOne(mappedBy="#{umlx_otherEnd.java_NameProperty}" #{DEFAULT_CASCADE_I}) /*TPL:109*/})
+    ah.java_annotation_add(%{@OneToOne(mappedBy="#{umlx_otherEnd.java_NameProperty}" #{jpa_addRelationCascadeType}) /*TPL:109*/})
   end
 
   def jpa_addPersistenceBidirOneToManyMaster!(ah)
-    ah.java_annotation_add(%{@OneToMany (mappedBy="#{umlx_otherEnd.java_NameProperty}"#{DEFAULT_CASCADE_I}) /*TPL:110*/})
+    ah.java_annotation_add(%{@OneToMany (mappedBy="#{umlx_otherEnd.java_NameProperty}"#{jpa_addRelationCascadeType}) /*TPL:110*/})
   end
   def jpa_addPersistenceBidirOneToManySlave!(ah)
-    ah.java_annotation_add(%{@OneToMany (mappedBy="#{umlx_otherEnd.java_NameProperty}"#{DEFAULT_CASCADE_I}) /*TPL:111*/})
+    ah.java_annotation_add(%{@OneToMany (mappedBy="#{umlx_otherEnd.java_NameProperty}"#{jpa_addRelationCascadeType}) /*TPL:111*/})
     #jpa_addJoinColumn!(ah)
   end
 
   def jpa_addPersistenceBidirManyToOneMaster!(ah)
     #ah.java_annotation_add(%{@ManyToOne(mappedBy="#{umlx_otherEnd.java_NameProperty}") /*TPL:112*/})
-    ah.java_annotation_add(%{@ManyToOne #{DEFAULT_CASCADE} /*TPL:112*/})
+    ah.java_annotation_add(%{@ManyToOne #{jpa_addRelationCascadeType(false)} /*TPL:112*/})
     #ah.java_annotation_add(%{@JoinColumn(name="#{java_NameProperty}_fk"})
     jpa_addJoinColumn!(ah)
   end
   def jpa_addPersistenceBidirManyToOneSlave!(ah)
     #ah.java_annotation_add(%{@ManyToOne(mappedBy="#{umlx_otherEnd.java_NameProperty}") /*TPL:113*/})
-    ah.java_annotation_add(%{@ManyToOne #{DEFAULT_CASCADE} /*TPL:113*/})
+    ah.java_annotation_add(%{@ManyToOne #{jpa_addRelationCascadeType(false)} /*TPL:113*/})
     #ah.java_annotation_add(%{@JoinColumn(name="#{java_NameProperty}_fk"})
     jpa_addJoinColumn!(ah)
   end

data/lib/ontomde-uml2-jpa/version.rb

@@ -1,7 +1,7 @@
 module Ontomde
   module Uml2
     module Jpa
-      VERSION = '1.0.4'
+      VERSION = '1.0.6'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ontomde-uml2-jpa
 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,16 +19,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.0.4
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: hoe
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.5.0
+        version: 1.0.6
     version: 
 description: "JPA annotation generator library.  Most users will used this library trough ontomde-java-frontend command line utility options.  == FEATURES/PROBLEMS:  == SYNOPSIS:  == REQUIREMENTS:"
 email: stephanepierre.carrie@orange-ftgroup.com