ontomde-uml2-java 1.0.4 → 1.0.6

data/Rakefile

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

data/lib/ontomde-uml2-java/accessorCode.rb

@@ -454,10 +454,10 @@ END
 		# 1<->*
 		write <<END
 /* TPL:0016 */
-		if(#{java_this(oa)}#{oa.java_NameProperty}==#{getterParameterName(oa)}) { return ;}
-		#{oa.uml_type_one.java_qualifiedName} previous=#{java_this(oa)}#{oa.java_NameProperty};
-
-		#{java_this(oa)}#{oa.java_NameProperty}=null;
+		if(#{oa.java_NameProperty}!=null && #{oa.java_NameProperty}.equals(#{getterParameterName(oa)})) { return ;}
+		#{oa.uml_type_one.java_qualifiedName} previous=#{oa.java_NameProperty};
+		
+		#{oa.java_NameProperty}=null;
 		if(previous!=null) { previous.remove#{oe.java_NameBean}(this); }
 
 		#{java_this(oa)}#{oa.java_NameProperty}=#{getterParameterName(oa)};

data/lib/ontomde-uml2-java/javadoc.rb

@@ -114,7 +114,8 @@ module Muml_Operation
       p.uml_ownedComment.each { |comment|
         c="#{c} #{comment.uml_body_one}"
       }
-      next if c.empty? &&  p.uml_direction_one.isReturn?
+      c=" self-explanatory"
+      #next if c.empty? &&  p.uml_direction_one.isReturn?
       "#{p.uml_direction_one.isReturn? ? %{@return} : %{@param}} #{p.java_Name unless p.uml_direction_one.isReturn?}#{c}".java_writeJavadoc(self)
     }
 

data/lib/ontomde-uml2-java/security.rb

@@ -32,6 +32,7 @@ module Mrdf_Model
       cn="#{c.java_qualifiedName}.class"
       c.uml_ownedOperation.each  {|op|
         next unless op.umlx_businessMethod?
+	next unless op.umlx_isSecured?
         #operation was generated from an interface
         next if (!op.umlx_redefinesMethod.empty?) && (!op.umlx_redefinesMethod_one.umlx_owner_one.kind_of?(Muml_Interface))
         lit=e.umlx_createAndAddLiteral("#{op.umlx_owner_one.java_qualifiedName}_#{op.java_Name}")
@@ -77,16 +78,38 @@ END
 
   end
 
+  #JAVA_GLOBAL_ACCESS_CONTROL_ENUM="xmda .security.StaticSecurityRole"
+  #Enumerated containing the list of all access control criteria
+  JAVA_GLOBAL_ACCESS_CONTROL_ENUM="xmda.security.GlobalComputedAccessControlCriteria"
+  JAVA_GLOBAL_ACCESS_CONTROL_ENUM_COMMENT=<<ENDHELP
+This enum contains a list of all computed access control criteria.
+
+Generic examples of access control:
+* userIsManagerForThisObject
+* userOwnsThisObject
+* userIsOnDuty
+
+AccessControl criteria are computed in the context of one class instance of the model and one user. (ex: User Martin accessing contract number 3003).
+
+Some criteria migth not need to know what object is beeing accessed (example: userIsOnDuty). Some other will need to know what object is access (Is martin a manager for contract 42000 ?, Does Martin owns product number 13239 ?)
+
+This list is defined at design time because these rules criteria are implemented usign an algorithm (model query, date computation, ...) that require some coding and optimisation at developpement time. It is however possible to add RESERVED elements for future extension (RESERVED1, RESERVED2, ...).
+ENDHELP
+
+
   #model may contain several enumeration of roles stereotypes staticSecurityRole
   #For implementation use, an enumeration containing every roles is generated.
   #Role container name could be appended to role name but it is not because it
   #would make code refactoring more complex.
   #As a consequence, role name should be unique application wide.
   def  umlx_generateStaticSecurityRoleEnum
-    e=umlx_reserved_model.umlx_getOrCreateEnumeration("xmda.security.StaticSecurityRole",Muml_Classifier::UMLX_SEARCH_EVERY_MODEL)
+    e=umlx_reserved_model.umlx_getOrCreateEnumeration(JAVA_GLOBAL_ACCESS_CONTROL_ENUM,Muml_Classifier::UMLX_SEARCH_EVERY_MODEL)
+    e.umlx_createAndAddComment("#{e.rdf_uri}_comment",JAVA_GLOBAL_ACCESS_CONTROL_ENUM_COMMENT) if e.uml_ownedComment.empty?
+
     self.each_value { |v|
       next unless v.kind_of?(Muml_Enumeration)
-      next unless v.umlx_hasStereotype?("staticSecurityRole")
+      #next unless v.umlx_hasStereotype?("staticSecurityRole")
+      next unless v.umlx_hasStereotype?("ComputedAccessControlCriteria")
       v.uml_ownedLiteral.each {|c|
         #role name should be unique
         e.umlx_createAndAddLiteral(c.to_s)
@@ -209,15 +232,15 @@ ENDHELP
   #method default implementation
   JAVA_GETSTATIC_ROLE_CODE=<<ENDROLECODE
 //return empty list (every static role are denied)
-return new java.util.HashSet<xmda.security.StaticSecurityRole>();
+return new java.util.HashSet<#{Mrdf_Model::JAVA_GLOBAL_ACCESS_CONTROL_ENUM}>();
 ENDROLECODE
   
   #public List<SecurityRole> getStaticRoles(org.acegi.security.UserDetails userName
   def umlx_addGetStaticRoleOperation!
-    m=self.umlx_createAndAddOperation("#{rdf_uri}_getStaticRoles","getStaticRoles")
+    m=self.umlx_createAndAddOperation("#{rdf_uri}_getComputedAccessControlGrant","getComputedAccessControlGrant")
   
     r=m.umlx_createAndAddReturnParameter("#{m.rdf_uri}_return")
-    r.uml_type=umlx_reserved_model.umlx_getOrCreateEnumeration("xmda.security.StaticSecurityRole",Muml_Classifier::UMLX_SEARCH_EVERY_MODEL)
+    r.uml_type=umlx_reserved_model.umlx_getOrCreateEnumeration(Mrdf_Model::JAVA_GLOBAL_ACCESS_CONTROL_ENUM,Muml_Classifier::UMLX_SEARCH_EVERY_MODEL)
     r.uml_upperValue=umlx_literal(-1)
     r.umlx_createAndAddComment("#{r.rdf_uri}_c1",JAVA_GETSTATIC_ROLE_COMMENT)
  

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

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ontomde-uml2-java
 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: "ontomde-uml2-java is a full-featured UML2 to Java5 code generator library. This library is meant to be used trough a command line wrapper available in ontomde-uml2-javaFrontEnd gem.  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