November 2008 - jboss-remoting-commits

JBoss Remoting SVN: r4674 - in remoting2/branches: 2.x/.settings and 1 other directory.

by jboss-remoting-commits＠lists.jboss.org

Author: trustin Date: 2008-11-13 01:58:23 -0500 (Thu, 13 Nov 2008) New Revision: 4674 Added: remoting2/branches/2.2/.settings/org.eclipse.jdt.core.prefs remoting2/branches/2.2/.settings/org.eclipse.jdt.ui.prefs remoting2/branches/2.x/.settings/org.eclipse.jdt.ui.prefs Modified: remoting2/branches/2.x/.settings/org.eclipse.jdt.core.prefs Log: Updated eclipse project settings Added: remoting2/branches/2.2/.settings/org.eclipse.jdt.core.prefs =================================================================== --- remoting2/branches/2.2/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ remoting2/branches/2.2/.settings/org.eclipse.jdt.core.prefs 2008-11-13 06:58:23 UTC (rev 4674) @@ -0,0 +1,268 @@ +#Thu Nov 13 16:00:10 KST 2008 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.4 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning +org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning +org.eclipse.jdt.core.compiler.source=1.3 +org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_assignment=0 +org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_compact_if=48 +org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=48 +org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 +org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 +org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=64 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=64 +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 +org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 +org.eclipse.jdt.core.formatter.blank_lines_after_package=1 +org.eclipse.jdt.core.formatter.blank_lines_before_field=1 +org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0 +org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 +org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 +org.eclipse.jdt.core.formatter.blank_lines_before_method=1 +org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 +org.eclipse.jdt.core.formatter.blank_lines_before_package=0 +org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 +org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 +org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=next_line +org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=next_line +org.eclipse.jdt.core.formatter.brace_position_for_block=next_line +org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=next_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=next_line +org.eclipse.jdt.core.formatter.brace_position_for_switch=next_line +org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=next_line +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false +org.eclipse.jdt.core.formatter.comment.format_block_comments=false +org.eclipse.jdt.core.formatter.comment.format_header=false +org.eclipse.jdt.core.formatter.comment.format_html=true +org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=false +org.eclipse.jdt.core.formatter.comment.format_line_comments=false +org.eclipse.jdt.core.formatter.comment.format_source_code=true +org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true +org.eclipse.jdt.core.formatter.comment.indent_root_tags=true +org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert +org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert +org.eclipse.jdt.core.formatter.comment.line_length=80 +org.eclipse.jdt.core.formatter.compact_else_if=true +org.eclipse.jdt.core.formatter.continuation_indentation=2 +org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 +org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true +org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_empty_lines=false +org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true +org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true +org.eclipse.jdt.core.formatter.indentation.size=8 +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=insert +org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=insert +org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=insert +org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert +org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false +org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false +org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false +org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false +org.eclipse.jdt.core.formatter.lineSplit=120 +org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false +org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false +org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 +org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1 +org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=false +org.eclipse.jdt.core.formatter.tabulation.char=space +org.eclipse.jdt.core.formatter.tabulation.size=3 +org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false +org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true Added: remoting2/branches/2.2/.settings/org.eclipse.jdt.ui.prefs =================================================================== --- remoting2/branches/2.2/.settings/org.eclipse.jdt.ui.prefs (rev 0) +++ remoting2/branches/2.2/.settings/org.eclipse.jdt.ui.prefs 2008-11-13 06:58:23 UTC (rev 4674) @@ -0,0 +1,6 @@ +#Thu Nov 13 16:00:44 KST 2008 +eclipse.preferences.version=1 +formatter_profile=_JBoss.org +formatter_settings_version=11 +org.eclipse.jdt.ui.javadoc=false +org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="false" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment"/><template autoinsert\="false" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment"/><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.! codetemplates.filecomment" name\="filecomment">/*\n * JBoss, Home of Professional Open Source\n *\n * Copyright ${year}, Red Hat Middleware LLC, and individual contributors\n * by the @author tags. See the COPYRIGHT.txt in the distribution for a\n * full listing of individual contributors.\n *\n * This is free software; you can redistribute it and/or modify it\n * under the terms of the GNU Lesser General Public License as\n * published by the Free Software Foundation; either version 2.1 of\n * the License, or (at your option) any later version.\n *\n * This software is distributed in the hope that it will be useful,\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n * Lesser General Public License for more details.\n *\n * You should have received a copy of the GNU Lesser General Public\n * License along with this software; if not, write to the Free\n * Software Foundation, Inc., 51 Fran! klin St, Fifth Floor, Boston, MA\n * 02110-1301 USA, or see the FSF si te\: http\://www.fsf.org.\n */</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author Trustin Heui-seung Lee (trustin(a)gmail.com)\n * @version $$Rev$$, $$Date$$\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enable! d\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment"/><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${tags}\n * ${see_to_target}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface ! type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplate s.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">${exception_var}.printStackTrace();</template><template autoinsert\="false" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">${body_statemen! t}</template><template autoinsert\="false" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates> Modified: remoting2/branches/2.x/.settings/org.eclipse.jdt.core.prefs =================================================================== --- remoting2/branches/2.x/.settings/org.eclipse.jdt.core.prefs 2008-11-13 06:55:17 UTC (rev 4673) +++ remoting2/branches/2.x/.settings/org.eclipse.jdt.core.prefs 2008-11-13 06:58:23 UTC (rev 4674) @@ -1,4 +1,4 @@ -#Tue Nov 04 18:17:28 KST 2008 +#Thu Nov 13 15:06:08 KST 2008 eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2 @@ -10,3 +10,259 @@ org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning org.eclipse.jdt.core.compiler.source=1.3 +org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_assignment=0 +org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_compact_if=48 +org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=48 +org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 +org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 +org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=64 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=64 +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 +org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 +org.eclipse.jdt.core.formatter.blank_lines_after_package=1 +org.eclipse.jdt.core.formatter.blank_lines_before_field=1 +org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0 +org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 +org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 +org.eclipse.jdt.core.formatter.blank_lines_before_method=1 +org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 +org.eclipse.jdt.core.formatter.blank_lines_before_package=0 +org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 +org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 +org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=next_line +org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=next_line +org.eclipse.jdt.core.formatter.brace_position_for_block=next_line +org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=next_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=next_line +org.eclipse.jdt.core.formatter.brace_position_for_switch=next_line +org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=next_line +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false +org.eclipse.jdt.core.formatter.comment.format_block_comments=false +org.eclipse.jdt.core.formatter.comment.format_header=false +org.eclipse.jdt.core.formatter.comment.format_html=true +org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=false +org.eclipse.jdt.core.formatter.comment.format_line_comments=false +org.eclipse.jdt.core.formatter.comment.format_source_code=true +org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true +org.eclipse.jdt.core.formatter.comment.indent_root_tags=true +org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert +org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert +org.eclipse.jdt.core.formatter.comment.line_length=80 +org.eclipse.jdt.core.formatter.compact_else_if=true +org.eclipse.jdt.core.formatter.continuation_indentation=2 +org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 +org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true +org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_empty_lines=false +org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true +org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true +org.eclipse.jdt.core.formatter.indentation.size=8 +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=insert +org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=insert +org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=insert +org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert +org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false +org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false +org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false +org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false +org.eclipse.jdt.core.formatter.lineSplit=120 +org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false +org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false +org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 +org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1 +org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=false +org.eclipse.jdt.core.formatter.tabulation.char=space +org.eclipse.jdt.core.formatter.tabulation.size=3 +org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false +org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true Added: remoting2/branches/2.x/.settings/org.eclipse.jdt.ui.prefs =================================================================== --- remoting2/branches/2.x/.settings/org.eclipse.jdt.ui.prefs (rev 0) +++ remoting2/branches/2.x/.settings/org.eclipse.jdt.ui.prefs 2008-11-13 06:58:23 UTC (rev 4674) @@ -0,0 +1,6 @@ +#Thu Nov 13 15:06:09 KST 2008 +eclipse.preferences.version=1 +formatter_profile=_JBoss.org +formatter_settings_version=11 +org.eclipse.jdt.ui.javadoc=false +org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="false" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment"/><template autoinsert\="false" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment"/><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.! codetemplates.filecomment" name\="filecomment">/*\n * JBoss, Home of Professional Open Source\n *\n * Copyright ${year}, Red Hat Middleware LLC, and individual contributors\n * by the @author tags. See the COPYRIGHT.txt in the distribution for a\n * full listing of individual contributors.\n *\n * This is free software; you can redistribute it and/or modify it\n * under the terms of the GNU Lesser General Public License as\n * published by the Free Software Foundation; either version 2.1 of\n * the License, or (at your option) any later version.\n *\n * This software is distributed in the hope that it will be useful,\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n * Lesser General Public License for more details.\n *\n * You should have received a copy of the GNU Lesser General Public\n * License along with this software; if not, write to the Free\n * Software Foundation, Inc., 51 Fran! klin St, Fifth Floor, Boston, MA\n * 02110-1301 USA, or see the FSF si te\: http\://www.fsf.org.\n */</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author Trustin Heui-seung Lee (trustin(a)gmail.com)\n * @version $$Rev$$, $$Date$$\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enable! d\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment"/><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${tags}\n * ${see_to_target}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface ! type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplate s.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">${exception_var}.printStackTrace();</template><template autoinsert\="false" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">${body_statemen! t}</template><template autoinsert\="false" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>

16 years

1
0
0 / 0

JBoss Remoting SVN: r4673 - in remoting2/branches: 2.2/src/main/org/jboss/remoting and 3 other directories.

by jboss-remoting-commits＠lists.jboss.org

Author: trustin Date: 2008-11-13 01:55:17 -0500 (Thu, 13 Nov 2008) New Revision: 4673 Added: remoting2/branches/2.2/.settings/ remoting2/branches/2.2/src/tests/org/jboss/test/remoting/ConnectionValidatorTest.java remoting2/branches/2.x/src/tests/org/jboss/test/remoting/ConnectionValidatorTest.java Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/ConnectionValidator.java remoting2/branches/2.x/src/main/org/jboss/remoting/ConnectionValidator.java Log: Fixed issue: JBREM-1055 (ConnectionValidator.run() should have a sanity test to prevent calls from application code) * Added an if block that throws an IllegalStateException when run() is called directly * Added its related test case Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/ConnectionValidator.java =================================================================== --- remoting2/branches/2.2/src/main/org/jboss/remoting/ConnectionValidator.java 2008-11-13 06:42:30 UTC (rev 4672) +++ remoting2/branches/2.2/src/main/org/jboss/remoting/ConnectionValidator.java 2008-11-13 06:55:17 UTC (rev 4673) @@ -22,11 +22,6 @@ package org.jboss.remoting; -import org.jboss.logging.Logger; -import org.jboss.remoting.transport.ClientInvoker; -import org.jboss.remoting.util.StoppableTimerTask; -import org.jboss.remoting.util.TimerUtil; - import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -35,9 +30,15 @@ import java.util.Timer; import java.util.TimerTask; +import org.jboss.logging.Logger; +import org.jboss.remoting.transport.ClientInvoker; +import org.jboss.remoting.util.StoppableTimerTask; +import org.jboss.remoting.util.TimerUtil; + /** * @author <a href="mailto:tom.elrod@jboss.com">Tom Elrod</a> * @author <a href="mailto:ovidiu@jboss.org">Ovidiu Feodorov</a> + * @author <a href="mailto:tlee@redhat.com">Trustin Lee</a> */ public class ConnectionValidator extends TimerTask implements StoppableTimerTask { @@ -172,11 +173,15 @@ o = config.get("NumberOfCallRetries"); if (o != null) + { localConfig.put("NumberOfCallRetries", o); + } o = config.get("NumberOfRetries"); if (o != null) + { localConfig.put("NumberOfRetries", o); + } } if (metadata != null) @@ -200,10 +205,14 @@ } if (localConfig.get(ServerInvoker.TIMEOUT) == null) + { localConfig.put(ServerInvoker.TIMEOUT, DEFAULT_PING_TIMEOUT); + } if (localConfig.get("NumberOfCallRetries") == null) + { localConfig.put("NumberOfCallRetries", DEFAULT_NUMBER_OF_PING_RETRIES); + } return localConfig; } @@ -238,8 +247,8 @@ { this.client = client; this.pingPeriod = pingPeriod; - this.listeners = new ArrayList(); - this.stopped = false; + listeners = new ArrayList(); + stopped = false; getParameters(client, new HashMap()); log.debug(this + " created"); } @@ -247,9 +256,9 @@ public ConnectionValidator(Client client, Map metadata) { this.client = client; - this.pingPeriod = DEFAULT_PING_PERIOD; - this.listeners = new ArrayList(); - this.stopped = false; + pingPeriod = DEFAULT_PING_PERIOD; + listeners = new ArrayList(); + stopped = false; this.metadata = new HashMap(metadata); getParameters(client, metadata); log.debug(this + " created"); @@ -274,6 +283,16 @@ */ public void run() { + synchronized (lock) { + if (timer == null) + { + throw new IllegalStateException( + ConnectionValidator.class.getName() + ".run() should not be " + + "called directly; use " + ConnectionValidator.class.getName() + + ".addConnectionListener() instead."); + } + } + TimerTask tt = new WaitOnConnectionCheckTimerTask(); try @@ -297,7 +316,10 @@ if (tieToLease && client.getLeasePeriod() > 0) { - if (trace) log.trace(this + " sending PING tied to lease"); + if (trace) + { + log.trace(this + " sending PING tied to lease"); + } isValid = doCheckConnectionWithLease(); } else @@ -513,7 +535,7 @@ try { Map metadata = new HashMap(); - metadata.put(ServerInvoker.INVOKER_SESSION_ID, this.invokerSessionId); + metadata.put(ServerInvoker.INVOKER_SESSION_ID, invokerSessionId); InvocationRequest ir = new InvocationRequest(null, Subsystem.SELF, "$PING$", metadata, null, null); @@ -571,13 +593,16 @@ synchronized(lock) { if (stopped) + { return false; + } if (!listeners.isEmpty()) { listeners.clear(); } stopped = true; + timer = null; } if (clientInvoker != null) @@ -627,7 +652,10 @@ { int elapsed = (int) (System.currentTimeMillis() - start); int wait = pingTimeout - elapsed; - if (wait <= 0) break; + if (wait <= 0) + { + break; + } try { Added: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/ConnectionValidatorTest.java =================================================================== --- remoting2/branches/2.2/src/tests/org/jboss/test/remoting/ConnectionValidatorTest.java (rev 0) +++ remoting2/branches/2.2/src/tests/org/jboss/test/remoting/ConnectionValidatorTest.java 2008-11-13 06:55:17 UTC (rev 4673) @@ -0,0 +1,78 @@ +package org.jboss.test.remoting; + +import java.io.IOException; +import java.net.MalformedURLException; +import java.util.Map; + +import junit.framework.TestCase; + +import org.jboss.remoting.Client; +import org.jboss.remoting.ConnectionFailedException; +import org.jboss.remoting.ConnectionValidator; +import org.jboss.remoting.InvokerLocator; +import org.jboss.remoting.MicroRemoteClientInvoker; +import org.jboss.remoting.marshal.Marshaller; +import org.jboss.remoting.marshal.UnMarshaller; +import org.jboss.remoting.transport.ClientInvoker; + +public class ConnectionValidatorTest extends TestCase +{ + + public void testShouldDisallowDirectRun() + { + ConnectionValidator cv = new ConnectionValidator(new Client() { + public Map getConfiguration() + { + return null; + } + + public ClientInvoker getInvoker() + { + try + { + return new MicroRemoteClientInvoker( + new InvokerLocator("http://dummy:65535/dummy/")) { + + public String getSessionId() + { + return "dummyId"; + } + + protected String getDefaultDataType() + { + throw new UnsupportedOperationException(); + } + + protected void handleConnect() throws ConnectionFailedException + { + throw new UnsupportedOperationException(); + } + + protected void handleDisconnect() + { + throw new UnsupportedOperationException(); + } + + protected Object transport(String sessionId, Object invocation, Map metadata, Marshaller marshaller, + UnMarshaller unmarshaller) throws IOException, ConnectionFailedException, ClassNotFoundException + { + throw new UnsupportedOperationException(); + } + }; + } + catch (MalformedURLException e) + { + throw new RuntimeException(e); + } + } + }); + + try + { + cv.run(); + fail("Should throw IllegalStateException"); + } catch (IllegalStateException e) { + // Expected + } + } +} Property changes on: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/ConnectionValidatorTest.java ___________________________________________________________________ Name: svn:keywords + Rev Date Name: svn:eol-style + native Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/ConnectionValidator.java =================================================================== --- remoting2/branches/2.x/src/main/org/jboss/remoting/ConnectionValidator.java 2008-11-13 06:42:30 UTC (rev 4672) +++ remoting2/branches/2.x/src/main/org/jboss/remoting/ConnectionValidator.java 2008-11-13 06:55:17 UTC (rev 4673) @@ -22,11 +22,6 @@ package org.jboss.remoting; -import org.jboss.logging.Logger; -import org.jboss.remoting.transport.ClientInvoker; -import org.jboss.remoting.util.StoppableTimerTask; -import org.jboss.remoting.util.TimerUtil; - import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -35,9 +30,15 @@ import java.util.Timer; import java.util.TimerTask; +import org.jboss.logging.Logger; +import org.jboss.remoting.transport.ClientInvoker; +import org.jboss.remoting.util.StoppableTimerTask; +import org.jboss.remoting.util.TimerUtil; + /** * @author <a href="mailto:tom.elrod@jboss.com">Tom Elrod</a> * @author <a href="mailto:ovidiu@jboss.org">Ovidiu Feodorov</a> + * @author <a href="mailto:tlee@redhat.com">Trustin Lee</a> */ public class ConnectionValidator extends TimerTask implements StoppableTimerTask { @@ -172,11 +173,15 @@ o = config.get("NumberOfCallRetries"); if (o != null) + { localConfig.put("NumberOfCallRetries", o); + } o = config.get("NumberOfRetries"); if (o != null) + { localConfig.put("NumberOfRetries", o); + } } if (metadata != null) @@ -200,10 +205,14 @@ } if (localConfig.get(ServerInvoker.TIMEOUT) == null) + { localConfig.put(ServerInvoker.TIMEOUT, DEFAULT_PING_TIMEOUT); + } if (localConfig.get("NumberOfCallRetries") == null) + { localConfig.put("NumberOfCallRetries", DEFAULT_NUMBER_OF_PING_RETRIES); + } return localConfig; } @@ -238,8 +247,8 @@ { this.client = client; this.pingPeriod = pingPeriod; - this.listeners = new ArrayList(); - this.stopped = false; + listeners = new ArrayList(); + stopped = false; getParameters(client, new HashMap()); log.debug(this + " created"); } @@ -247,9 +256,9 @@ public ConnectionValidator(Client client, Map metadata) { this.client = client; - this.pingPeriod = DEFAULT_PING_PERIOD; - this.listeners = new ArrayList(); - this.stopped = false; + pingPeriod = DEFAULT_PING_PERIOD; + listeners = new ArrayList(); + stopped = false; this.metadata = new HashMap(metadata); getParameters(client, metadata); log.debug(this + " created"); @@ -274,6 +283,16 @@ */ public void run() { + synchronized (lock) { + if (timer == null) + { + throw new IllegalStateException( + ConnectionValidator.class.getName() + ".run() should not be " + + "called directly; use " + ConnectionValidator.class.getName() + + ".addConnectionListener() instead."); + } + } + TimerTask tt = new WaitOnConnectionCheckTimerTask(); try @@ -297,7 +316,10 @@ if (tieToLease && client.getLeasePeriod() > 0) { - if (trace) log.trace(this + " sending PING tied to lease"); + if (trace) + { + log.trace(this + " sending PING tied to lease"); + } isValid = doCheckConnectionWithLease(); } else @@ -513,7 +535,7 @@ try { Map metadata = new HashMap(); - metadata.put(ServerInvoker.INVOKER_SESSION_ID, this.invokerSessionId); + metadata.put(ServerInvoker.INVOKER_SESSION_ID, invokerSessionId); InvocationRequest ir = new InvocationRequest(null, Subsystem.SELF, "$PING$", metadata, null, null); @@ -571,13 +593,16 @@ synchronized(lock) { if (stopped) + { return false; + } if (!listeners.isEmpty()) { listeners.clear(); } stopped = true; + timer = null; } if (clientInvoker != null) @@ -627,7 +652,10 @@ { int elapsed = (int) (System.currentTimeMillis() - start); int wait = pingTimeout - elapsed; - if (wait <= 0) break; + if (wait <= 0) + { + break; + } try { Added: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/ConnectionValidatorTest.java =================================================================== --- remoting2/branches/2.x/src/tests/org/jboss/test/remoting/ConnectionValidatorTest.java (rev 0) +++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/ConnectionValidatorTest.java 2008-11-13 06:55:17 UTC (rev 4673) @@ -0,0 +1,78 @@ +package org.jboss.test.remoting; + +import java.io.IOException; +import java.net.MalformedURLException; +import java.util.Map; + +import junit.framework.TestCase; + +import org.jboss.remoting.Client; +import org.jboss.remoting.ConnectionFailedException; +import org.jboss.remoting.ConnectionValidator; +import org.jboss.remoting.InvokerLocator; +import org.jboss.remoting.MicroRemoteClientInvoker; +import org.jboss.remoting.marshal.Marshaller; +import org.jboss.remoting.marshal.UnMarshaller; +import org.jboss.remoting.transport.ClientInvoker; + +public class ConnectionValidatorTest extends TestCase +{ + + public void testShouldDisallowDirectRun() + { + ConnectionValidator cv = new ConnectionValidator(new Client() { + public Map getConfiguration() + { + return null; + } + + public ClientInvoker getInvoker() + { + try + { + return new MicroRemoteClientInvoker( + new InvokerLocator("http://dummy:65535/dummy/")) { + + public String getSessionId() + { + return "dummyId"; + } + + protected String getDefaultDataType() + { + throw new UnsupportedOperationException(); + } + + protected void handleConnect() throws ConnectionFailedException + { + throw new UnsupportedOperationException(); + } + + protected void handleDisconnect() + { + throw new UnsupportedOperationException(); + } + + protected Object transport(String sessionId, Object invocation, Map metadata, Marshaller marshaller, + UnMarshaller unmarshaller) throws IOException, ConnectionFailedException, ClassNotFoundException + { + throw new UnsupportedOperationException(); + } + }; + } + catch (MalformedURLException e) + { + throw new RuntimeException(e); + } + } + }); + + try + { + cv.run(); + fail("Should throw IllegalStateException"); + } catch (IllegalStateException e) { + // Expected + } + } +} Property changes on: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/ConnectionValidatorTest.java ___________________________________________________________________ Name: svn:keywords + Rev Date Name: svn:eol-style + native

16 years

1
0
0 / 0

JBoss Remoting SVN: r4672 - remoting2/branches/2.2/src/main/org/jboss/remoting.

by jboss-remoting-commits＠lists.jboss.org

Author: ron.sigal(a)jboss.com Date: 2008-11-13 01:42:30 -0500 (Thu, 13 Nov 2008) New Revision: 4672 Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/Version.java Log: JBREM-1039: Added fixed JIRA issues to version. Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/Version.java =================================================================== --- remoting2/branches/2.2/src/main/org/jboss/remoting/Version.java 2008-11-13 05:36:36 UTC (rev 4671) +++ remoting2/branches/2.2/src/main/org/jboss/remoting/Version.java 2008-11-13 06:42:30 UTC (rev 4672) @@ -32,7 +32,7 @@ public static final byte VERSION_2 = 2; public static final byte VERSION_2_2 = 22; - public static final String VERSION = "2.2.2.SP10"; + public static final String VERSION = "2.2.2.SP10+JBREM--1041+1042+1045+1050+1056"; private static final byte byteVersion = VERSION_2_2; private static byte defaultByteVersion = byteVersion; private static boolean performVersioning = true;

16 years

1
0
0 / 0

JBoss Remoting SVN: r4671 - remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/http/proxy.

by jboss-remoting-commits＠lists.jboss.org

Author: ron.sigal(a)jboss.com Date: 2008-11-13 00:36:36 -0500 (Thu, 13 Nov 2008) New Revision: 4671 Added: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/http/proxy/ProxyAuthenticationTestCase.java Log: JBREM-1050: New unit test. Added: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/http/proxy/ProxyAuthenticationTestCase.java =================================================================== --- remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/http/proxy/ProxyAuthenticationTestCase.java (rev 0) +++ remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/http/proxy/ProxyAuthenticationTestCase.java 2008-11-13 05:36:36 UTC (rev 4671) @@ -0,0 +1,295 @@ +/* +* JBoss, Home of Professional Open Source +* Copyright 2005, JBoss Inc., and individual contributors as indicated +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ +package org.jboss.test.remoting.transport.http.proxy; + +import java.io.DataOutputStream; +import java.io.EOFException; +import java.io.InputStreamReader; +import java.net.InetAddress; +import java.net.ServerSocket; +import java.net.Socket; +import java.util.HashMap; +import java.util.Map; + +import junit.framework.TestCase; + +import org.apache.log4j.ConsoleAppender; +import org.apache.log4j.Level; +import org.apache.log4j.Logger; +import org.apache.log4j.PatternLayout; +import org.jboss.logging.XLevel; +import org.jboss.remoting.Client; +import org.jboss.remoting.InvokerLocator; +import org.jboss.util.Base64; + + +/** + * Unit test for JBREM-1050. + * + * @author <a href="ron.sigal(a)jboss.com">Ron Sigal</a> + * @version $Revision: 1.1 $ + * <p> + * Copyright Oct 29, 2008 + * </p> + */ +public class ProxyAuthenticationTestCase extends TestCase +{ + private static Logger log = Logger.getLogger(ProxyAuthenticationTestCase.class); + + private static boolean firstTime = true; + private static String syspropAuth = "Basic " + Base64.encodeBytes("sysprop:abc".getBytes()); + private static String metadataAuth = "Basic " + Base64.encodeBytes("metadata:xyz".getBytes()); + + protected TestHttpServer server; + + + public void setUp() throws Exception + { + if (firstTime) + { + firstTime = false; + Logger.getLogger("org.jboss.remoting").setLevel(XLevel.INFO); + Logger.getLogger("org.jboss.test.remoting").setLevel(Level.INFO); + String pattern = "[%d{ABSOLUTE}] [%t] %5p (%F:%L) - %m%n"; + PatternLayout layout = new PatternLayout(pattern); + ConsoleAppender consoleAppender = new ConsoleAppender(layout); + Logger.getRootLogger().addAppender(consoleAppender); + }; + } + + + /** + * Tests behavior with proxy and authorization information stored in system properties. + */ + public void testProxySyspropAuthSysprop() throws Throwable + { + log.info("entering " + getName()); + + // Start server. + setupServer(); + + // Set system properties. + System.setProperty("http.proxyHost", server.host); + System.setProperty("http.proxyPort", Integer.toString(server.port)); + System.setProperty("proxySet", "true"); + System.setProperty("http.proxy.username", "sysprop"); + System.setProperty("http.proxy.password", "abc"); + + // Create invocation metadata map. + HashMap metadata = new HashMap(); + metadata.put(Client.RAW, "true"); + + // Run test. + doTest(metadata, syspropAuth); + log.info(getName() + " PASSES"); + } + + + /** + * Tests behavior with proxy information stored in system properties + * and authorization information stored in system properties and in overriding + * invocation metadata map.. + */ + public void testProxySyspropAuthMeta() throws Throwable + { + log.info("entering " + getName()); + + // Start server. + setupServer(); + + // Set system properties. + System.setProperty("http.proxyHost", server.host); + System.setProperty("http.proxyPort", Integer.toString(server.port)); + System.setProperty("proxySet", "true"); + System.setProperty("http.proxy.username", "sysprop"); + System.setProperty("http.proxy.password", "abc"); + + // Create invocation metadata map. + HashMap metadata = new HashMap(); + metadata.put(Client.RAW, "true"); + metadata.put("http.proxy.username", "metadata"); + metadata.put("http.proxy.password", "xyz"); + + // Run test. + doTest(metadata, metadataAuth); + log.info(getName() + " PASSES"); + } + + + /** + * Tests behavior with proxy information stored in invocation metadata map + * and authorization information stored in system properties. + */ + public void testProxyMetaAuthSysprop() throws Throwable + { + log.info("entering " + getName()); + + // Start server. + setupServer(); + + // Set system properties. + System.setProperty("http.proxy.username", "sysprop"); + System.setProperty("http.proxy.password", "abc"); + + // Create invocation metadata map. + HashMap metadata = new HashMap(); + metadata.put(Client.RAW, "true"); + metadata.put("http.proxyHost", server.host); + metadata.put("http.proxyPort", Integer.toString(server.port)); + + // Run test. + doTest(metadata, syspropAuth); + log.info(getName() + " PASSES"); + } + + + /** + * Tests behavior with proxy information stored in invocation metadata map + * and authorization information stored in system properties and overriding + * invocation metadata map. + */ + public void testProxyMetaAuthMeta() throws Throwable + { + log.info("entering " + getName()); + + // Start server. + setupServer(); + + // Set system properties. + System.setProperty("http.proxy.username", "sysprop"); + System.setProperty("http.proxy.password", "abc"); + + // Create invocation metadata map. + HashMap metadata = new HashMap(); + metadata.put(Client.RAW, "true"); + metadata.put("http.proxyHost", server.host); + metadata.put("http.proxyPort", Integer.toString(server.port)); + metadata.put("http.proxy.username", "metadata"); + metadata.put("http.proxy.password", "xyz"); + + // Run test. + doTest(metadata, metadataAuth); + log.info(getName() + " PASSES"); + } + + + protected void setupServer() throws Exception + { + server = new TestHttpServer(); + server.start(); + synchronized (TestHttpServer.class) + { + TestHttpServer.class.wait(); + } + log.info("started server"); + } + + + protected void doTest(Map metadata, String auth) throws Throwable + { + // Create client. + String locatorURI = "http://" + server.host + ":" + server.port; + log.info("connecting to " + locatorURI); + InvokerLocator clientLocator = new InvokerLocator(locatorURI); + HashMap config = new HashMap(); + config.put(InvokerLocator.FORCE_REMOTE, "true"); + Client client = new Client(clientLocator, config); + client.connect(); + log.info("client is connected"); + client.invoke("abc", metadata); + + // Verify correct authorization was sent. + assertEquals(auth, server.auth); + client.disconnect(); + } + + + static class TestHttpServer extends Thread + { + public String host; + public int port; + public String auth; + + public void run() + { + try + { + log.info("starting HTTP server"); + InetAddress localHost = InetAddress.getLocalHost(); + final ServerSocket ss = new ServerSocket(0, 100, localHost); + host = localHost.getHostAddress(); + port = ss.getLocalPort(); + synchronized (TestHttpServer.class) + { + TestHttpServer.class.notify(); + } + Socket s = ss.accept(); + + InputStreamReader ir = new InputStreamReader(s.getInputStream()); + char[] cbuf = new char[1024]; + int len = ir.read(cbuf); + String request = String.copyValueOf(cbuf, 0, len); + log.info("Request:"); + System.out.println(); + System.out.println(request); + System.out.println(); + auth = getAuth(request); + + DataOutputStream dos = new DataOutputStream(s.getOutputStream()); + dos.writeBytes("HTTP/1.1 200 OK" + "\r\n"); + dos.writeBytes("Server: testServer"); + dos.writeBytes("Content-Type: text/html" + "\r\n"); + dos.writeBytes("Content-Length: 0\r\n"); + dos.writeBytes("Connection: close\r\n"); + dos.writeBytes("\r\n"); + + ir.close(); + dos.close(); + s.close(); + ss.close(); + } + catch (EOFException e1) + { + log.info("end of file"); + } + catch (Exception e2) + { + log.error("error", e2); + } + } + + private String getAuth(String request) + { + String auth = null; + String[] tokens = request.split("[\r\n]+"); + for (int i = 0; i < tokens.length; i++) + { + if (tokens[i].startsWith("Proxy-Authorization")) + { + auth = tokens[i].split(":[ ]*")[1]; + break; + } + } + return auth; + } + } +} \ No newline at end of file

16 years

1
0
0 / 0

JBoss Remoting SVN: r4670 - remoting2/branches/2.2/src/main/org/jboss/remoting/transport/http.

by jboss-remoting-commits＠lists.jboss.org

Author: ron.sigal(a)jboss.com Date: 2008-11-13 00:29:24 -0500 (Thu, 13 Nov 2008) New Revision: 4670 Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/transport/http/HTTPClientInvoker.java Log: JBREM-1050: createURLConnection() now checks for system property "http.proxyHost" when necessary. Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/transport/http/HTTPClientInvoker.java =================================================================== --- remoting2/branches/2.2/src/main/org/jboss/remoting/transport/http/HTTPClientInvoker.java 2008-11-13 05:25:44 UTC (rev 4669) +++ remoting2/branches/2.2/src/main/org/jboss/remoting/transport/http/HTTPClientInvoker.java 2008-11-13 05:29:24 UTC (rev 4670) @@ -740,6 +740,16 @@ { externalURL = new URL(url); httpURLConn = (HttpURLConnection) externalURL.openConnection(); + + // Check if proxy is being configured by system properties. + if (System.getProperty("http.proxyHost") != null) + { + String proxyAuth = getProxyAuth(metadata); + if (proxyAuth != null) + { + httpURLConn.setRequestProperty("Proxy-Authorization", proxyAuth); + } + } } return httpURLConn;

16 years

1
0
0 / 0

JBoss Remoting SVN: r4669 - in remoting2/branches/2.2/src/tests/org/jboss/test/remoting/classloader: parentfirst and 1 other directory.

by jboss-remoting-commits＠lists.jboss.org

Author: ron.sigal(a)jboss.com Date: 2008-11-13 00:25:44 -0500 (Thu, 13 Nov 2008) New Revision: 4669 Added: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/classloader/parentfirst/ remoting2/branches/2.2/src/tests/org/jboss/test/remoting/classloader/parentfirst/ParentFirstClassloaderTestCase.java Log: JBREM-1042: New unit test. Added: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/classloader/parentfirst/ParentFirstClassloaderTestCase.java =================================================================== --- remoting2/branches/2.2/src/tests/org/jboss/test/remoting/classloader/parentfirst/ParentFirstClassloaderTestCase.java (rev 0) +++ remoting2/branches/2.2/src/tests/org/jboss/test/remoting/classloader/parentfirst/ParentFirstClassloaderTestCase.java 2008-11-13 05:25:44 UTC (rev 4669) @@ -0,0 +1,326 @@ +/* +* JBoss, Home of Professional Open Source +* Copyright 2005, JBoss Inc., and individual contributors as indicated +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ +package org.jboss.test.remoting.classloader.parentfirst; + +import java.io.Serializable; +import java.net.InetAddress; +import java.security.AccessController; +import java.security.PrivilegedAction; +import java.util.HashMap; +import java.util.Map; + +import javax.management.MBeanServer; + +import junit.framework.TestCase; + +import org.apache.log4j.ConsoleAppender; +import org.apache.log4j.Level; +import org.apache.log4j.Logger; +import org.apache.log4j.PatternLayout; +import org.jboss.logging.XLevel; +import org.jboss.remoting.Client; +import org.jboss.remoting.InvocationRequest; +import org.jboss.remoting.InvokerLocator; +import org.jboss.remoting.Remoting; +import org.jboss.remoting.ServerInvocationHandler; +import org.jboss.remoting.ServerInvoker; +import org.jboss.remoting.callback.InvokerCallbackHandler; +import org.jboss.remoting.transport.Connector; +import org.jboss.remoting.transport.PortUtil; + + +/** + * Unit test for JBREM-1042. + * + * @author <a href="ron.sigal(a)jboss.com">Ron Sigal</a> + * @version $Revision: 1.1 $ + * <p> + * Copyright Aug 3, 2008 + * </p> + */ +public class ParentFirstClassloaderTestCase extends TestCase +{ + private static Logger log = Logger.getLogger(ParentFirstClassloaderTestCase.class); + + private static boolean firstTime = true; + + protected String host; + protected int port; + protected String locatorURI; + protected InvokerLocator serverLocator; + protected Connector connector; + protected TestInvocationHandler invocationHandler; + + + public void setUp() throws Exception + { + if (firstTime) + { + firstTime = false; + Logger.getLogger("org.jboss.remoting").setLevel(XLevel.INFO); + Logger.getLogger("org.jboss.test.remoting").setLevel(Level.INFO); + String pattern = "[%d{ABSOLUTE}] [%t] %5p (%F:%L) - %m%n"; + PatternLayout layout = new PatternLayout(pattern); + ConsoleAppender consoleAppender = new ConsoleAppender(layout); + Logger.getRootLogger().addAppender(consoleAppender); + } + } + + + public void tearDown() + { + } + + + /** + * Verify that by default the context classloader is not called first. + */ + public void testDefaultConfig() throws Throwable + { + log.info("entering " + getName()); + + // Start server. + setupServer(); + + // Create client. + InvokerLocator clientLocator = new InvokerLocator(locatorURI); + HashMap clientConfig = new HashMap(); + clientConfig.put(InvokerLocator.FORCE_REMOTE, "true"); + addExtraClientConfig(clientConfig); + Client client = new Client(clientLocator, clientConfig); + client.connect(); + log.info("client is connected"); + + TestClassLoader tcl = new TestClassLoader(); + Thread.currentThread().setContextClassLoader(tcl); + + // Test connection. + client.invoke("abc"); + log.info("connection is good"); + + // Verify that TestClassLoader has not been queried. + assertFalse(tcl.visited); + log.info("context classloader has not been queried"); + + client.disconnect(); + shutdownServer(); + log.info(getName() + " PASSES"); + } + + + /** + * Verify that by the context classloader is called first if + * org.jboss.remoting.Remoting.CLASSLOADING_PARENT_FIRST_DELEGATION is set to "true" + * in the InvokerLocator. + */ + public void testByInvokerLocator() throws Throwable + { + log.info("entering " + getName()); + + // Start server. + setupServer(); + + // Create client. + String clientLocatorURI = locatorURI; + clientLocatorURI += "/?" + Remoting.CLASSLOADING_PARENT_FIRST_DELEGATION + "=false"; + InvokerLocator clientLocator = new InvokerLocator(clientLocatorURI); + HashMap clientConfig = new HashMap(); + clientConfig.put(InvokerLocator.FORCE_REMOTE, "true"); + addExtraClientConfig(clientConfig); + Client client = new Client(clientLocator, clientConfig); + client.connect(); + log.info("client is connected"); + + TestClassLoader tcl = new TestClassLoader(); + setContextClassLoader(tcl); + + // Test connection. + client.invoke("abc"); + log.info("connection is good"); + + // Verify that TestClassLoader has been queried. + assertTrue(tcl.visited); + log.info("context classloader has been queried"); + + client.disconnect(); + shutdownServer(); + log.info(getName() + " PASSES"); + } + + + /** + * Verify that by the context classloader is called first if + * org.jboss.remoting.Remoting.CLASSLOADING_PARENT_FIRST_DELEGATION is set to "true" + * in the config map. + */ + public void testByConfigMap() throws Throwable + { + log.info("entering " + getName()); + + // Start server. + setupServer(); + + // Create client. + InvokerLocator clientLocator = new InvokerLocator(locatorURI); + HashMap clientConfig = new HashMap(); + clientConfig.put(InvokerLocator.FORCE_REMOTE, "true"); + clientConfig.put(Remoting.CLASSLOADING_PARENT_FIRST_DELEGATION, "false"); + addExtraClientConfig(clientConfig); + Client client = new Client(clientLocator, clientConfig); + client.connect(); + log.info("client is connected"); + + TestClassLoader tcl = new TestClassLoader(); + setContextClassLoader(tcl); + + // Test connection. + client.invoke("abc"); + log.info("connection is good"); + + // Verify that TestClassLoader has been queried. + assertTrue(tcl.visited); + log.info("context classloader has been queried"); + + client.disconnect(); + shutdownServer(); + log.info(getName() + " PASSES"); + } + + + /** + * Verify that by the context classloader is called first if the system property + * org.jboss.remoting.Remoting.CLASSLOADING_PARENT_FIRST_DELEGATION_PROP is set to "true" + * in the config map. + */ + public void testBySystemProperty() throws Throwable + { + log.info("entering " + getName()); + + // Start server. + setupServer(); + + // Create client. + InvokerLocator clientLocator = new InvokerLocator(locatorURI); + HashMap clientConfig = new HashMap(); + clientConfig.put(InvokerLocator.FORCE_REMOTE, "true"); + addExtraClientConfig(clientConfig); + System.setProperty(Remoting.CLASSLOADING_PARENT_FIRST_DELEGATION_PROP, "false"); + Client client = new Client(clientLocator, clientConfig); + client.connect(); + log.info("client is connected"); + + TestClassLoader tcl = new TestClassLoader(); + setContextClassLoader(tcl); + + // Test connection. + client.invoke("abc"); + log.info("connection is good"); + + // Verify that TestClassLoader has been queried. + assertTrue(tcl.visited); + log.info("context classloader has been queried"); + + client.disconnect(); + shutdownServer(); + log.info(getName() + " PASSES"); + } + + protected String getTransport() + { + return "socket"; + } + + + protected void addExtraClientConfig(Map config) {} + protected void addExtraServerConfig(Map config) {} + + + protected void setupServer() throws Exception + { + host = InetAddress.getLocalHost().getHostAddress(); + port = PortUtil.findFreePort(host); + locatorURI = getTransport() + "://" + host + ":" + port; + serverLocator = new InvokerLocator(locatorURI); + log.info("Starting remoting server with locator uri of: " + locatorURI); + HashMap config = new HashMap(); + config.put(InvokerLocator.FORCE_REMOTE, "true"); + addExtraServerConfig(config); + connector = new Connector(serverLocator, config); + connector.create(); + invocationHandler = new TestInvocationHandler(); + connector.addInvocationHandler("test", invocationHandler); + connector.start(); + } + + + protected void shutdownServer() throws Exception + { + if (connector != null) + connector.stop(); + } + + + protected void setContextClassLoader(final ClassLoader classLoader) + { + AccessController.doPrivileged( new PrivilegedAction() + { + public Object run() + { + Thread.currentThread().setContextClassLoader(classLoader); + return null; + } + }); + } + + + static class TestInvocationHandler implements ServerInvocationHandler + { + public void addListener(InvokerCallbackHandler callbackHandler) {} + public Object invoke(final InvocationRequest invocation) throws Throwable + { + return new TestClass(); + } + public void removeListener(InvokerCallbackHandler callbackHandler) {} + public void setMBeanServer(MBeanServer server) {} + public void setInvoker(ServerInvoker invoker) {} + } + + + static class TestClassLoader extends ClassLoader + { + boolean visited; + + public Class loadClass(String name) throws ClassNotFoundException + { + visited = true; + log.info("TestClassLoader.loadClass(): " + name); + throw new ClassNotFoundException(name); + } + } + + + static class TestClass implements Serializable + { + /** The serialVersionUID */ + private static final long serialVersionUID = 1L; + } +} \ No newline at end of file

16 years

1
0
0 / 0

JBoss Remoting SVN: r4668 - remoting3/trunk/api/src/main/java/org/jboss/remoting.

by jboss-remoting-commits＠lists.jboss.org

Author: david.lloyd(a)jboss.com Date: 2008-11-13 00:14:35 -0500 (Thu, 13 Nov 2008) New Revision: 4668 Modified: remoting3/trunk/api/src/main/java/org/jboss/remoting/Endpoint.java remoting3/trunk/api/src/main/java/org/jboss/remoting/RemoteRequestException.java Log: Minor fixes Modified: remoting3/trunk/api/src/main/java/org/jboss/remoting/Endpoint.java =================================================================== --- remoting3/trunk/api/src/main/java/org/jboss/remoting/Endpoint.java 2008-11-13 05:14:12 UTC (rev 4667) +++ remoting3/trunk/api/src/main/java/org/jboss/remoting/Endpoint.java 2008-11-13 05:14:35 UTC (rev 4668) @@ -110,6 +110,7 @@ * You must have the {@link org.jboss.remoting.EndpointPermission registerRemoteService EndpointPermission} to invoke this method. * * @param configuration the remote service configuration + * @return a closeable that may be used to remove the registration * @throws IllegalArgumentException if one of the given arguments was not valid * @throws IOException if an error occurs with the registration */ Modified: remoting3/trunk/api/src/main/java/org/jboss/remoting/RemoteRequestException.java =================================================================== --- remoting3/trunk/api/src/main/java/org/jboss/remoting/RemoteRequestException.java 2008-11-13 05:14:12 UTC (rev 4667) +++ remoting3/trunk/api/src/main/java/org/jboss/remoting/RemoteRequestException.java 2008-11-13 05:14:35 UTC (rev 4668) @@ -26,7 +26,7 @@ * Remote request exception. Indicates that the request arrived at the remote side, but the handler could not be * executed for some reason (for example, the request sent might not be of the correct type). */ -public final class RemoteRequestException extends RemotingException { +public class RemoteRequestException extends RemotingException { private static final long serialVersionUID = 5494334026096542700L;

16 years

1
0
0 / 0

JBoss Remoting SVN: r4667 - remoting3/trunk/core/src/main/java/org/jboss/remoting/core.

by jboss-remoting-commits＠lists.jboss.org

Author: david.lloyd(a)jboss.com Date: 2008-11-13 00:14:12 -0500 (Thu, 13 Nov 2008) New Revision: 4667 Modified: remoting3/trunk/core/src/main/java/org/jboss/remoting/core/AbstractContextImpl.java remoting3/trunk/core/src/main/java/org/jboss/remoting/core/ClientContextImpl.java remoting3/trunk/core/src/main/java/org/jboss/remoting/core/ServiceContextImpl.java Log: toString Modified: remoting3/trunk/core/src/main/java/org/jboss/remoting/core/AbstractContextImpl.java =================================================================== --- remoting3/trunk/core/src/main/java/org/jboss/remoting/core/AbstractContextImpl.java 2008-11-13 05:13:58 UTC (rev 4666) +++ remoting3/trunk/core/src/main/java/org/jboss/remoting/core/AbstractContextImpl.java 2008-11-13 05:14:12 UTC (rev 4667) @@ -51,6 +51,6 @@ } public String toString() { - return "generic context instance <" + Integer.toString(hashCode()) + ">"; + return "generic context instance <" + Integer.toHexString(hashCode()) + ">"; } } Modified: remoting3/trunk/core/src/main/java/org/jboss/remoting/core/ClientContextImpl.java =================================================================== --- remoting3/trunk/core/src/main/java/org/jboss/remoting/core/ClientContextImpl.java 2008-11-13 05:13:58 UTC (rev 4666) +++ remoting3/trunk/core/src/main/java/org/jboss/remoting/core/ClientContextImpl.java 2008-11-13 05:14:12 UTC (rev 4667) @@ -48,6 +48,6 @@ } public String toString() { - return "client context instance <" + Integer.toString(hashCode()) + ">"; + return "client context instance <" + Integer.toHexString(hashCode()) + ">"; } } Modified: remoting3/trunk/core/src/main/java/org/jboss/remoting/core/ServiceContextImpl.java =================================================================== --- remoting3/trunk/core/src/main/java/org/jboss/remoting/core/ServiceContextImpl.java 2008-11-13 05:13:58 UTC (rev 4666) +++ remoting3/trunk/core/src/main/java/org/jboss/remoting/core/ServiceContextImpl.java 2008-11-13 05:14:12 UTC (rev 4667) @@ -34,6 +34,6 @@ } public String toString() { - return "service context instance <" + Integer.toString(hashCode()) + ">"; + return "service context instance <" + Integer.toHexString(hashCode()) + ">"; } }

16 years

1
0
0 / 0

JBoss Remoting SVN: r4666 - remoting3/trunk/core/src/main/java/org/jboss/remoting/core.

by jboss-remoting-commits＠lists.jboss.org

Author: david.lloyd(a)jboss.com Date: 2008-11-13 00:13:58 -0500 (Thu, 13 Nov 2008) New Revision: 4666 Modified: remoting3/trunk/core/src/main/java/org/jboss/remoting/core/ClientImpl.java Log: toString(), type safety improvements Modified: remoting3/trunk/core/src/main/java/org/jboss/remoting/core/ClientImpl.java =================================================================== --- remoting3/trunk/core/src/main/java/org/jboss/remoting/core/ClientImpl.java 2008-11-13 05:13:27 UTC (rev 4665) +++ remoting3/trunk/core/src/main/java/org/jboss/remoting/core/ClientImpl.java 2008-11-13 05:13:58 UTC (rev 4666) @@ -26,6 +26,7 @@ import java.util.concurrent.Executor; import org.jboss.remoting.Client; import org.jboss.remoting.IndeterminateOutcomeException; +import org.jboss.remoting.RemoteRequestException; import org.jboss.remoting.core.util.QueueExecutor; import org.jboss.remoting.spi.Handle; import org.jboss.remoting.spi.RemoteRequestContext; @@ -57,7 +58,7 @@ if (! isOpen()) { throw new IOException("Client is not open"); } - final I actualRequest = requestClass.cast(request); + final I actualRequest = castRequest(request); final QueueExecutor executor = new QueueExecutor(); final FutureReplyImpl<O> futureReply = new FutureReplyImpl<O>(executor, replyClass); final ReplyHandler replyHandler = futureReply.getReplyHandler(); @@ -85,15 +86,30 @@ if (! isOpen()) { throw new IOException("Client is not open"); } + final I actualRequest = castRequest(request); final FutureReplyImpl<O> futureReply = new FutureReplyImpl<O>(executor, replyClass); final ReplyHandler replyHandler = futureReply.getReplyHandler(); - final RemoteRequestContext requestContext = handle.getResource().receiveRequest(request, replyHandler); + final RemoteRequestContext requestContext = handle.getResource().receiveRequest(actualRequest, replyHandler); futureReply.setRemoteRequestContext(requestContext); return futureReply; } + /** + * Since type is erased, it's possible that the wrong type was passed. + * @param request + * @return + * @throws RemoteRequestException + */ + private I castRequest(final Object request) throws RemoteRequestException { + try { + return requestClass.cast(request); + } catch (ClassCastException e) { + throw new RemoteRequestException("Invalid request type sent (got <" + request.getClass().getName() + ">, expected <? extends " + requestClass.getName() + ">"); + } + } + public String toString() { - return "client instance <" + Integer.toString(hashCode()) + ">"; + return "client instance <" + Integer.toHexString(hashCode()) + ">"; } Handle<RequestHandler> getRequestHandlerHandle() {

16 years

1
0
0 / 0

JBoss Remoting SVN: r4665 - remoting3/trunk/transporter/src/main/java/org/jboss/remoting/transporter.

by jboss-remoting-commits＠lists.jboss.org

Author: david.lloyd(a)jboss.com Date: 2008-11-13 00:13:27 -0500 (Thu, 13 Nov 2008) New Revision: 4665 Modified: remoting3/trunk/transporter/src/main/java/org/jboss/remoting/transporter/TransporterInvocationHandler.java Log: Transporter GC fixup Modified: remoting3/trunk/transporter/src/main/java/org/jboss/remoting/transporter/TransporterInvocationHandler.java =================================================================== --- remoting3/trunk/transporter/src/main/java/org/jboss/remoting/transporter/TransporterInvocationHandler.java 2008-11-13 05:12:29 UTC (rev 4664) +++ remoting3/trunk/transporter/src/main/java/org/jboss/remoting/transporter/TransporterInvocationHandler.java 2008-11-13 05:13:27 UTC (rev 4665) @@ -27,6 +27,7 @@ import java.io.IOException; import org.jboss.remoting.Client; import org.jboss.remoting.RemoteExecutionException; +import org.jboss.xnio.IoUtils; /** * @@ -47,4 +48,12 @@ throw new IllegalStateException("Method invocation failed", e); } } + + protected void finalize() throws Throwable { + try { + super.finalize(); + } finally { + IoUtils.safeClose(client); + } + } }

16 years

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

jboss-remoting-commits November 2008