You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@click.apache.org by sa...@apache.org on 2009/06/15 18:08:36 UTC

svn commit: r784836 - in /incubator/click/trunk/tools/uml: 128002.diagram 129282 129410.diagram 130562.diagram 131714 131714.diagram 132866.diagram 133122 133122.diagram 134274.diagram 2.session

Author: sabob
Date: Mon Jun 15 16:08:35 2009
New Revision: 784836

URL: http://svn.apache.org/viewvc?rev=784836&view=rev
Log:
new diagram added

Added:
    incubator/click/trunk/tools/uml/133122
    incubator/click/trunk/tools/uml/134274.diagram
Modified:
    incubator/click/trunk/tools/uml/128002.diagram
    incubator/click/trunk/tools/uml/129282
    incubator/click/trunk/tools/uml/129410.diagram
    incubator/click/trunk/tools/uml/130562.diagram
    incubator/click/trunk/tools/uml/131714
    incubator/click/trunk/tools/uml/131714.diagram
    incubator/click/trunk/tools/uml/132866.diagram
    incubator/click/trunk/tools/uml/133122.diagram
    incubator/click/trunk/tools/uml/2.session

Modified: incubator/click/trunk/tools/uml/128002.diagram
URL: http://svn.apache.org/viewvc/incubator/click/trunk/tools/uml/128002.diagram?rev=784836&r1=784835&r2=784836&view=diff
==============================================================================
--- incubator/click/trunk/tools/uml/128002.diagram (original)
+++ incubator/click/trunk/tools/uml/128002.diagram Mon Jun 15 16:08:35 2009
@@ -1,57 +1,57 @@
 format 66
 
 classinstance 128002 class_ref 128002 // ClickServlet
- write_horizontally no  name ""   xyz 90.2321 5.6 2000 life_line_z 2000
+ write_horizontally no  name ""   xyz 89.2321 6 2000 life_line_z 2000
 classinstance 128898 class_ref 129538 // Browser
-  drawing_mode actor  name ""   xyz 17.0902 5.3 2005 life_line_z 2000
+  drawing_mode actor  name ""   xyz 16.8902 5.9 2005 life_line_z 2000
 classinstance 129666 class_ref 129666 // Page
- color orange write_horizontally yes  name ""   mortal  xyz 258.8 92.8436 2000 life_line_z 2000
+ color orange write_horizontally yes  name ""   mortal  xyz 259.4 91.6436 2000 life_line_z 2000
 classinstance 129794 class_ref 129794 // Control
-  name ""   mortal  xyz 406.172 91.3274 2000 life_line_z 2000
+  name ""   mortal  xyz 406.172 91.9274 2000 life_line_z 2000
 durationcanvas 129026 classinstance_ref 128898 // :Browser
-  xyzwh 34 53.6 2010 11 480
+  xyzwh 33 53.4 2010 11 480
 end
 durationcanvas 129154 classinstance_ref 128002 // :ClickServlet
-  xyzwh 120 56.6 2010 11 485
+  xyzwh 119 56.6 2010 11 485
   overlappingdurationcanvas 135682
-    xyzwh 126 70 2020 11 401
+    xyzwh 125 70 2020 11 401
     overlappingdurationcanvas 135810
-      xyzwh 132 345.2 2030 11 114
+      xyzwh 131 345.2 2030 11 114
     end
   end
 end
 durationcanvas 129922 classinstance_ref 129666 // :Page
   color orange
-  xyzwh 277 141.6 2010 11 24
+  xyzwh 278 141.4 2010 11 24
 end
 durationcanvas 130178 classinstance_ref 129666 // :Page
   color orange
-  xyzwh 277 171.6 2010 11 24
+  xyzwh 278 171.4 2010 11 24
 end
 durationcanvas 131202 classinstance_ref 129794 // :Control
-  xyzwh 425 201.6 2010 11 24
+  xyzwh 425 201.4 2010 11 24
 end
 durationcanvas 132482 classinstance_ref 129794 // :Control
   xyzwh 425 231.4 2010 11 24
 end
 durationcanvas 132994 classinstance_ref 129666 // :Page
   color orange
-  xyzwh 277 259 2010 11 24
+  xyzwh 278 259 2010 11 24
 end
 durationcanvas 133250 classinstance_ref 129666 // :Page
   color orange
-  xyzwh 277 291.4 2010 11 24
+  xyzwh 278 291.4 2010 11 24
 end
 durationcanvas 133506 classinstance_ref 129794 // :Control
   xyzwh 425 319 2010 11 24
 end
 durationcanvas 134018 classinstance_ref 129666 // :Page
   color orange
-  xyzwh 277 369 2010 11 24
+  xyzwh 278 369 2010 11 24
 end
 durationcanvas 134274 classinstance_ref 129666 // :Page
   color orange
-  xyzwh 277 401.6 2010 11 24
+  xyzwh 278 401.4 2010 11 24
 end
 durationcanvas 134530 classinstance_ref 129794 // :Control
   xyzwh 425 436.4 2010 11 24
@@ -61,7 +61,7 @@
 end
 durationcanvas 136194 classinstance_ref 129666 // :Page
   color orange
-  xyzwh 277 496.4 2010 11 24
+  xyzwh 278 496.4 2010 11 24
 end
 msg 129282 synchronous
   from durationcanvas_ref 129026

Modified: incubator/click/trunk/tools/uml/129282
URL: http://svn.apache.org/viewvc/incubator/click/trunk/tools/uml/129282?rev=784836&r1=784835&r2=784836&view=diff
==============================================================================
--- incubator/click/trunk/tools/uml/129282 (original)
+++ incubator/click/trunk/tools/uml/129282 Mon Jun 15 16:08:35 2009
@@ -1,6 +1,6 @@
 format 66
 "diagrams" // diagrams
-  revision 7
+  revision 9
   modified_by 2 "bob"
   // class settings
   //class diagram settings
@@ -119,6 +119,10 @@
 	flow 130050 "<flow>"
 	  on activitynode_ref 129666 // decision
 	end
+
+	flow 136194 "<flow>"
+	  on activityaction_ref 132610 // activity action dispatch Control event listeners
+	end
       end
 
       activitynode 129666 decision ""
@@ -133,6 +137,10 @@
 	flow 131458 "no"
 	  on activitynode_ref 130050 // join
 	end
+
+	flow 136450 "<flow>"
+	  on activitynode_ref 130050 // join
+	end
       end
 
       activitynode 129794 join ""
@@ -235,6 +243,13 @@
 	  on activitynode_ref 129154 // activity_final
 	end
       end
+
+      activityaction 132610 "dispatch Control event listeners"
+	opaque_action
+	flow 136322 "<flow>"
+	  on activitynode_ref 129666 // decision
+	end
+      end
     end
 
     sequencediagram 130562 "get-sequence-diagram"
@@ -279,4 +294,26 @@
       size A4
     end
   end
+
+  classview 132994 "services"
+    //class diagram settings
+    draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_infonote default shadow default show_stereotype_properties default
+    //collaboration diagram settings
+    show_full_operations_definition default show_hierarchical_rank default write_horizontally default drawing_language default package_name_in_tab default show_context default draw_all_relations default shadow default show_stereotype_properties default
+    //object diagram settings
+     write_horizontally default package_name_in_tab default show_context default auto_label_position default draw_all_relations default shadow default show_stereotype_properties default
+    //sequence diagram settings
+    show_full_operations_definition default write_horizontally default class_drawing_mode default drawing_language default draw_all_relations default shadow default show_stereotype_properties default
+    //state diagram settings
+    package_name_in_tab default show_context default auto_label_position default write_trans_label_horizontally default show_trans_definition default draw_all_relations default shadow default
+    show_activities default region_horizontally default drawing_language default show_stereotype_properties default
+    //class settings
+    //activity diagram settings
+    package_name_in_tab default show_context default show_opaque_action_definition default auto_label_position default write_flow_label_horizontally default draw_all_relations default shadow default
+    show_infonote default drawing_language default show_stereotype_properties default
+    classdiagram 134274 "service-package"
+      draw_all_relations default hide_attributes yes hide_operations yes show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_infonote default shadow default show_stereotype_properties default
+      size A4
+    end
+  end
 end

Modified: incubator/click/trunk/tools/uml/129410.diagram
URL: http://svn.apache.org/viewvc/incubator/click/trunk/tools/uml/129410.diagram?rev=784836&r1=784835&r2=784836&view=diff
==============================================================================
--- incubator/click/trunk/tools/uml/129410.diagram (original)
+++ incubator/click/trunk/tools/uml/129410.diagram Mon Jun 15 16:08:35 2009
@@ -31,82 +31,87 @@
 textcanvas 133634 "Page.onSecurityCheck()"
   font bold  xyzwh 26 155 2006 146 15
 activitynodecanvas 133762 activitynode_ref 129410 // decision
-  xyz 196 245.8 2000
+  xyz 197 233.8 2000
 end
 textcanvas 133890 "Is Forward ?"
-  font bold  xyzwh 216 241 2000 80 17
+  font bold  xyzwh 219 227 2000 80 17
 activityactioncanvas 134146 activityaction_ref 129538 // activity action process Controls
   show_infonote default drawing_language default show_stereotype_properties default
   show_opaque_action_definition default
-  xyzwh 333.7 243.8 2000 105 41
+  xyzwh 334.7 230.8 2000 105 41
 end
 activitynodecanvas 134658 activitynode_ref 129666 // decision
-  xyz 373.8 306.7 2006
+  xyz 375.8 346.7 2006
 end
 textcanvas 134914 "Continue
 processing ?"
-  font bold  xyzwh 401 307 2000 75 36
+  font bold  xyzwh 401 349 2000 75 36
 activitynodecanvas 135042 activitynode_ref 129794 // join
-  horizontal  xyzwh 200.2 344.2 2000 65 15
+  horizontal  xyzwh 200.2 384.2 2000 65 15
 end
 activitynodecanvas 135938 activitynode_ref 129922 // decision
-  xyz 221.5 381.1 2000
+  xyz 219.5 416.1 2000
 end
 activityactioncanvas 136194 activityaction_ref 129666 // activity action Page.onGet()
   show_infonote default drawing_language default show_stereotype_properties default
   show_opaque_action_definition default
-  xyzwh 271.1 429.2 2000 101 41
+  xyzwh 271.1 462.2 2000 101 41
 end
 textcanvas 136322 "Is Post ?"
-  font bold  xyzwh 163 377 2000 60 18
+  font bold  xyzwh 169 410 2000 60 18
 activityactioncanvas 136962 activityaction_ref 129794 // activity action Page.onPost()
   show_infonote default drawing_language default show_stereotype_properties default
   show_opaque_action_definition default
-  xyzwh 89.6 428.3 2000 99 41
+  xyzwh 89.6 461.3 2000 99 41
 end
 activityactioncanvas 137346 activityaction_ref 129922 // activity action Page.onRender()
   show_infonote default drawing_language default show_stereotype_properties default
   show_opaque_action_definition default
-  xyzwh 146.9 494.3 2000 159 41
+  xyzwh 146.9 519.3 2000 159 41
 end
 activitynodecanvas 138882 activitynode_ref 130050 // join
-  horizontal  xyzwh 3.8 552.2 2000 402 15
+  horizontal  xyzwh 4.8 577.2 2000 402 15
 end
 activitynodecanvas 142210 activitynode_ref 131202 // decision
-  xyz 137.1 595.4 2005
+  xyz 138.1 613.4 2005
 end
 textcanvas 142466 "Do Redirect ?"
-  font bold  xyzwh 162 587 2000 93 16
+  font bold  xyzwh 162 604 2000 93 16
 activitynodecanvas 142594 activitynode_ref 131330 // decision
-  xyz 255.5 642.5 2000
+  xyz 255.5 658.5 2000
 end
 textcanvas 142722 "Do Forward ?"
-  font bold  xyzwh 282 636 2005 88 16
+  font bold  xyzwh 276 650 2005 88 16
 activityactioncanvas 143490 activityaction_ref 131074 // activity action redirect request
   show_infonote default drawing_language default show_stereotype_properties default
   show_opaque_action_definition default
-  xyzwh 12.9 644 2000 105 41
+  xyzwh 12.9 670 2000 105 41
 end
 activityactioncanvas 144002 activityaction_ref 131202 // activity action forward request
   show_infonote default drawing_language default show_stereotype_properties default
   show_opaque_action_definition default
-  xyzwh 131.2 699.2 2000 99 41
+  xyzwh 131.2 709.2 2000 99 41
 end
 activityactioncanvas 144130 activityaction_ref 131330 // activity action render page template
   show_infonote default drawing_language default show_stereotype_properties default
   show_opaque_action_definition default
-  xyzwh 289.6 695.1 2000 137 41
+  xyzwh 289.6 708.1 2000 137 41
 end
 activitynodecanvas 145026 activitynode_ref 131458 // join
-  horizontal  xyzwh 3.2 760.4 2000 396 15
+  horizontal  xyzwh 3.2 767.4 2000 396 15
 end
 activityactioncanvas 145538 activityaction_ref 131458 // activity action Page.onDestroy()
   show_infonote default drawing_language default show_stereotype_properties default
   show_opaque_action_definition default
-  xyzwh 138.6 796.2 2005 119 41
+  xyzwh 138.6 801.2 2005 119 41
 end
 textcanvas 146690 "Servlet Container"
   font bold  xyzwh 17 6 2000 125 25
+activityactioncanvas 147714 activityaction_ref 132610 // activity action dispatch Control event listeners
+  show_infonote default drawing_language default show_stereotype_properties default
+  show_opaque_action_definition default
+  xyzwh 301 289 2005 171 40
+end
 flowcanvas 130178 flow_ref 128002 // <flow>
   
   from ref 128002 z 2008 to ref 129922
@@ -137,25 +142,20 @@
 end
 flowcanvas 134274 flow_ref 129794 // no
   
-  from ref 133762 z 2001 label "no" xyz 255 267 2001 to ref 134146
-  show_infonote default drawing_language default show_stereotype_properties default write_horizontally default
-end
-flowcanvas 134786 flow_ref 130050 // <flow>
-  
-  from ref 134146 z 2001 to ref 134658
+  from ref 133762 z 2001 label "no" xyz 256 254 2001 to ref 134146
   show_infonote default drawing_language default show_stereotype_properties default write_horizontally default
 end
 flowcanvas 135170 flow_ref 130178 // yes
   decenter_begin 518
-  decenter_end 136
+  decenter_end 151
   
-  from ref 133762 z 2001 label "yes" xyz 213 293 2001 to ref 135042
+  from ref 133762 z 2001 label "yes" xyz 214 307 2001 to ref 135042
   show_infonote default drawing_language default show_stereotype_properties default write_horizontally default
 end
 flowcanvas 135298 flow_ref 130306 // yes
   decenter_end 851
   
-  from ref 134658 z 2001 label "yes" xyz 322 325 2001 to point 253 321
+  from ref 134658 z 2001 label "yes" xyz 323 365 2001 to point 253 361
   line 135810 z 2001 to ref 135042
   show_infonote default drawing_language default show_stereotype_properties default write_horizontally default
 end
@@ -167,20 +167,20 @@
 flowcanvas 136450 flow_ref 130562 // no
   geometry HV
   
-  from ref 135938 z 2001 label "no" xyz 299 407 2001 to point 319 397
+  from ref 135938 z 2001 label "no" xyz 256 439 2001 to point 319 432
   line 136834 z 2001 to ref 136194
   show_infonote default drawing_language default show_stereotype_properties default write_horizontally default
 end
 flowcanvas 137090 flow_ref 130690 // yes
   geometry VHr
   
-  from ref 135938 z 2001 label "yes" xyz 145 405 2001 to point 136 397
+  from ref 135938 z 2001 label "yes" xyz 187 437 2001 to point 136 432
   line 137218 z 2001 to ref 136962
   show_infonote default drawing_language default show_stereotype_properties default write_horizontally default
 end
 flowcanvas 138498 flow_ref 130946 // <flow>
   decenter_begin 847
-  decenter_end 167
+  decenter_end 165
   
   from ref 136962 z 2001 to ref 137346
   show_infonote default drawing_language default show_stereotype_properties default write_horizontally default
@@ -196,15 +196,7 @@
   decenter_begin 518
   decenter_end 28
   
-  from ref 130818 z 2001 label "false" xyz 19 215 2001 to ref 138882
-  show_infonote default drawing_language default show_stereotype_properties default write_horizontally default
-end
-flowcanvas 140930 flow_ref 131458 // no
-  decenter_begin 518
-  decenter_end 952
-  
-  from ref 134658 z 2001 label "no" xyz 396 363 2001 to point 383 348
-  line 147330 z 2001 to ref 138882
+  from ref 130818 z 2001 label "false" xyz 19 227 2001 to ref 138882
   show_infonote default drawing_language default show_stereotype_properties default write_horizontally default
 end
 flowcanvas 142338 flow_ref 132610 // <flow>
@@ -216,28 +208,28 @@
 flowcanvas 142850 flow_ref 132738 // no
   geometry HV
   
-  from ref 142210 z 2006 label "no" xyz 239 617 2006 to point 265 611
+  from ref 142210 z 2006 label "no" xyz 239 635 2006 to point 265 629
   line 143362 z 2006 to ref 142594
   show_infonote default drawing_language default show_stereotype_properties default write_horizontally default
 end
 flowcanvas 143618 flow_ref 132866 // yes
   geometry VHr
   
-  from ref 142210 z 2006 label "yes" xyz 75 618 2006 to point 62 611
+  from ref 142210 z 2006 label "yes" xyz 75 636 2006 to point 62 629
   line 143874 z 2006 to ref 143490
   show_infonote default drawing_language default show_stereotype_properties default write_horizontally default
 end
 flowcanvas 144258 flow_ref 132994 // no
   geometry HV
   
-  from ref 142594 z 2001 label "no" xyz 339 666 2001 to point 355 658
+  from ref 142594 z 2001 label "no" xyz 339 682 2001 to point 355 674
   line 144642 z 2001 to ref 144130
   show_infonote default drawing_language default show_stereotype_properties default write_horizontally default
 end
 flowcanvas 144770 flow_ref 133122 // yes
   geometry VHr
   
-  from ref 142594 z 2001 label "yes" xyz 193 664 2001 to point 178 658
+  from ref 142594 z 2001 label "yes" xyz 193 680 2001 to point 178 674
   line 144898 z 2001 to ref 144002
   show_infonote default drawing_language default show_stereotype_properties default write_horizontally default
 end
@@ -275,9 +267,26 @@
 end
 flowcanvas 146178 flow_ref 135042 // <flow>
   decenter_begin 527
-  decenter_end 563
+  decenter_end 560
   
   from ref 137346 z 2001 to ref 138882
   show_infonote default drawing_language default show_stereotype_properties default write_horizontally default
 end
+flowcanvas 147970 flow_ref 136194 // <flow>
+  
+  from ref 134146 z 2006 to ref 147714
+  show_infonote default drawing_language default show_stereotype_properties default write_horizontally default
+end
+flowcanvas 148098 flow_ref 136322 // <flow>
+  
+  from ref 147714 z 2007 to ref 134658
+  show_infonote default drawing_language default show_stereotype_properties default write_horizontally default
+end
+flowcanvas 148354 flow_ref 136450 // <flow>
+  decenter_end 953
+  
+  from ref 134658 z 2007 to point 385 388
+  line 148482 z 2007 to ref 138882
+  show_infonote default drawing_language default show_stereotype_properties default write_horizontally default
+end
 end

Modified: incubator/click/trunk/tools/uml/130562.diagram
URL: http://svn.apache.org/viewvc/incubator/click/trunk/tools/uml/130562.diagram?rev=784836&r1=784835&r2=784836&view=diff
==============================================================================
--- incubator/click/trunk/tools/uml/130562.diagram (original)
+++ incubator/click/trunk/tools/uml/130562.diagram Mon Jun 15 16:08:35 2009
@@ -1,67 +1,67 @@
 format 66
 
 classinstance 128002 class_ref 128002 // ClickServlet
- write_horizontally no  name ""   xyz 90.8321 4.4 2000 life_line_z 2000
+ write_horizontally no  name ""   xyz 89.8321 4.6 2000 life_line_z 2000
 classinstance 128898 class_ref 129538 // Browser
-  drawing_mode actor  name ""   xyz 17.8902 5.1 2005 life_line_z 2000
+  drawing_mode actor  name ""   xyz 16.6902 5.7 2005 life_line_z 2000
 classinstance 129666 class_ref 129666 // Page
- color orange write_horizontally yes  name ""   mortal  xyz 258.8 95.2436 2000 life_line_z 2000
+ color orange write_horizontally yes  name ""   mortal  xyz 259.4 95.6436 2000 life_line_z 2000
 classinstance 129794 class_ref 129794 // Control
-  name ""   mortal  xyz 406.172 92.9274 2000 life_line_z 2000
+  name ""   mortal  xyz 406.172 91.7274 2000 life_line_z 2000
 durationcanvas 129026 classinstance_ref 128898 // :Browser
-  xyzwh 34 54.6 2010 11 480
+  xyzwh 34 53.6 2010 11 480
 end
 durationcanvas 129154 classinstance_ref 128002 // :ClickServlet
-  xyzwh 120 55.8 2010 11 485
+  xyzwh 120 55.4 2010 11 485
   overlappingdurationcanvas 135682
     xyzwh 126 70 2020 11 401
     overlappingdurationcanvas 135810
-      xyzwh 132 345.4 2030 11 114
+      xyzwh 132 345.2 2030 11 114
     end
   end
 end
 durationcanvas 129922 classinstance_ref 129666 // :Page
   color orange
-  xyzwh 277 142.6 2010 11 24
+  xyzwh 278 141.6 2010 11 24
 end
 durationcanvas 130178 classinstance_ref 129666 // :Page
   color orange
-  xyzwh 277 172.6 2010 11 24
+  xyzwh 278 171.6 2010 11 24
 end
 durationcanvas 131202 classinstance_ref 129794 // :Control
-  xyzwh 424 202.6 2010 11 24
+  xyzwh 424 201.6 2010 11 24
 end
 durationcanvas 132482 classinstance_ref 129794 // :Control
-  xyzwh 425 230.8 2010 11 24
+  xyzwh 425 230.2 2010 11 24
 end
 durationcanvas 132994 classinstance_ref 129666 // :Page
   color orange
-  xyzwh 277 259 2010 11 24
+  xyzwh 278 259 2010 11 24
 end
 durationcanvas 133250 classinstance_ref 129666 // :Page
   color orange
-  xyzwh 277 290.8 2010 11 24
+  xyzwh 278 290.2 2010 11 24
 end
 durationcanvas 133506 classinstance_ref 129794 // :Control
   xyzwh 425 319 2010 11 24
 end
 durationcanvas 134018 classinstance_ref 129666 // :Page
   color orange
-  xyzwh 277 369 2010 11 24
+  xyzwh 278 369 2010 11 24
 end
 durationcanvas 134274 classinstance_ref 129666 // :Page
   color orange
-  xyzwh 277 402.6 2010 11 24
+  xyzwh 278 401.6 2010 11 24
 end
 durationcanvas 134530 classinstance_ref 129794 // :Control
   xyzwh 425 434 2010 11 24
 end
 durationcanvas 135938 classinstance_ref 129794 // :Control
-  xyzwh 425 470.4 2010 11 24
+  xyzwh 425 470.2 2010 11 24
 end
 durationcanvas 136194 classinstance_ref 129666 // :Page
   color orange
-  xyzwh 277 494 2010 11 24
+  xyzwh 278 494 2010 11 24
 end
 msg 129282 synchronous
   from durationcanvas_ref 129026
@@ -71,7 +71,7 @@
   label_xy 58 48
 reflexivemsg 129538 synchronous
   to durationcanvas_ref 135682
-  yz 69 3005 explicitmsg "handleRequest"
+  yz 70 3005 explicitmsg "handleRequest"
   show_full_operations_definition default drawing_language default
   label_xy 161 67
 msg 130050 synchronous
@@ -118,7 +118,7 @@
   label_xy 334 317
 reflexivemsg 133890 synchronous
   to durationcanvas_ref 135810
-  yz 343 3005 explicitmsg "renderTemplate"
+  yz 345 3005 explicitmsg "renderTemplate"
   show_full_operations_definition default drawing_language default
   label_xy 167 341
 msg 134146 synchronous

Modified: incubator/click/trunk/tools/uml/131714
URL: http://svn.apache.org/viewvc/incubator/click/trunk/tools/uml/131714?rev=784836&r1=784835&r2=784836&view=diff
==============================================================================
--- incubator/click/trunk/tools/uml/131714 (original)
+++ incubator/click/trunk/tools/uml/131714 Mon Jun 15 16:08:35 2009
@@ -1,6 +1,6 @@
 format 66
 "apache" // org::click::apache
-  revision 1
+  revision 2
   modified_by 2 "bob"
   // class settings
   //class diagram settings
@@ -388,7 +388,7 @@
 	  a role_name "" multiplicity "1" private
 	    classrelation_ref 129538 // (#model)
 	  b role_name "" multiplicity "1" private
-	    classrelation_ref 129666 // (#model)
+	    classrelation_ref 129666 // #model
       end
     end
 
@@ -551,4 +551,6 @@
   end
 
   package_ref 131842 // control
+
+  package_ref 133122 // service
 end

Modified: incubator/click/trunk/tools/uml/131714.diagram
URL: http://svn.apache.org/viewvc/incubator/click/trunk/tools/uml/131714.diagram?rev=784836&r1=784835&r2=784836&view=diff
==============================================================================
--- incubator/click/trunk/tools/uml/131714.diagram (original)
+++ incubator/click/trunk/tools/uml/131714.diagram Mon Jun 15 16:08:35 2009
@@ -1,15 +1,15 @@
 format 66
 
 classinstance 128002 class_ref 128002 // ClickServlet
- write_horizontally no  name ""   xyz 90.8321 4.2 2000 life_line_z 2000
+ write_horizontally no  name ""   xyz 89.8321 5.4 2000 life_line_z 2000
 classinstance 128898 class_ref 129538 // Browser
-  drawing_mode actor  name ""   xyz 17.0902 5.5 2005 life_line_z 2000
+  drawing_mode actor  name ""   xyz 16.8902 5.1 2005 life_line_z 2000
 classinstance 129666 class_ref 129666 // Page
- write_horizontally yes  name ""   mortal  xyz 260.3 94.0436 2000 life_line_z 2000
+ write_horizontally yes  name ""   mortal  xyz 260.1 95.2436 2000 life_line_z 2000
 classinstance 129794 class_ref 129794 // Control
- color orange  name ""   mortal  xyz 406.172 93.1274 2000 life_line_z 2000
+ color orange  name ""   mortal  xyz 406.172 94.1274 2000 life_line_z 2000
 durationcanvas 129026 classinstance_ref 128898 // :Browser
-  xyzwh 34 54.8 2010 11 480
+  xyzwh 34 53.6 2010 11 480
 end
 durationcanvas 129154 classinstance_ref 128002 // :ClickServlet
   xyzwh 120 56.6 2010 11 485
@@ -21,14 +21,14 @@
   end
 end
 durationcanvas 129922 classinstance_ref 129666 // :Page
-  xyzwh 279 142.8 2010 11 24
+  xyzwh 279 141.6 2010 11 24
 end
 durationcanvas 130178 classinstance_ref 129666 // :Page
-  xyzwh 278 172.8 2010 11 24
+  xyzwh 279 171.6 2010 11 24
 end
 durationcanvas 131202 classinstance_ref 129794 // :Control
   color orange
-  xyzwh 425 202.8 2010 11 24
+  xyzwh 425 201.6 2010 11 24
 end
 durationcanvas 132482 classinstance_ref 129794 // :Control
   color orange
@@ -48,7 +48,7 @@
   xyzwh 279 369 2010 11 24
 end
 durationcanvas 134274 classinstance_ref 129666 // :Page
-  xyzwh 279 402.8 2010 11 24
+  xyzwh 279 401.6 2010 11 24
 end
 durationcanvas 134530 classinstance_ref 129794 // :Control
   color orange
@@ -59,7 +59,7 @@
   xyzwh 425 470.2 2010 11 24
 end
 durationcanvas 136194 classinstance_ref 129666 // :Page
-  xyzwh 278 496.4 2010 11 24
+  xyzwh 279 496.4 2010 11 24
 end
 msg 129282 synchronous
   from durationcanvas_ref 129026

Modified: incubator/click/trunk/tools/uml/132866.diagram
URL: http://svn.apache.org/viewvc/incubator/click/trunk/tools/uml/132866.diagram?rev=784836&r1=784835&r2=784836&view=diff
==============================================================================
--- incubator/click/trunk/tools/uml/132866.diagram (original)
+++ incubator/click/trunk/tools/uml/132866.diagram Mon Jun 15 16:08:35 2009
@@ -17,7 +17,7 @@
   xyz 279 144 2000
 end
 relationcanvas 128770 relation_ref 130818 // <realization>
-  from ref 128386 z 2001 stereotype "<<realize>>" xyz 24 102.5 3000 to ref 128002
+  from ref 128386 z 2001 stereotype "<<realize>>" xyz 24 102 3000 to ref 128002
   no_role_a no_role_b
   no_multiplicity_a no_multiplicity_b
 end

Added: incubator/click/trunk/tools/uml/133122
URL: http://svn.apache.org/viewvc/incubator/click/trunk/tools/uml/133122?rev=784836&view=auto
==============================================================================
--- incubator/click/trunk/tools/uml/133122 (added)
+++ incubator/click/trunk/tools/uml/133122 Mon Jun 15 16:08:35 2009
@@ -0,0 +1,198 @@
+format 66
+"service" // org::click::apache::service
+  revision 1
+  modified_by 2 "bob"
+  // class settings
+  //class diagram settings
+  draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_infonote default shadow default show_stereotype_properties default
+  //use case diagram settings
+  package_name_in_tab default show_context default auto_label_position default draw_all_relations default class_drawing_mode default shadow default show_stereotype_properties default
+  //sequence diagram settings
+  show_full_operations_definition default write_horizontally default class_drawing_mode default drawing_language default draw_all_relations default shadow default show_stereotype_properties default
+  //collaboration diagram settings
+  show_full_operations_definition default show_hierarchical_rank default write_horizontally default drawing_language default package_name_in_tab default show_context default draw_all_relations default shadow default show_stereotype_properties default
+  //object diagram settings
+   write_horizontally default package_name_in_tab default show_context default auto_label_position default draw_all_relations default shadow default show_stereotype_properties default
+  //component diagram settings
+  package_name_in_tab default show_context default auto_label_position default draw_all_relations default shadow default
+  draw_component_as_icon default show_component_req_prov default show_component_rea default show_stereotype_properties default
+  //deployment diagram settings
+  package_name_in_tab default show_context default write_horizontally default auto_label_position default draw_all_relations default shadow default
+  draw_component_as_icon default show_component_req_prov default show_component_rea default show_stereotype_properties default
+  //state diagram settings
+  package_name_in_tab default show_context default auto_label_position default write_trans_label_horizontally default show_trans_definition default draw_all_relations default shadow default
+  show_activities default region_horizontally default drawing_language default show_stereotype_properties default
+  //activity diagram settings
+  package_name_in_tab default show_context default show_opaque_action_definition default auto_label_position default write_flow_label_horizontally default draw_all_relations default shadow default
+  show_infonote default drawing_language default show_stereotype_properties default
+  
+  classview 133122 "classes"
+    //class diagram settings
+    draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_infonote default shadow default show_stereotype_properties default
+    //collaboration diagram settings
+    show_full_operations_definition default show_hierarchical_rank default write_horizontally default drawing_language default package_name_in_tab default show_context default draw_all_relations default shadow default show_stereotype_properties default
+    //object diagram settings
+     write_horizontally default package_name_in_tab default show_context default auto_label_position default draw_all_relations default shadow default show_stereotype_properties default
+    //sequence diagram settings
+    show_full_operations_definition default write_horizontally default class_drawing_mode default drawing_language default draw_all_relations default shadow default show_stereotype_properties default
+    //state diagram settings
+    package_name_in_tab default show_context default auto_label_position default write_trans_label_horizontally default show_trans_definition default draw_all_relations default shadow default
+    show_activities default region_horizontally default drawing_language default show_stereotype_properties default
+    //class settings
+    //activity diagram settings
+    package_name_in_tab default show_context default show_opaque_action_definition default auto_label_position default write_flow_label_horizontally default draw_all_relations default shadow default
+    show_infonote default drawing_language default show_stereotype_properties default
+    class 137474 "TemplateService"
+      abstract visibility public stereotype "interface"
+      cpp_decl ""
+      java_decl "${comment}${@}${visibility}interface ${name}${extends} {
+${members}}
+"
+      php_decl "${comment}${visibility}interface ${name} {
+${members}}
+"
+      python_2_2 python_decl ""
+      idl_decl "${comment}${abstract}${local}interface ${name}${inherit} {
+${members}};
+"
+      explicit_switch_type ""
+      
+    end
+
+    class 137602 "VelocityTemplateService"
+      visibility package 
+      cpp_decl ""
+      java_decl ""
+      php_decl ""
+      python_2_2 python_decl ""
+      idl_decl ""
+      explicit_switch_type ""
+      
+      classrelation 135938 // <realization>
+	relation 134914 -_-|>
+	  a public
+	    classrelation_ref 135938 // <realization>
+	  b parent class_ref 137474 // TemplateService
+      end
+    end
+
+    class 137730 "FreemarkerTemplateService"
+      visibility package 
+      cpp_decl ""
+      java_decl ""
+      php_decl ""
+      python_2_2 python_decl ""
+      idl_decl ""
+      explicit_switch_type ""
+      
+      classrelation 136066 // <realization>
+	relation 135042 -_-|>
+	  a public
+	    classrelation_ref 136066 // <realization>
+	  b parent class_ref 137474 // TemplateService
+      end
+    end
+
+    class 137858 "LogService"
+      abstract visibility public stereotype "interface"
+      cpp_decl ""
+      java_decl "${comment}${@}${visibility}interface ${name}${extends} {
+${members}}
+"
+      php_decl "${comment}${visibility}interface ${name} {
+${members}}
+"
+      python_2_2 python_decl ""
+      idl_decl "${comment}${abstract}${local}interface ${name}${inherit} {
+${members}};
+"
+      explicit_switch_type ""
+      
+    end
+
+    class 137986 "ConsoleLogService"
+      visibility package 
+      cpp_decl ""
+      java_decl ""
+      php_decl ""
+      python_2_2 python_decl ""
+      idl_decl ""
+      explicit_switch_type ""
+      
+      classrelation 136194 // <realization>
+	relation 135170 -_-|>
+	  a public
+	    classrelation_ref 136194 // <realization>
+	  b parent class_ref 137858 // LogService
+      end
+    end
+
+    class 138114 "Log4JLogService"
+      visibility package 
+      cpp_decl ""
+      java_decl ""
+      php_decl ""
+      python_2_2 python_decl ""
+      idl_decl ""
+      explicit_switch_type ""
+      
+      classrelation 136322 // <realization>
+	relation 135298 -_-|>
+	  a public
+	    classrelation_ref 136322 // <realization>
+	  b parent class_ref 137858 // LogService
+      end
+    end
+
+    class 138242 "JdkLogService"
+      visibility package 
+      cpp_decl ""
+      java_decl ""
+      php_decl ""
+      python_2_2 python_decl ""
+      idl_decl ""
+      explicit_switch_type ""
+      
+      classrelation 136450 // <realization>
+	relation 135426 -_-|>
+	  a public
+	    classrelation_ref 136450 // <realization>
+	  b parent class_ref 137858 // LogService
+      end
+    end
+
+    class 137218 "XmlConfigService"
+      visibility package 
+      cpp_decl ""
+      java_decl ""
+      php_decl ""
+      python_2_2 python_decl ""
+      idl_decl ""
+      explicit_switch_type ""
+      
+      classrelation 135810 // <realization>
+	relation 134786 -_-|>
+	  a public
+	    classrelation_ref 135810 // <realization>
+	  b parent class_ref 137346 // ConfigService
+      end
+    end
+
+    class 137346 "ConfigService"
+      abstract visibility public stereotype "interface"
+      cpp_decl ""
+      java_decl "${comment}${@}${visibility}interface ${name}${extends} {
+${members}}
+"
+      php_decl "${comment}${visibility}interface ${name} {
+${members}}
+"
+      python_2_2 python_decl ""
+      idl_decl "${comment}${abstract}${local}interface ${name}${inherit} {
+${members}};
+"
+      explicit_switch_type ""
+      
+    end
+  end
+end

Modified: incubator/click/trunk/tools/uml/133122.diagram
URL: http://svn.apache.org/viewvc/incubator/click/trunk/tools/uml/133122.diagram?rev=784836&r1=784835&r2=784836&view=diff
==============================================================================
--- incubator/click/trunk/tools/uml/133122.diagram (original)
+++ incubator/click/trunk/tools/uml/133122.diagram Mon Jun 15 16:08:35 2009
@@ -73,7 +73,7 @@
   xyz 545 431 2000
 end
 relationcanvas 128514 relation_ref 131586 // <realization>
-  from ref 128386 z 2001 stereotype "<<realize>>" xyz 178.5 102 3000 to ref 128002
+  from ref 128386 z 2001 stereotype "<<realize>>" xyz 178 102 3000 to ref 128002
   no_role_a no_role_b
   no_multiplicity_a no_multiplicity_b
 end
@@ -98,18 +98,18 @@
   no_multiplicity_a no_multiplicity_b
 end
 relationcanvas 129538 relation_ref 132226 // <realization>
-  from ref 128898 z 2001 stereotype "<<realize>>" xyz 121.5 227.5 3000 to ref 128258
+  from ref 128898 z 2001 stereotype "<<realize>>" xyz 121 227 3000 to ref 128258
   no_role_a no_role_b
   no_multiplicity_a no_multiplicity_b
 end
 relationcanvas 129922 relation_ref 132354 // <realization>
-  decenter_end 212
-  from ref 129666 z 2001 stereotype "<<realize>>" xyz 197 228.5 3000 to ref 128258
+  decenter_end 211
+  from ref 129666 z 2001 stereotype "<<realize>>" xyz 197 228 3000 to ref 128258
   no_role_a no_role_b
   no_multiplicity_a no_multiplicity_b
 end
 relationcanvas 130050 relation_ref 132482 // <realization>
-  from ref 129794 z 2001 stereotype "<<realize>>" xyz 264.5 228 3000 to ref 128258
+  from ref 129794 z 2001 stereotype "<<realize>>" xyz 264 228 3000 to ref 128258
   no_role_a no_role_b
   no_multiplicity_a no_multiplicity_b
 end
@@ -120,7 +120,7 @@
   no_multiplicity_a no_multiplicity_b
 end
 relationcanvas 130690 relation_ref 132738 // <realization>
-  from ref 130306 z 2001 stereotype "<<realize>>" xyz 394 228.5 3000 to ref 128258
+  from ref 130306 z 2001 stereotype "<<realize>>" xyz 394 228 3000 to ref 128258
   no_role_a no_role_b
   no_multiplicity_a no_multiplicity_b
 end

Added: incubator/click/trunk/tools/uml/134274.diagram
URL: http://svn.apache.org/viewvc/incubator/click/trunk/tools/uml/134274.diagram?rev=784836&view=auto
==============================================================================
--- incubator/click/trunk/tools/uml/134274.diagram (added)
+++ incubator/click/trunk/tools/uml/134274.diagram Mon Jun 15 16:08:35 2009
@@ -0,0 +1,74 @@
+format 66
+
+classcanvas 128258 class_ref 137218 // XmlConfigService
+  draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_infonote default shadow default show_stereotype_properties default
+  xyz 3 97 2000
+end
+classcanvas 128386 class_ref 137346 // ConfigService
+  draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_infonote default shadow default show_stereotype_properties default
+  xyz 13 4 2005
+end
+classcanvas 128642 class_ref 137474 // TemplateService
+  draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_infonote default shadow default show_stereotype_properties default
+  xyz 244 4 2000
+end
+classcanvas 128770 class_ref 137602 // VelocityTemplateService
+  draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_infonote default shadow default show_stereotype_properties default
+  xyz 141 120 2000
+end
+classcanvas 129026 class_ref 137730 // FreemarkerTemplateService
+  draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_infonote default shadow default show_stereotype_properties default
+  color gray
+  xyz 310 121 2000
+end
+classcanvas 129282 class_ref 137858 // LogService
+  draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_infonote default shadow default show_stereotype_properties default
+  xyz 154 186 2000
+end
+classcanvas 129410 class_ref 137986 // ConsoleLogService
+  draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_infonote default shadow default show_stereotype_properties default
+  xyz 4 297 2000
+end
+classcanvas 129538 class_ref 138114 // Log4JLogService
+  draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_infonote default shadow default show_stereotype_properties default
+  color gray
+  xyz 136 298 2000
+end
+classcanvas 129666 class_ref 138242 // JdkLogService
+  draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_infonote default shadow default show_stereotype_properties default
+  color gray
+  xyz 257 299 2000
+end
+relationcanvas 128514 relation_ref 134786 // <realization>
+  from ref 128258 z 2006 to ref 128386
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 128898 relation_ref 134914 // <realization>
+  decenter_begin 758
+  from ref 128770 z 2001 to ref 128642
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 129154 relation_ref 135042 // <realization>
+  decenter_begin 104
+  from ref 129026 z 2001 to ref 128642
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 129794 relation_ref 135170 // <realization>
+  from ref 129410 z 2001 to ref 129282
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 129922 relation_ref 135298 // <realization>
+  from ref 129538 z 2001 to ref 129282
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+relationcanvas 130050 relation_ref 135426 // <realization>
+  from ref 129666 z 2001 to ref 129282
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+end

Modified: incubator/click/trunk/tools/uml/2.session
URL: http://svn.apache.org/viewvc/incubator/click/trunk/tools/uml/2.session?rev=784836&r1=784835&r2=784836&view=diff
==============================================================================
--- incubator/click/trunk/tools/uml/2.session (original)
+++ incubator/click/trunk/tools/uml/2.session Mon Jun 15 16:08:35 2009
@@ -15,13 +15,18 @@
     760 715 100 4 0 0
   classdiagram_ref 132994 // control-class-diagram
     760 715 100 4 0 0
-  active  activitydiagram_ref 129410 // activity-diagram-small
-    760 715 100 4 0 0
+  activitydiagram_ref 129410 // activity-diagram-small
+    1543 959 100 4 0 0
+  active  classdiagram_ref 134274 // service-package
+    1543 959 100 4 0 0
 end
 show_stereotypes
-selected activitydiagram_ref 129410 // activity-diagram-small
+marked
+  class_ref 137346 // ConfigService
+end
+selected classdiagram_ref 134274 // service-package
 open
-  activity_ref 128386 // Servlet Container
-  classview_ref 130306 // controls
+  classview_ref 132994 // services
+  classview_ref 133122 // classes
 end
 end