Changeset 107


Ignore:
Timestamp:
10/19/13 13:20:44 (11 years ago)
Author:
stoda
Message:

Error detected: there should be only one thread listening to the multiexchange queue.
TODO: change this. Make refactor in the invocationthread. Change remotethreadpool to achieve this behavior.
AInvocationThread <- InvocationTHread

<- MultiInvocationTHread

Location:
branches/supervisor
Files:
15 added
10 edited

Legend:

Unmodified
Added
Removed

  • branches/supervisor/.classpath

    r68 r107  
    2323                </attributes>
    2424        </classpathentry>
    25         <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
     25        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/Java SE 7 [1.7.0_40]">
    2626                <attributes>
    2727                        <attribute name="maven.pomderived" value="true"/>

  • branches/supervisor/.settings/org.eclipse.jdt.core.prefs

    r44 r107  
    1111org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
    1212org.eclipse.jdt.core.compiler.source=1.6
     13org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
     14org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
     15org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
     16org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
     17org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
     18org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
     19org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
     20org.eclipse.jdt.core.formatter.alignment_for_assignment=0
     21org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
     22org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
     23org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
     24org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
     25org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
     26org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
     27org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
     28org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
     29org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
     30org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
     31org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
     32org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
     33org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
     34org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
     35org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
     36org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
     37org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
     38org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
     39org.eclipse.jdt.core.formatter.blank_lines_after_package=1
     40org.eclipse.jdt.core.formatter.blank_lines_before_field=0
     41org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
     42org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
     43org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
     44org.eclipse.jdt.core.formatter.blank_lines_before_method=1
     45org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
     46org.eclipse.jdt.core.formatter.blank_lines_before_package=0
     47org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
     48org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
     49org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
     50org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
     51org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
     52org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
     53org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
     54org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
     55org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
     56org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
     57org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
     58org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
     59org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
     60org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
     61org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
     62org.eclipse.jdt.core.formatter.comment.format_block_comments=true
     63org.eclipse.jdt.core.formatter.comment.format_header=false
     64org.eclipse.jdt.core.formatter.comment.format_html=true
     65org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
     66org.eclipse.jdt.core.formatter.comment.format_line_comments=true
     67org.eclipse.jdt.core.formatter.comment.format_source_code=true
     68org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
     69org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
     70org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
     71org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
     72org.eclipse.jdt.core.formatter.comment.line_length=80
     73org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
     74org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
     75org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
     76org.eclipse.jdt.core.formatter.compact_else_if=true
     77org.eclipse.jdt.core.formatter.continuation_indentation=2
     78org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
     79org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
     80org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
     81org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
     82org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
     83org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
     84org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
     85org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
     86org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
     87org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
     88org.eclipse.jdt.core.formatter.indent_empty_lines=false
     89org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
     90org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
     91org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
     92org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
     93org.eclipse.jdt.core.formatter.indentation.size=4
     94org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
     95org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
     96org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
     97org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
     98org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
     99org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
     100org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
     101org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
     102org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
     103org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
     104org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
     105org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
     106org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
     107org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
     108org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
     109org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
     110org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
     111org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
     112org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
     113org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
     114org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
     115org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
     116org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
     117org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
     118org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
     119org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
     120org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
     121org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
     122org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
     123org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
     124org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
     125org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
     126org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
     127org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
     128org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
     129org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
     130org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
     131org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
     132org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
     133org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
     134org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
     135org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
     136org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
     137org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
     138org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
     139org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
     140org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
     141org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
     142org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
     143org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
     144org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
     145org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
     146org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
     147org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
     148org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
     149org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
     150org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
     151org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
     152org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
     153org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
     154org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
     155org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
     156org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
     157org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
     158org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
     159org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
     160org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
     161org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
     162org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
     163org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
     164org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
     165org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
     166org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
     167org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
     168org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
     169org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
     170org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
     171org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
     172org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
     173org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
     174org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
     175org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
     176org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
     177org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
     178org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
     179org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
     180org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
     181org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
     182org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
     183org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
     184org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
     185org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
     186org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
     187org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
     188org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
     189org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
     190org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
     191org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
     192org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
     193org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
     194org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
     195org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
     196org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
     197org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
     198org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
     199org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
     200org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
     201org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
     202org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
     203org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
     204org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
     205org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
     206org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
     207org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
     208org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
     209org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
     210org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
     211org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
     212org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
     213org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
     214org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
     215org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
     216org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
     217org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
     218org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
     219org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
     220org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
     221org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
     222org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
     223org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
     224org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
     225org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
     226org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
     227org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
     228org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
     229org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
     230org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
     231org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
     232org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
     233org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
     234org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
     235org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
     236org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
     237org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
     238org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
     239org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
     240org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
     241org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
     242org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
     243org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
     244org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
     245org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
     246org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
     247org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
     248org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
     249org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
     250org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
     251org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
     252org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
     253org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
     254org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
     255org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
     256org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
     257org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
     258org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
     259org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
     260org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
     261org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
     262org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
     263org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
     264org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
     265org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
     266org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
     267org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
     268org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
     269org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
     270org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
     271org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
     272org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
     273org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
     274org.eclipse.jdt.core.formatter.join_lines_in_comments=true
     275org.eclipse.jdt.core.formatter.join_wrapped_lines=true
     276org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
     277org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
     278org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
     279org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
     280org.eclipse.jdt.core.formatter.lineSplit=140
     281org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
     282org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
     283org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
     284org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
     285org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
     286org.eclipse.jdt.core.formatter.tabulation.char=tab
     287org.eclipse.jdt.core.formatter.tabulation.size=4
     288org.eclipse.jdt.core.formatter.use_on_off_tags=false
     289org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
     290org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
     291org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
     292org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true

  • branches/supervisor/src/main/java/omq/Remote.java

    r105 r107  
    2222         */
    2323        public String getRef();
     24       
     25        public String getUID();
     26
     27        public void setUID(String uID);
    2428}

  • branches/supervisor/src/main/java/omq/client/proxy/Proxymq.java

    r105 r107  
    4747
    4848        private String reference;
     49        private String UID;
    4950        private transient String exchange;
    5051        private transient String multiExchange;
    … …  
    7273         * Proxymq Constructor.
    7374         *
    74          * This constructor uses an reference to know which object will call. It also uses
    75          * Properties to set where to send the messages
     75         * This constructor uses an reference to know which object will call. It
     76         * also uses Properties to set where to send the messages
    7677         *
    7778         * @param reference
    78          *            The reference represents the unique identifier of a remote object
     79         *            The reference represents the unique identifier of a remote
     80         *            object
    7981         * @param clazz
    8082         *            It represents the real class of the remote object. With this
    … …  
    119121                                return getRef();
    120122                        }
     123                        if (methodName.equals("getUID")) {
     124                                return getUID();
     125                        }
     126                        if (methodName.equals("setUID")) {
     127                                setUID((String) arguments[0]);
     128                                return null;
     129                        }
    121130                        if (methodName.equals("equals")) {
    122131                                if (arguments[0] instanceof Remote) {
    … …  
    168177                }
    169178
     179                // TODO look this carefully
     180                String appId = UID == null ? reference : UID;
     181
    170182                // Add the correlation ID and create a replyTo property
    171                 BasicProperties props = new BasicProperties.Builder().appId(reference).correlationId(corrId).replyTo(replyQueueName).type(serializerType)
    172                                 .deliveryMode(deliveryMode).build();
     183                BasicProperties props = new BasicProperties.Builder().appId(appId).correlationId(corrId).replyTo(replyQueueName)
     184                                .type(serializerType).deliveryMode(deliveryMode).build();
    173185
    174186                // Publish the message
    175187                byte[] bytesRequest = serializer.serialize(serializerType, request);
    176188                broker.publishMessge(exchange, routingkey, props, bytesRequest);
    177                 logger.debug("Proxymq: " + reference + " invokes '" + request.getMethod() + "' , corrID: " + corrId + ", exchange: " + exchange + ", replyQueue: "
    178                                 + replyQueueName + ", serializerType: " + serializerType + ", multi call: " + request.isMulti() + ", async call: " + request.isAsync()
    179                                 + ", delivery mode: " + deliveryMode);
     189                logger.debug("Proxymq: " + reference + " invokes '" + request.getMethod() + "' , corrID: " + corrId + ", exchange: " + exchange
     190                                + ", replyQueue: " + replyQueueName + ", serializerType: " + serializerType + ", multi call: " + request.isMulti()
     191                                + ", async call: " + request.isAsync() + ", delivery mode: " + deliveryMode);
    180192        }
    181193
    … …  
    362374        }
    363375
     376        @Override
     377        public String getUID() {
     378                return UID;
     379        }
     380
     381        @Override
     382        public void setUID(String uID) {
     383                this.UID = uID;
     384        }
     385
    364386}

  • branches/supervisor/src/main/java/omq/common/broker/RemoteBroker.java

    r103 r107  
    66
    77import omq.Remote;
    8 import omq.client.annotation.SyncMethod;
    98import omq.exception.RemoteException;
    109import omq.exception.RetryException;
    … …  
    1918        public void deleteObject(String reference) throws RemoteException, IOException;
    2019
    21         @SyncMethod(retry = 1, timeout = 1000)
    2220        public boolean hasObject(String reference) throws RetryException;
    2321
    24         @SyncMethod(retry = 1, timeout = 1000)
    2522        public HasObject hasObjectInfo(String reference) throws RetryException;
    2623

  • branches/supervisor/src/main/java/omq/common/broker/RemoteBrokerImpl.java

    r103 r107  
    5050        @Override
    5151        public HasObject hasObjectInfo(String reference) throws RetryException {
     52                System.out.println("Hola soc un broker"+ getRef() + ", "+getUID()+ ", fil: "+Thread.currentThread().getId());
    5253                if (getBroker().getRemoteObjs().containsKey(reference)) {
    5354                        RemoteObject r = getBroker().getRemoteObjs().get(reference);
    5455                        int numThreads = r.getPool().getWorkers().size();
    55                         return new HasObject(this.getRef(), reference, true, numThreads);
     56                        return new HasObject(this.getUID(), reference, true, numThreads);
    5657                }
    57                 return new HasObject(this.getRef(), reference, false, 0);
     58                return new HasObject(this.getUID(), reference, false, 0);
    5859        }
    5960

  • branches/supervisor/src/main/java/omq/common/broker/RemoteMultiBroker.java

    r106 r107  
    11package omq.common.broker;
    2 
    3 import java.util.Set;
    42
    53import omq.Remote;
    … …  
    97
    108public interface RemoteMultiBroker extends Remote {
    11         @MultiMethod
    12         @SyncMethod(retry = 1, timeout = 1000)
    13         public Set<String> getRemoteObjects();
    149
    1510        @MultiMethod

  • branches/supervisor/src/main/java/omq/server/InvocationThread.java

    r106 r107  
    172172                channel = broker.getNewChannel();
    173173
    174                 /*
    175                  * Default queue, Round Robin behaviour
    176                  */
    177 
    178174                // Get info about which exchange and queue will use
    179175                String exchange = env.getProperty(ParameterQueue.RPC_EXCHANGE, "");
    … …  
    242238                 */
    243239
     240                // Disable Round Robin behavior
    244241                boolean autoAck = false;
    245242

  • branches/supervisor/src/main/java/omq/supervisor/SupervisorImpl.java

    r106 r107  
    11package omq.supervisor;
    22
    3 import java.util.ArrayList;
     3import java.lang.reflect.Proxy;
    44import java.util.HashMap;
    5 import java.util.List;
    65import java.util.Map;
    76import java.util.Set;
    87
     8import omq.client.proxy.Proxymq;
    99import omq.common.broker.HasObject;
    1010import omq.common.broker.RemoteBroker;
    … …  
    1515import org.apache.log4j.Logger;
    1616
     17import com.rabbitmq.client.AMQP.Queue.DeclareOk;
    1718import com.rabbitmq.client.Channel;
    18 import com.rabbitmq.client.AMQP.Queue.DeclareOk;
    1919
    2020public class SupervisorImpl extends RemoteObject implements Supervisor, Runnable {
    … …  
    2929        private long sleep;
    3030        private Map<String, OmqSettings> objectSettings;
    31         // TODO: Set<?>
    3231        private RemoteMultiBroker multiBroker;
    3332        private Map<String, RemoteBroker> brokerMap;
    34         private List<RemoteBroker> brokers;
    3533
    3634        public SupervisorImpl(String brokerSet, long sleep) {
    3735                this.brokerSet = brokerSet;
    3836                this.sleep = sleep;
    39                 brokers = new ArrayList<RemoteBroker>();
     37                brokerMap = new HashMap<String, RemoteBroker>();
    4038                objectSettings = new HashMap<String, OmqSettings>();
    4139        }
    … …  
    7270                if (brokerSet.equals(brokerSet) && !brokerMap.containsKey(brokerName)) {
    7371                        logger.info("Broker " + brokerName + " subscrived");
    74                         RemoteBroker broker = getBroker().lookup(brokerName, RemoteBroker.class);
     72                        // RemoteBroker broker = getBroker().lookup(brokerSet,
     73                        // RemoteBroker.class);
     74                        Proxymq proxy = new Proxymq(brokerSet, RemoteBroker.class, getBroker());
     75                        Class<?>[] array = { RemoteBroker.class };
     76                        RemoteBroker broker = (RemoteBroker) Proxy.newProxyInstance(RemoteBroker.class.getClassLoader(), array, proxy);
     77                        broker.setUID(brokerName);
    7578                        brokerMap.put(brokerSet, broker);
    7679                } else {
    … …  
    8689                        throw new Exception("JAJAJAJAJA");
    8790                }
     91               
     92                HasObject[] hasList = multiBroker.hasObjectInfo(reference);
     93
     94                int minObjects = settings.getMinNumberObjects();
     95                int numBrokers = hasList.length;
     96                int numObjects = 0;
     97
     98                for (HasObject h : hasList) {
     99                        if (h.hasObject()) {
     100                                numObjects++;
     101                        }
     102                }
     103                System.out.println("NumObjects " + numObjects + " numBrokers " + numBrokers);
     104
     105                int i = 0;
     106                while (numObjects <= minObjects && i < numBrokers) {
     107                        HasObject h = hasList[i++];
     108                        if (h.hasObject()) {
     109                                brokerMap.get(h.getBrokerName()).spawnObject(reference, settings.getClassName());
     110                                numObjects++;
     111                        }
     112                }
    88113                objectSettings.put(reference, settings);
     114
    89115        }
    90116
    … …  
    114140        @Override
    115141        public void unbindObject(OmqSettings settings, HasObject[] hasList, int numObjects) throws Exception {
    116                 String reference = settings.getReference();
    117 
    118                 int minObjects = settings.getMinNumberObjects();
    119 
    120                 for (RemoteBroker broker : brokers) {
    121                         if (broker.hasObject(reference) && (numObjects - 1) >= minObjects) {
    122                                 broker.deleteObject(reference);
    123                                 break;
    124                         }
    125                 }
     142                // String reference = settings.getReference();
     143                //
     144                // int minObjects = settings.getMinNumberObjects();
     145                //
     146                // for (RemoteBroker broker : brokers) {
     147                // if (broker.hasObject(reference) && (numObjects - 1) >= minObjects) {
     148                // broker.deleteObject(reference);
     149                // break;
     150                // }
     151                // }
    126152
    127153        }
    … …  
    166192        }
    167193
    168         public List<RemoteBroker> getBrokers() {
    169                 return brokers;
    170         }
    171 
    172         public void setBrokers(List<RemoteBroker> brokers) {
    173                 this.brokers = brokers;
    174         }
    175 
    176194        public String getBrokerSet() {
    177195                return brokerSet;

  • branches/supervisor/src/test/java/omq/test/supervisor/SleepTest.java

    r106 r107  
    2525                env1.setProperty(ParameterQueue.RABBIT_HOST, "127.0.0.1");
    2626                env1.setProperty(ParameterQueue.RABBIT_PORT, "5672");
    27                 env1.setProperty(ParameterQueue.MIN_POOL_THREADS, "4");
    28                 env1.setProperty(ParameterQueue.MAX_POOL_THREADS, "4");
     27                env1.setProperty(ParameterQueue.MIN_POOL_THREADS, "1");
     28                env1.setProperty(ParameterQueue.MAX_POOL_THREADS, "1");
    2929
    3030                Broker broker = new Broker(env1);
    … …  
    3737                env2.setProperty(ParameterQueue.RABBIT_HOST, "127.0.0.1");
    3838                env2.setProperty(ParameterQueue.RABBIT_PORT, "5672");
    39                 env2.setProperty(ParameterQueue.MIN_POOL_THREADS, "4");
    40                 env2.setProperty(ParameterQueue.MAX_POOL_THREADS, "4");
     39                env2.setProperty(ParameterQueue.MIN_POOL_THREADS, "1");
     40                env2.setProperty(ParameterQueue.MAX_POOL_THREADS, "1");
    4141
    4242                Broker broker2 = new Broker(env2);
Note: See TracChangeset for help on using the changeset viewer.