ontomde-java 2.0.0 → 2.0.4

data/lib/ontomde-java/java/tenant.rb

@@ -51,6 +51,7 @@ end
 
 module Muml_Classifier
   TENANT_FIELD_NAME="tenantOwner"
+  TENANT_FIELD_BEAN_NAME="TenantOwner"
   def java_addTenantField!(tenantClass=nil)
     return unless context[:multiTenant]
     tenantClass=rdf_Repository.java_getTenantClass if tenantClass.nil?

data/lib/ontomde-java/java/xsd.rb

@@ -364,7 +364,7 @@ non unique name detected
 ********* INVALID DATA DETECTED **********
 END
     }
-    if context[:xsd_failIfNonUniqueName]
+    if context[:xsd_failIfNonUniqueName,true]
       raise Warning.new(),"unique name assertion failed"
     end
 

data/lib/ontomde-java/jpa/configuration.rb

@@ -1,5 +1,24 @@
 module Mrdf_Repository
 
+
+  def jpa_generateSpringConfigDerby
+
+      mtk_writeSession("#{context[:webResourcesDir]}/contextConfigDerby.properties") {
+	  write <<END
+	 
+#This file will hold environnement properties that are needed in the application.
+
+jpa.dialect=org.springframework.orm.jpa.vendor.HibernateJpaDialect
+persistence.unit.name=persistence-unit-test
+database.platform=org.hibernate.dialect.DerbyDialect
+driverClassName=org.apache.derby.jdbc.EmbeddedDriver
+url=jdbc:derby:#{context[:dbSchemaName,'testschema-derby']};create=true
+username=root
+password=root
+END
+	}
+  end
+
   #Generates persistence configuration file
   def db_generateConfiguration
     jpa_generateConfiguration
@@ -8,8 +27,9 @@ module Mrdf_Repository
   #Generates hibernate configuration file
   def jpa_generateConfiguration
     if context[:struts_useSpring]
-      mtk_writeSession("#{context[:jpaConfigDir,context[:javaDir]]}/META-INF/persistence.xml") {
+      mtk_writeSession("#{context[:jpaConfigDir]}/META-INF/persistence.xml") {
         jpa_writeConfigurationForSpring
+        jpa_generateSpringConfigDerby
       }
     else
       # empty
@@ -148,8 +168,12 @@ module Mrdf_Repository
   #writes jpa configuration list of persistent class
   def jpa_writeConfigurationPersistentClasses
     write %{<!-- begin Persistent classes declaration -->\n}
+    s=Set.new
     uml_Class_all.each {|c|
       next unless c.kind_of?(Muml_Class) && c.umlx_isReallyAClass?
+      s.add(c)
+    }
+    s.sort { |a,b| a.java_qualifiedName.to_s <=>b.java_qualifiedName.to_s }.each { |c|
       c.jpa_writeConfiguration
     }
     #TODO: remove hack

data/lib/ontomde-java/jpa/finder.rb

@@ -1,9 +1,19 @@
 module Muml_Class
+	
+
+  JPA_PAGINATION_QUERY=<<END
+  if(pageSize>0) {
+	  q.setFirstResult(pageNumber*pageSize);
+	  q.setMaxResults(pageSize);
+    }
+END
+  
   #adds a finder to eao
   #self is supposed to be the bean and eao the "dao".
   def jpa_addFindAll!(eao)
+    [false,true].each { |paginated|
     # java_NameBean is added to avoid name clash with inheritance
-    m=eao.umlx_createAndAddOperation(rdf_uri+"_findAll","findAll")#+self.java_NameBean)
+    m=eao.umlx_createAndAddOperation(rdf_uri+"_findAll"+(paginated ? '_pag':''),"findAll")#+self.java_NameBean)
     m.uml_isStatic=RDF_TRUE
     #m.uml_class=self
     m.uml_visibility=Cuml_VisibilityKind::Public
@@ -24,25 +34,25 @@ module Muml_Class
 
     #m.java_code="return  (#{self.java_qualifiedName})entityManager.find( #{self.java_qualifiedName}.class, #{ip.uml_name});"
 
+    if !context[:crank] 
     basicQuery=<<END
-  javax.persistence.Query q=getEntityManager().createQuery( "select Object(c) from  #{java_Name} as c");
-  return (java.util.List<#{self.java_qualifiedName}>) q.getResultList();
+		javax.persistence.Query q=getEntityManager().createQuery( "select Object(c) from  #{java_Name} as c");
+		#{JPA_PAGINATION_QUERY if paginated} 
+		return (java.util.List<#{self.java_qualifiedName}>) q.getResultList();
 END
-
-    
     if !context[:multiTenant]
       m.java_code=basicQuery
     else
-      
       ip=m.umlx_createAndAddParameter(m.rdf_uri+"_tenant","tenant")
       ip.uml_type=rdf_Repository.java_getTenantClass
       ip.umlx_createAndAddComment(ip.rdf_uri+"comment","Restrict query to this tenant")
             
       m.java_code=<<END
 if(#{ip.java_Name}!=null) {
-  javax.persistence.Query q=getEntityManager().createQuery( "select Object(c) from  #{java_Name} as c  where c.#{TENANT_FIELD_NAME}= :tenantQP");
-  q.setParameter("tenantQP",#{ip.java_Name});
-  return (java.util.List<#{self.java_qualifiedName}>) q.getResultList();
+		javax.persistence.Query q=getEntityManager().createQuery( "select Object(c) from  #{java_Name} as c  where c.#{TENANT_FIELD_NAME}= :tenantQP");
+		q.setParameter("tenantQP",#{ip.java_Name});
+		#{JPA_PAGINATION_QUERY if paginated} 
+		return (java.util.List<#{self.java_qualifiedName}>) q.getResultList();
 } else {
 //TODO: disable in production code
   System.out.println("DEBUG MODE");
@@ -50,10 +60,22 @@ if(#{ip.java_Name}!=null) {
 }
 
 END
-      
+
+    end
+
+    else
+      paginatedParams=""
+      if paginated
+        paginatedParams="pageNumber * pageSize, pageSize"
+      end
+    basicQuery=<<END
+		return get#{self.java_Name}DAO().find(#{paginatedParams});
+END
+      m.java_code=basicQuery
     end
     
 
+    
     m.java_annotation_add(%{@SuppressWarnings("unchecked")})
 
     # because A<-B is not Set<A> <- Set<B>
@@ -65,8 +87,17 @@ END
       t=m.umlx_createAndAddParameter(m.rdf_uri+"_class","nullCast")
       t.uml_type=self
     end
-    
-    return m
+
+    if paginated
+	    pageN=m.umlx_createAndAddParameter(m.rdf_uri+"_pageN","pageNumber")
+	    pageN.uml_type=umlx_dataType_integer
+
+	    pageS=m.umlx_createAndAddParameter(m.rdf_uri+"_pageS","pageSize")
+	    pageS.uml_type=umlx_dataType_integer
+	    pageS.umlx_createAndAddComment(pageS.rdf_uri+"comment","use -1 to retreive all results ")
+    end
+   } 
+    return nil # m
   end
   def jpa_addFindByPrimaryKey!(eao)
     m=eao.umlx_createAndAddOperation(rdf_uri+"_finderop","find")
@@ -95,7 +126,11 @@ END
     rp.uml_type=self
     #rp.uml_isOrdered=RDF_FALSE
 
-    m.java_code="return  (#{self.java_qualifiedName})getEntityManager().find( #{self.java_qualifiedName}.class, #{ip.uml_name});"
+    if !context[:crank]     
+      m.java_code="\t\treturn (#{self.java_qualifiedName})getEntityManager().find( #{self.java_qualifiedName}.class, #{ip.uml_name});"
+    else
+      m.java_code="\t\treturn get#{self.java_Name}DAO().read(#{ip.uml_name});"
+    end
 
     return m
   end

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

@@ -12,7 +12,8 @@ module DB
   EntityManager="javax.persistence.EntityManager"
   EntityManagerFactory="javax.persistence.EntityManagerFactory"
   EntityGenericInterface="xmda.jpa.XmdaEntity"
-  EntityInterface="#{EntityGenericInterface}<Long>"
+#  EntityInterface="#{EntityGenericInterface}<Long>"
+  EntityGenericParameter="Long"
 end
 
 
@@ -118,17 +119,15 @@ module DAO
     return if db_isDAO?
     return if java_ignoreMe?
 
+
     if !context[:db_autonomousDAO,false]
       self.java_DAOClass=self
       self.java_persistentClass=self
     else
-
-      #log.debug { "adding dao for #{self}" }
+      
+      log.debug { "adding dao for #{self}" }
       p=umlx_package
 
-
-
-
       #p=self
       p=p.umlx_getOrCreatePackage(context[:dbDAOsubPackage,"dao"],p)
       c=p.umlx_createAndAddClass(rdf_uri+"_dao")
@@ -141,7 +140,7 @@ module DAO
       #log.debug { "DAO added: #{c.uml_name} in #{c.umlx_package.uml_name}"}
       java_DAOClass_one.jpa_addEntityManager!()
       java_DAOClass_one.jpa_addStdImports!
-      #jpa_addGetDao!()
+#      jpa_addGetDao!()
     end
     jpa_addPersist!
     jpa_addMerge!
@@ -218,13 +217,21 @@ END
 def db_disc(k,v)
 	::Muml_Class::DB_DISCRIMINATOR[::Muml_Class::DB_URI_ALIAS[k]]=v
 end
+END
+
+[false,true].each { |exists|
+write(!exists ? "# Saved Element From History\n" : "# Current elements\n")
+
+write <<END
 ::Muml_Class::DB_URI_ALIAS.merge!({
 END
       ::Muml_Class::DB_DISCRIMINATOR.sort{|a,b| a[0]<=>b[0]}.each { |k|
         n=db_findNameUsingDB_URI_ALIAS(k[0])
-        write("  %{#{n}} => %{#{k[0]}} ,\n")
+        write("  %{#{n}} => %{#{k[0]}} ,\n") if self[k[0]].nil?!=exists
       }
       write("})\n")
+}
+
       write <<END
 declarePredefinedDiscrimators();
 #free ressources
@@ -266,6 +273,7 @@ module Muml_Class
     ret.uml_upperValue=umlx_literal(1)
     ret.uml_lowerValue=umlx_literal(0)
     ret.uml_type=umlx_getOrCreateClass(DB::EntityManager)
+    
     gem.java_code="return #{DB_Context}.getEntityManager();"
 
   end
@@ -362,12 +370,14 @@ END
 
   DB_URI_ALIAS=Hash.new
   DB_DISCRIMINATOR=Hash.new
+  
+  def doOnJPAAddPersistence!
+    
+  end
   def jpa_addPersistence!
-    #jpa_addDAO!
-
+    #jpa_addDAO!    
     #Ajout l'interface XmdaEntity
-    ent=umlx_getOrCreateInterface(DB::EntityInterface)
-    ent.java_isGeneric=RDF_TRUE
+    ent=umlx_getOrCreateGeneric(DB::EntityGenericInterface,DB::EntityGenericParameter)
     umlx_createAndAddImplementation(ent)
 
     jpa_addEntityManager! # required for query, persist,...
@@ -401,6 +411,8 @@ END
       java_import_add("javax.persistence.DiscriminatorValue")
     end
     jpa_addStdImports!
+    
+    doOnJPAAddPersistence!()
   end
 
   def jpa_addStdImports!
@@ -451,7 +463,11 @@ module Muml_Classifier
     return unless self.umlx_hasStereotype?('DTO')
     
     puts "DTO Found : #{java_Name}"
-
+    
+    self.java_import_add("java.io.Serializable")
+    io=umlx_getOrCreateClass("java.io.Serializable")
+    self.umlx_createAndAddImplementation(io)
+    
     # Add a method to<UML_Name> to the main class linked to the DTO by a dependency
     self.uml_clientDependency.each{|dep|
       next unless dep.kind_of?(Cuml_Dependency)
@@ -493,7 +509,7 @@ CODE
     #TODO Surcharge le getter : A enlever une fois avoir corrig� incompatibilit� avec couche Struts
     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};}}
+    gettter[0].java_code = %{\t\treturn xmda.crud.Helper.longObjZeroForNull (#{p.java_Name});}
     
     stereo = umlx_package.umlx_createAndAddStereotype(rdf_uri+"Equals", "EqualsValue")
     p.uml_appliedStereotype = stereo

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

@@ -1,6 +1,26 @@
 #
 #
+module Muml_NamedElement
+	# jpa/hibernates breaks at runtime if a name 
+	# begining with an underscore (_) is encountered.
+	# We prepend jpa when a name starts with underscore.
+	def jpa_Name
+		n=java_Name.to_s.upcase
+		ret=n[0,1]=='_' ? 'JPA'+n : n
+		return ret
+	end
+	
+	#add name annotation when name
+	#is different from default.
+	def jpa_addNameAnnotation
+		d=jpa_Name.to_s.upcase
+		j=java_Name.to_s.upcase
+		return d==j ? nil : %{ name = "#{d}"}
+	end
 
+
+
+end
 module Muml_Operation
   #true  puts annotation on getter
   #false puts annotation on attribute
@@ -11,8 +31,8 @@ module Muml_Operation
     # java_AttributeGlobalSetter
     # java_getter_property
     if java_getter_property.empty?
-      return if(umlx_hasStereotype?("Create"))
-      #java_annotation_add("@Transient")
+      return if(umlx_hasStereotype?('Create'))
+      #java_annotation_add('@Transient')
       return
     end
 
@@ -20,7 +40,7 @@ module Muml_Operation
     return unless p.jpa_isPersistent?
 
     if p.uml_type_one.kind_of?(Cuml_Class) && !p.uml_type_one.jpa_isPersistent?
-      p.java_annotation_add("/* not persistent */")
+      p.java_annotation_add('/* not persistent */')
       return
     end
 
@@ -28,7 +48,7 @@ module Muml_Operation
       p.jpa_addPersistenceTo!(self)
       # HACK
       p.jpa_addPersistenceTo!(p) #TODO: remove
-      #p.java_annotation_add("@Transient")
+      #p.java_annotation_add('@Transient')
     else
       p.jpa_addPersistenceTo!(p)
     end
@@ -39,8 +59,14 @@ module Muml_Property
   def jpa_isPersistent?
     return true
   end
+  
+  def jpa_addFetchType(ah)
+    ah.umlx_owner_one.java_import_add('javax.persistence.FetchType')
+    return "fetch=FetchType.LAZY"
+  end
+  
   def jpa_addRelationCascadeType(isIncludeType=true)
-    umlx_owner_one.java_import_add("javax.persistence.CascadeType")
+    umlx_owner_one.java_import_add('javax.persistence.CascadeType')
     if (isIncludeType)
       return DEFAULT_CASCADE_I
     else
@@ -49,78 +75,77 @@ module Muml_Property
   end
   def jpa_addPersistenceUnidirOneToOne!(ah)
     #TODO: unicity constraint
-    ah.java_annotation_add("@OneToOne(cascade=CascadeType.ALL)")
-    ah.umlx_owner_one.java_import_add("javax.persistence.OneToOne")
-    ah.umlx_owner_one.java_import_add("javax.persistence.CascadeType")
+    ah.java_annotation_add("@OneToOne(#{jpa_addFetchType(ah)}, cascade=CascadeType.ALL)")
+    ah.umlx_owner_one.java_import_add('javax.persistence.OneToOne')
+    ah.umlx_owner_one.java_import_add('javax.persistence.CascadeType')
     #TODO: affiner cascadeType pour les delete
   end
 
   def jpa_addPersistenceUnidirOneToMany!(ah)
-    ah.java_annotation_add(%{@OneToMany(fetch=FetchType.EAGER #{jpa_addRelationCascadeType(true)})})
-    ah.umlx_owner_one.java_import_add("javax.persistence.OneToMany")
-    ah.umlx_owner_one.java_import_add("javax.persistence.FetchType")
+    ah.java_annotation_add(%{@OneToMany(#{jpa_addFetchType(ah)} #{jpa_addRelationCascadeType(true)})})
+    ah.umlx_owner_one.java_import_add('javax.persistence.OneToMany')
     jpa_addJoinTable(ah)
   end
-  DEFAULT_CASCADE="(cascade=CascadeType.ALL)"
-  DEFAULT_CASCADE_I=",cascade=CascadeType.ALL"
+  DEFAULT_CASCADE='(cascade=CascadeType.ALL)'
+  DEFAULT_CASCADE_I=',cascade=CascadeType.ALL'
   def jpa_addPersistenceUnidirManyToOne!(ah)
-    ah.java_annotation_add("@ManyToOne #{jpa_addRelationCascadeType(false)} ")
-    ah.umlx_owner_one.java_import_add("javax.persistence.ManyToOne")
+    ah.java_annotation_add("@ManyToOne(#{jpa_addFetchType(ah)} #{jpa_addRelationCascadeType(true)}) ")
+    ah.umlx_owner_one.java_import_add('javax.persistence.ManyToOne')
     jpa_addJoinColumn!(ah)
   end
 
   def jpa_addPersistenceUnidirManyToMany!(ah)
-    ah.java_annotation_add("@ManyToMany #{jpa_addRelationCascadeType(false)}")
-    ah.umlx_owner_one.java_import_add("javax.persistence.ManyToMany")
+    ah.java_annotation_add("@ManyToMany (#{jpa_addFetchType(ah)} #{jpa_addRelationCascadeType(true)})")
+    ah.umlx_owner_one.java_import_add('javax.persistence.ManyToMany')
     jpa_addJoinTable(ah)
     jpa_addJoinColumn!(ah)
   end
   def jpa_addPersistenceBidirManyToManyMaster!(ah)
-    ah.java_annotation_add("@ManyToMany #{jpa_addRelationCascadeType(false)}")
-    ah.umlx_owner_one.java_import_add("javax.persistence.ManyToMany")
-    jpa_addJoinColumn!(ah)
+    ah.java_annotation_add("@ManyToMany (#{jpa_addFetchType(ah)} #{jpa_addRelationCascadeType(true)})")
+    ah.umlx_owner_one.java_import_add('javax.persistence.ManyToMany')
+    #jpa_addJoinColumn!(ah)
     jpa_addJoinTable(ah)
   end
   def jpa_addPersistenceBidirManyToManySlave!(ah)
-    ah.java_annotation_add("@ManyToMany #{jpa_addRelationCascadeType(false)}")
-    ah.umlx_owner_one.java_import_add("javax.persistence.ManyToMany")
-    jpa_addJoinColumn!(ah)
+    ah.java_annotation_add("@ManyToMany (#{jpa_addFetchType(ah)} #{jpa_addRelationCascadeType(true)}, mappedBy=\"#{umlx_otherEnd.java_NameProperty}\")")
+    ah.umlx_owner_one.java_import_add('javax.persistence.ManyToMany')
+    #jpa_addJoinColumn!(ah)
     #Do not add join column !
     #(or you will get 2 join tables)
     #jpa_addJoinTable(ah)
   end
 
   def jpa_addPersistenceBidirOneToOneMaster!(ah)
-    ah.java_annotation_add(%{@OneToOne #{jpa_addRelationCascadeType(false)}})
-    ah.umlx_owner_one.java_import_add("javax.persistence.OneToOne")
+    ah.java_annotation_add("@OneToOne (#{jpa_addFetchType(ah)} #{jpa_addRelationCascadeType(true)})")
+    ah.umlx_owner_one.java_import_add('javax.persistence.OneToOne')
     jpa_addJoinColumn!(ah)
   end
   def jpa_addPersistenceBidirOneToOneSlave!(ah)
-    ah.java_annotation_add(%{@OneToOne(mappedBy="#{umlx_otherEnd.java_NameProperty}" #{jpa_addRelationCascadeType})})
-    ah.umlx_owner_one.java_import_add("javax.persistence.OneToOne")
+    ah.java_annotation_add(%{@OneToOne(#{jpa_addFetchType(ah)}, mappedBy="#{umlx_otherEnd.java_NameProperty}" #{jpa_addRelationCascadeType})})
+    ah.umlx_owner_one.java_import_add('javax.persistence.OneToOne')
   end
 
   def jpa_addPersistenceBidirOneToManyMaster!(ah)
-    ah.java_annotation_add(%{@OneToMany (mappedBy="#{umlx_otherEnd.java_NameProperty}"#{jpa_addRelationCascadeType})})
-    ah.umlx_owner_one.java_import_add("javax.persistence.OneToMany")
+    ah.java_annotation_add(%{@OneToMany (#{jpa_addFetchType(ah)}, mappedBy="#{umlx_otherEnd.java_NameProperty}"#{jpa_addRelationCascadeType})})
+    ah.umlx_owner_one.java_import_add('javax.persistence.OneToMany')
   end
   def jpa_addPersistenceBidirOneToManySlave!(ah)
-    ah.java_annotation_add(%{@OneToMany (mappedBy="#{umlx_otherEnd.java_NameProperty}"#{jpa_addRelationCascadeType})})
-    ah.umlx_owner_one.java_import_add("javax.persistence.OneToMany")
+    ah.java_annotation_add(%{@OneToMany (#{jpa_addFetchType(ah)}, mappedBy="#{umlx_otherEnd.java_NameProperty}"#{jpa_addRelationCascadeType})})
+    ah.umlx_owner_one.java_import_add('javax.persistence.OneToMany')
     #jpa_addJoinColumn!(ah)
   end
 
   def jpa_addPersistenceBidirManyToOneMaster!(ah)
     #ah.java_annotation_add(%{@ManyToOne(mappedBy="#{umlx_otherEnd.java_NameProperty}")})
-    ah.java_annotation_add(%{@ManyToOne #{jpa_addRelationCascadeType(false)}})
-    ah.umlx_owner_one.java_import_add("javax.persistence.ManyToOne")
+    ah.java_annotation_add(%{@ManyToOne (#{jpa_addFetchType(ah)} #{jpa_addRelationCascadeType(true)})})
+    ah.umlx_owner_one.java_import_add('javax.persistence.ManyToOne')
     #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}")})
-    ah.java_annotation_add(%{@ManyToOne #{jpa_addRelationCascadeType(false)}})
-    ah.umlx_owner_one.java_import_add("javax.persistence.ManyToOne")
+    ah.java_annotation_add(%{@ManyToOne (#{jpa_addFetchType(ah)} #{jpa_addRelationCascadeType(true)})})
+    ah.umlx_owner_one.java_import_add('javax.persistence.ManyToOne')
     #ah.java_annotation_add(%{@JoinColumn(name="#{java_NameProperty}_fk"})
     jpa_addJoinColumn!(ah)
   end
@@ -142,14 +167,14 @@ module Muml_Property
   #    field : A_self_id
   #
   def jpa_addJoinTable(ah)
-    postfix=(uml_ownedAttribute_inv_one==uml_type_one) ? "_self" : ""
+    postfix=(uml_ownedAttribute_inv_one==uml_type_one) ? '_self' : ''
     ah.java_annotation_add %{	@JoinTable(
-		name="#{uml_ownedAttribute_inv_one.java_Name}_#{java_NameProperty}",
-		joinColumns={@JoinColumn( name="#{uml_ownedAttribute_inv_one.java_Name}_id")},
-		inverseJoinColumns={@JoinColumn(name="#{uml_type_one.java_Name}#{postfix}_id")}
+		name = "#{uml_ownedAttribute_inv_one.jpa_Name}_#{java_NameProperty}",
+		joinColumns={@JoinColumn(name = "#{uml_ownedAttribute_inv_one.jpa_Name}_id")},
+		inverseJoinColumns={@JoinColumn(name = "#{uml_type_one.jpa_Name}#{postfix}_id")}
 	)}
-    ah.umlx_owner_one.java_import_add("javax.persistence.JoinTable")
-    ah.umlx_owner_one.java_import_add("javax.persistence.JoinColumn")
+    ah.umlx_owner_one.java_import_add('javax.persistence.JoinTable')
+    ah.umlx_owner_one.java_import_add('javax.persistence.JoinColumn')
   end
 
   # adds JPA annotation for an attribute with a cardinality 0..1 or 1
@@ -157,22 +182,28 @@ module Muml_Property
     ml=DatatypeMapping.instance.getMapping(self.uml_type_one).maxStringLength
     if ml.nil?
       ah.java_annotation_add(%{@Basic})
-      ah.umlx_owner_one.java_import_add("javax.persistence.Basic")
+      ah.umlx_owner_one.java_import_add('javax.persistence.Basic')
     else
       ah.java_annotation_add(%{@Column(length=#{ml})})
-      ah.umlx_owner_one.java_import_add("javax.persistence.Column")
+      ah.umlx_owner_one.java_import_add('javax.persistence.Column')
     end
   end
 
   # adds JPA annotation for an attribute with a cardinality *
   def jpa_addPersistenceManyAttribute!(ah)
-    ah.java_annotation_add(%{@Transient //TODO: standard JPA cannot handle this case. Hibernate extension @CollectionOfElements is required})
-    ah.umlx_owner_one.java_import_add("javax.persistence.Transient")
+    if true
+       #use hibernate extensions
+          ah.java_annotation_add(%{@CollectionOfElements})
+          ah.umlx_owner_one.java_import_add('org.hibernate.annotations.CollectionOfElements')
+    else
+          ah.java_annotation_add(%{@Transient //TODO: standard JPA cannot handle this case. Hibernate extension @CollectionOfElements is required})
+          ah.umlx_owner_one.java_import_add('javax.persistence.Transient')
+    end
   end
 
   def jpa_addJoinColumn!(ah)
-    ah.java_annotation_add(%{@JoinColumn(name="#{java_NameProperty}_fk")})
-    ah.umlx_owner_one.java_import_add("javax.persistence.JoinColumn")
+    ah.java_annotation_add(%{@JoinColumn(name = "#{jpa_Name}_FK")})
+    ah.umlx_owner_one.java_import_add('javax.persistence.JoinColumn')
   end
 
   #adds property persistence annotation to annotationHolder.
@@ -181,7 +212,19 @@ module Muml_Property
   #* property itself self
   #* getter for the property
   def jpa_addPersistenceTo!(ah)
-    if umlx_isAttribute?
+    return if ah.uml_isDerived?
+
+    if uml_type_one.kind_of?(Muml_Interface)
+      txt= %{
+ERROR: JPA Persistence does not support interfaces.
+ERROR: An association must point to a class.
+ERROR: class:     #{umlx_owner_one.java_qualifiedName}
+ERROR: attribute: #{java_Name}
+ERROR  type       #{uml_type_one.java_qualifiedName}
+      }
+      log.error txt
+      raise Exception.new(txt)
+    elsif umlx_isAttribute?
       jpa_addPersistenceToAttribute!(ah)
     else
       jpa_addPersistenceToAssociation!(ah)
@@ -225,7 +268,7 @@ module Muml_Property
     elsif !fromOne && !toOne
       jpa_addPersistenceUnidirManyToMany!(ah)
     else
-      raise Warning.new("Internal error")
+      raise Warning.new('Internal error')
     end
   end
   def jpa_addPersistenceToAssociationBidir!(ah)
@@ -250,7 +293,7 @@ module Muml_Property
     elsif !fromOne && !toOne && (!master)
       jpa_addPersistenceBidirManyToManySlave!(ah)
     else
-      raise Warning.new("Internal error")
+      raise Warning.new('Internal error')
     end
 
     return
@@ -258,7 +301,7 @@ module Muml_Property
     #		if umlx_oneToOne?
     #			if umlx_otherEnd.nil? || !umlx_otherEnd.umlx_isNavigable?
     #				jpa_addPersistenceUnidirOneToOne!(ah)
-    #				#ah.java_annotation_add("@OneToOne")
+    #				#ah.java_annotation_add('@OneToOne')
     #
     #			elsif	umlx_masterEnd?
     #				ah.java_annotation_add("@OneToOne(cascade = {CascadeType.MERGE, CascadeType.REFRESH, CascadeType.PERSIST, CascadeType.REMOVE})")
@@ -281,30 +324,41 @@ end
 
 class DatatypeMapping
   def jpa_addTypeModificator(ah)
+	n=ah.jpa_addNameAnnotation
+	return if n.nil?
+      ah.java_annotation_add(%{@Column(#{n})}) 
+      ah.umlx_owner_one.java_import_add('javax.persistence.Column')
     #nop
   end
 end
 class DatatypeMappingCalendar < DatatypeMapping
   def jpa_addTypeModificator(ah)
-    ah.java_annotation_add("@Temporal(TemporalType.DATE)")
-    ah.umlx_owner_one.java_import_add("javax.persistence.Temporal")
-    ah.umlx_owner_one.java_import_add("javax.persistence.TemporalType")
+    super
+    ah.java_annotation_add('@Temporal(TemporalType.DATE)')
+    ah.umlx_owner_one.java_import_add('javax.persistence.Temporal')
+    ah.umlx_owner_one.java_import_add('javax.persistence.TemporalType')
   end
 end
 
 class DatatypeMappingBLOB < DatatypeMapping
   def jpa_addTypeModificator(ah)
-    ah.java_annotation_add("@Lob")
-    ah.umlx_owner_one.java_import_add("javax.persistence.Lob")
+    #no super
+    ah.java_annotation_add('@Lob')
+    ah.umlx_owner_one.java_import_add('javax.persistence.Lob')
+
+    #add column name when needed
+    n=ah.jpa_addNameAnnotation
+    n=n.nil? ? '' : ",#{n}"
+    
     #mysql: MEDIUMBLOB LONGBLOB TINYBLOB BLOB
     if ah.context[:mysql]
-      ah.java_annotation_add(%{@Column(columnDefinition="LONGBLOB")}) 
-      ah.umlx_owner_one.java_import_add("javax.persistence.Column")
+      ah.java_annotation_add(%{@Column(columnDefinition="LONGBLOB"#{n})}) 
+      ah.umlx_owner_one.java_import_add('javax.persistence.Column')
     end
     #cf: http://db.apache.org/derby/docs/10.1/ref/rrefblob.html
     if ah.context[:derby]
-      ah.java_annotation_add(%{@Column(columnDefinition="BLOB(4M)")})
-      ah.umlx_owner_one.java_import_add("javax.persistence.Column")    
+      ah.java_annotation_add(%{@Column(columnDefinition="BLOB(4M)"#{n})})
+      ah.umlx_owner_one.java_import_add('javax.persistence.Column')    
     end
   end
 end