http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/650d494f/sortmelatter/tools/eclipse-formatter-style.xml ---------------------------------------------------------------------- diff --git a/sortmelatter/tools/eclipse-formatter-style.xml b/sortmelatter/tools/eclipse-formatter-style.xml deleted file mode 100644 index cd698ca..0000000 --- a/sortmelatter/tools/eclipse-formatter-style.xml +++ /dev/null @@ -1,291 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<profiles version="12"> -<profile kind="CodeFormatterProfile" name="WaveStyle" version="12"> -<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.disabling_tag" value="@formatter:off"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration" value="end_of_line"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries" value="true"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_field" value="0"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.use_on_off_tags" value="false"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line" value="false"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_ellipsis" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases" value="true"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.alignment_for_multiple_fields" value="16"/> -<setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer" value="16"/> -<setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression" value="80"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_binary_operator" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.brace_position_for_array_initializer" value="end_of_line"/> -<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_package" value="1"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="2"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation" value="16"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk" value="1"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_binary_operator" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_package" value="0"/> -<setting id="org.eclipse.jdt.core.compiler.source" value="1.7"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="true"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.join_wrapped_lines" value="true"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call" value="16"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.align_type_members_on_columns" value="false"/> -<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_member_type" value="1"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation" value="16"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_unary_operator" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.comment.indent_parameter_description" value="true"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment" value="false"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.lineSplit" value="100"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration" value="0"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.indentation.size" value="2"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.enabling_tag" value="@formatter:on"/> -<setting id="org.eclipse.jdt.core.formatter.alignment_for_assignment" value="0"/> -<setting id="org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration" value="16"/> -<setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="space"/> -<setting id="org.eclipse.jdt.core.compiler.problem.assertIdentifier" value="error"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_body" value="true"/> -<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_method" value="1"/> -<setting id="org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested" value="true"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line" value="false"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration" value="16"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration" value="end_of_line"/> -<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.alignment_for_method_declaration" value="0"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.brace_position_for_switch" value="end_of_line"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments" value="false"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch" value="false"/> -<setting id="org.eclipse.jdt.core.compiler.problem.enumIdentifier" value="error"/> -<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block" value="end_of_line"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_ellipsis" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.brace_position_for_method_declaration" value="end_of_line"/> -<setting id="org.eclipse.jdt.core.formatter.compact_else_if" value="true"/> -<setting id="org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch" value="true"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column" value="true"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.comment.indent_root_tags" value="true"/> -<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_constant" value="end_of_line"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch" value="16"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="2"/> -<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment" value="false"/> -<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration" value="16"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.indent_empty_lines" value="false"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block_in_case" value="end_of_line"/> -<setting id="org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve" value="1"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression" value="16"/> -<setting id="org.eclipse.jdt.core.compiler.compliance" value="1.7"/> -<setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="2"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression" value="16"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_unary_operator" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line" value="false"/> -<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line" value="false"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration" value="16"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration" value="end_of_line"/> -<setting id="org.eclipse.jdt.core.formatter.alignment_for_binary_expression" value="16"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try" value="insert"/> -<setting id="org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode" value="enabled"/> -<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_label" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line" value="true"/> -<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments" value="true"/> -<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant" value="16"/> -<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="80"/> -<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_import_groups" value="1"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration" value="end_of_line"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body" value="0"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header" value="true"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations" value="1"/> -<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header" value="true"/> -<setting id="org.eclipse.jdt.core.formatter.wrap_before_binary_operator" value="true"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration" value="16"/> -<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_block" value="true"/> -<setting id="org.eclipse.jdt.core.formatter.join_lines_in_comments" value="true"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_if" value="16"/> -<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases" value="true"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value="1"/> -<setting id="org.eclipse.jdt.core.formatter.comment.format_html" value="true"/> -<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration" value="16"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.comment.format_source_code" value="true"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration" value="16"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.alignment_for_resources_in_try" value="80"/> -<setting id="org.eclipse.jdt.core.compiler.codegen.targetPlatform" value="1.7"/> -<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation" value="0"/> -<setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="false"/> -<setting id="org.eclipse.jdt.core.formatter.comment.format_header" value="false"/> -<setting id="org.eclipse.jdt.core.formatter.comment.format_block_comments" value="true"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="0"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header" value="true"/> -<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.brace_position_for_type_declaration" value="end_of_line"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries" value="true"/> -<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_imports" value="1"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header" value="true"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column" value="false"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line" value="false"/> -<setting id="org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column" value="false"/> -</profile> -</profiles>
http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/650d494f/sortmelatter/tools/eclipse-launch/src.org.waveprotocol.wave.client.editor.examples.img.Img_Example-launch ---------------------------------------------------------------------- diff --git a/sortmelatter/tools/eclipse-launch/src.org.waveprotocol.wave.client.editor.examples.img.Img_Example-launch b/sortmelatter/tools/eclipse-launch/src.org.waveprotocol.wave.client.editor.examples.img.Img_Example-launch deleted file mode 100644 index 473507c..0000000 --- a/sortmelatter/tools/eclipse-launch/src.org.waveprotocol.wave.client.editor.examples.img.Img_Example-launch +++ /dev/null @@ -1,36 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - --> - -<launchConfiguration type="com.google.gdt.eclipse.suite.webapp"> -<stringAttribute key="bad_container_name" value="/WPL-wpl1/tool"/> -<stringAttribute key="com.google.gdt.eclipse.suiteMainTypeProcessor.PREVIOUSLY_SET_MAIN_TYPE_NAME" value="com.google.gwt.dev.GWTShell"/> -<stringAttribute key="com.google.gwt.eclipse.core.URL" value="http://localhost:8888/org.waveprotocol.wave.client.editor.examples.img.TestModule/?gwt.codesvr=127.0.0.1:9997"/> -<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"> -<listEntry value="/WPL-wpl1"/> -</listAttribute> -<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES"> -<listEntry value="4"/> -</listAttribute> -<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="com.google.gwt.eclipse.core.moduleClasspathProvider"/> -<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.google.gwt.dev.GWTShell"/> -<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-logLevel INFO -port 8888 http://localhost:8888/org.waveprotocol.wave.client.editor.examples.img.TestModule/?gwt.codesvr=127.0.0.1:9997"/> -<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="WPL-wpl1"/> -<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx512m"/> -</launchConfiguration> http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/650d494f/sortmelatter/tools/eclipse-launch/src.org.waveprotocol.wave.client.editor.harness.EditorTest-launch ---------------------------------------------------------------------- diff --git a/sortmelatter/tools/eclipse-launch/src.org.waveprotocol.wave.client.editor.harness.EditorTest-launch b/sortmelatter/tools/eclipse-launch/src.org.waveprotocol.wave.client.editor.harness.EditorTest-launch deleted file mode 100644 index 5ab0f40..0000000 --- a/sortmelatter/tools/eclipse-launch/src.org.waveprotocol.wave.client.editor.harness.EditorTest-launch +++ /dev/null @@ -1,36 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - --> - -<launchConfiguration type="com.google.gdt.eclipse.suite.webapp"> -<stringAttribute key="bad_container_name" value="/WPL-wpl1/tool"/> -<stringAttribute key="com.google.gdt.eclipse.suiteMainTypeProcessor.PREVIOUSLY_SET_MAIN_TYPE_NAME" value="com.google.gwt.dev.GWTShell"/> -<stringAttribute key="com.google.gwt.eclipse.core.URL" value="http://localhost:8888/org.waveprotocol.wave.client.editor.harness.EditorTest/EditorTest.html?gwt.codesvr=127.0.0.1:9997"/> -<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"> -<listEntry value="/WPL-wpl1"/> -</listAttribute> -<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES"> -<listEntry value="4"/> -</listAttribute> -<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="com.google.gwt.eclipse.core.moduleClasspathProvider"/> -<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.google.gwt.dev.GWTShell"/> -<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-logLevel INFO -port 8888 http://localhost:8888/org.waveprotocol.wave.client.editor.harness.EditorTest/EditorTest.html?gwt.codesvr=127.0.0.1:9997"/> -<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="WPL-wpl1"/> -<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx512m"/> -</launchConfiguration> http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/650d494f/sortmelatter/tools/eclipse.sh ---------------------------------------------------------------------- diff --git a/sortmelatter/tools/eclipse.sh b/sortmelatter/tools/eclipse.sh deleted file mode 100755 index 10065c1..0000000 --- a/sortmelatter/tools/eclipse.sh +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash - -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -# Simple utility to setup an eclipse project -# Author: [email protected] - -set -e - -if [ ! -d 'src' -o ! -d 'test' ]; then - echo 'Must run from root directory of checkout' - exit 1 -fi - -HERE=`pwd` -NAME=`basename "$HERE"` -echo "Creating .project" -sed -e "s/PROJECT_NAME/WPL-$NAME/" .project_template > .project - -for f in tools/eclipse-launch/*; do - dest=`echo \`basename "$f"\` | sed -e 's|\.|/|g;s|-|.|g'` - echo "Creating $dest" - cp "$f" "$dest" -done http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/650d494f/sortmelatter/war/.gitignore ---------------------------------------------------------------------- diff --git a/sortmelatter/war/.gitignore b/sortmelatter/war/.gitignore deleted file mode 100755 index ae6bc80..0000000 --- a/sortmelatter/war/.gitignore +++ /dev/null @@ -1,18 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -/webclient http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/650d494f/sortmelatter/war/static/auth.css ---------------------------------------------------------------------- diff --git a/sortmelatter/war/static/auth.css b/sortmelatter/war/static/auth.css deleted file mode 100644 index 6159759..0000000 --- a/sortmelatter/war/static/auth.css +++ /dev/null @@ -1,136 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. -*/ -body { - background-color: #ffffff margin-top : 2; -} - -body { - font-family: arial, sans-serif; -} - -#wiab_loginform { - margin: 0; -} - -#wiab_loginbox_td { - padding-right: 10px; -} - -.form-noindent { - border: #0066cc 2px solid; - background-color: white; -} - -.bubble { - background-color: #62c4fb; -} - -.tl { - font-size: 1px; - padding: 0; - width: 4; - text-align: left; - vertical-align: top -} - -.tr { - font-size: 1px; - padding: 0; - width: 2; - text-align: right; - vertical-align: top -} - -.bl { - font-size: 1px; - padding: 0; - width: 4; - text-align: left; - vertical-align: bottom -} - -.br { - font-size: 1px; - padding: 0; - width: 4; - text-align: right; - vertical-align: bottom -} - -.loginBox { - padding: 5px 5px 20px; - margin: 0; - text-align: center; - background-color: #d3d4d6; -} - -.loginBox td { - padding-bottom: 5px; -} - -.loginBox td.smallfont { - font-size: 80%; -} - -.loginBox h2 { - margin: 0; - font-weight: bold; - font-size: 120%; -} - -.loginBox table { - margin: 0; - text-align: left; -} - -.loginBox p { - text-align: left; -} - -.alBox { - padding: 5px 10px; - margin: 0; -} - -.alBox h4 { - margin: 0; - font-size: 80%; -} - -.wiab.le.lbl { - font-family: Arial, Helvetica, sans-serif; - font-size: smaller; -} - -.wiab.le.val { - font-family: Arial, Helvetica, sans-serif; - font-size: smaller; -} - -.wiab.le.button { - font-family: Arial, Helvetica, sans-serif; - font-size: smaller; -} - -.icon { - float: left; - margin-right: 5px; - width: 28px; -} - http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/650d494f/sortmelatter/war/static/favicon.ico ---------------------------------------------------------------------- diff --git a/sortmelatter/war/static/favicon.ico b/sortmelatter/war/static/favicon.ico deleted file mode 100644 index 22290ee..0000000 Binary files a/sortmelatter/war/static/favicon.ico and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/650d494f/sortmelatter/war/static/images/unknown.jpg ---------------------------------------------------------------------- diff --git a/sortmelatter/war/static/images/unknown.jpg b/sortmelatter/war/static/images/unknown.jpg deleted file mode 100644 index 0f39513..0000000 Binary files a/sortmelatter/war/static/images/unknown.jpg and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/650d494f/sortmelatter/war/static/logo.png ---------------------------------------------------------------------- diff --git a/sortmelatter/war/static/logo.png b/sortmelatter/war/static/logo.png deleted file mode 100644 index 48ac016..0000000 Binary files a/sortmelatter/war/static/logo.png and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/650d494f/sortmelatter/war/static/wiab_screenshot.jpg ---------------------------------------------------------------------- diff --git a/sortmelatter/war/static/wiab_screenshot.jpg b/sortmelatter/war/static/wiab_screenshot.jpg deleted file mode 100644 index e89518f..0000000 Binary files a/sortmelatter/war/static/wiab_screenshot.jpg and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/650d494f/sortmelatter/war/static/wiab_screenshot_small.jpg ---------------------------------------------------------------------- diff --git a/sortmelatter/war/static/wiab_screenshot_small.jpg b/sortmelatter/war/static/wiab_screenshot_small.jpg deleted file mode 100644 index e36a74d..0000000 Binary files a/sortmelatter/war/static/wiab_screenshot_small.jpg and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/650d494f/sortmelatter/wiab-logging.conf ---------------------------------------------------------------------- diff --git a/sortmelatter/wiab-logging.conf b/sortmelatter/wiab-logging.conf deleted file mode 100644 index efad66c..0000000 --- a/sortmelatter/wiab-logging.conf +++ /dev/null @@ -1,47 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -# This file sets up console and file logging for the wiab server - -handlers=java.util.logging.FileHandler, java.util.logging.ConsoleHandler - -# Available log levels are: -# ALL, FINEST, FINER, FINE, CONFIG, INFO, WARNING, SEVERE, OFF - -# Default global logging level. -# Loggers and Handlers may override this level -.level=INFO - -java.util.logging.ConsoleHandler.level = INFO -java.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter - -java.util.logging.FileHandler.level = ALL -java.util.logging.FileHandler.pattern = wiab-server.log -java.util.logging.FileHandler.count=5 -java.util.logging.FileHandler.append=false -java.util.logging.FileHandler.formatter = java.util.logging.SimpleFormatter -java.util.logging.FileHandler.limit=5242880 - -# Per-package logging levels. -# Add extra packages here to increase or decrease the log level -# per-package levels affect both console and file output - -org.eclipse.jetty.level = SEVERE -org.eclipse.jetty.websocket.level = SEVERE - -#org.waveprotocol.level=ALL - http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/650d494f/wave/build.gradle ---------------------------------------------------------------------- diff --git a/wave/build.gradle b/wave/build.gradle index 021c653..0dd7bed 100644 --- a/wave/build.gradle +++ b/wave/build.gradle @@ -27,7 +27,7 @@ mainClassName = "org.waveprotocol.box.server.ServerMain" applicationDefaultJvmArgs = [ "-Xmx1024M", "-Dorg.eclipse.jetty.LEVEL=DEBUG", - "-Djava.security.auth.login.config=jaas.config" + "-Djava.security.auth.login.config=config/jaas.config" ] configurations { @@ -322,6 +322,33 @@ extractApi.mustRunAfter compileJava compileJava.dependsOn = [generateMessages, generateGXP] +/* Gwt Dev Tasks */ + +task gwtDev { + description = 'Runs the hosted mode server, for debugging the Gwt client ' + + 'in a JVM.' + doLast { + javaexec { + main = "com.google.gwt.dev.DevMode" + classpath { + [ + sourceSets.main.java.srcDirs, + sourceSets.main.compileClasspath, + sourceSets.main.resources.srcDirs, + configurations.gwt, + ] + } + args = [ + "-noserver", + "-bindAddress", "127.0.0.1", + "-startupUrl", "http://localhost:9898";, + "-logLevel", "DEBUG", + "org.waveprotocol.box.webclient.WebClientDev", + ] + } + } +} + /* Test Tasks */ test { @@ -408,7 +435,7 @@ testGwt.mustRunAfter compileGwt, testLarge testMongo.mustRunAfter compileJava, test testLarge.mustRunAfter test -ant.importBuild 'server-config.xml' +ant.importBuild 'config/server-config.xml' jar { @@ -493,4 +520,15 @@ jar { exclude "com/google/api/client/**/*" } -jar.dependsOn compileJava, compileGwt, extractApi \ No newline at end of file +jar.dependsOn compileJava, compileGwt, extractApi + +/* Distribution Tasks */ + +task createPropertiesFile(type: Copy) { + from 'src/main/configs' + include 'wave.conf' + into 'config' + expand([ + version: version + ]) +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/650d494f/wave/config/jaas.config ---------------------------------------------------------------------- diff --git a/wave/config/jaas.config b/wave/config/jaas.config new file mode 100644 index 0000000..044f2d1 --- /dev/null +++ b/wave/config/jaas.config @@ -0,0 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +Wave { + org.waveprotocol.box.server.authentication.AccountStoreLoginModule required debug=true; +}; http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/650d494f/wave/config/prosody.cfg.lua.example ---------------------------------------------------------------------- diff --git a/wave/config/prosody.cfg.lua.example b/wave/config/prosody.cfg.lua.example new file mode 100644 index 0000000..2a5403d --- /dev/null +++ b/wave/config/prosody.cfg.lua.example @@ -0,0 +1,31 @@ +--[[ + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * WITH THE License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. +--]] + +component_ports = { @XMPP_SERVER_COMPONENT_PORT@ } +s2s_ports = { @XMPP_SERVER_TO_SERVER_PORT@ } + +VirtualHost "@CERTIFICATE_DOMAIN@" + enabled = true + ssl = { + key = "@BASEDIR@/@CERTIFICATE_PRIVATE_KEY@"; + certificate = "@BASEDIR@/@[email protected]"; + } + +Component "@XMPP_JID@" + component_secret = "@XMPP_SERVER_SECRET@" http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/650d494f/wave/config/reference.conf ---------------------------------------------------------------------- diff --git a/wave/config/reference.conf b/wave/config/reference.conf new file mode 100644 index 0000000..04753c4 --- /dev/null +++ b/wave/config/reference.conf @@ -0,0 +1,257 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +# Configuration for the Wave in a Box server + + +core { + # Domain name of the wave server. + wave_server_domain : "local.net" + + # A comma separated list of address on which to listen for connections. + # Each address is a comma separated host:port pair. + http_frontend_addresses : ["localhost:9898"] + + # The public address - a comma separated host:port pair, i.e. example.com:80 + http_frontend_public_address : "" + + # An optional host:port address on which to listen for websocket connections. + # Defaults to http_websocket_public_address. + # If no value is set for http_websocket_public_address it defaults to the first address specified + # by http_frontend_public_address. + http_websocket_public_address : "" + + # An optional host:port address for which the client is told to attempt websocket connections. + # If no value is set for http_websocket_presented_address it defaults to http_websocket_public_address. + http_websocket_presented_address : "" + + # The address of Apache Shindig gadgets server patched to support Wave gadgets. + # See https://cwiki.apache.org/confluence/display/WAVE/Gadgets+with+your+own+Gadget+Server + gadget_server_hostname : "gmodules.com" + + # The gadget serer port. + gadget_server_port : 80 + + # A comma separated list of webApp source directories + resource_bases : ["./war"] + + # Settings for the different persistence stores. Currently supported: memory, file, mongodb. + signer_info_store_type : file + + # The location where signer info certificate data is stored on disk. This should be changed. + # Note: This is only used when using the file signer info store. It is ignored + # for other data store types. + signer_info_store_directory : _certificates + + # Currently supported attachment types: mongodb, disk + attachment_store_type : disk + + # The location where attachments are stored on disk. This should be changed. + # Note: This is only used when using the disk attachment store. It is ignored + # for other data store types. + attachment_store_directory : _attachments + + # Directory that holds the thumbnails for attachments. + # Icon must be in PNG format, and named as MIME type with replacing '/' to '_'. + # For example thumbnail file for ZIP format (MIME type application/zip) must be named application_zip. + thumbnail_patterns_directory : _thumbnail_patterns + + # Currently supported account store types: fake, memory, file, mongodb + account_store_type : file + + # The location where accounts are stored on disk. This should be changed. + # Note: This is only used when using the file account store. It is ignored + # for other data store types. + account_store_directory : _accounts + + # Currently supported delta store types: memory, file, mongodb. + # Note: file system support is experimental. Your server may crash. And the file format is + # not stable and shouldn't be relied upon for long-term storage yet; upcoming changes will + # require you to blow away your data. + delta_store_type : file + + # The location where deltas are stored on disk. This should be changed. + # Note: This is only used when using the file delta store. It is ignored + # for other data store types. + delta_store_directory : _deltas + + # The location where user sessions are persisted on disk. This allow to restore user sessions + # between restarts. + sessions_store_directory : _sessions + + # Currently supported search types: memory, lucene, solr. + search_type : memory + + # The location where search indexes are stored on disk. + # Note: This is only used when using the lucene search type. It is ignored + # for other search types. + index_directory : _indexes + + # Currently supported profile fetcher types: gravatar, initials. + profile_fetcher_type : initials + + # The Solr endpoint url. + solr_base_url : "http://localhost:8983/solr"; + + # Enables server side profiling. To display the stats press ctrl+alt+ctrl in the web client. + # Default value: true + enable_profiling : true + + # Mongodb connection options + # Only used if some of the *_store_type properties are set to 'mongodb' + + # Server's host name or IP address. + mongodb_host : "127.0.0.1" + + # Server's port. Default value: 27017 + mongodb_port : 27017 + + # Database's name. Default name: wiab + mongodb_database : wiab +} + +network { + # Max age of session cookie in seconds. + # -1 means cookie lives in the browser current session only. + session_cookie_max_age : -1 + + # The time in ms that the websocket connection can be idle before closing + websocket_max_idle_time : 0 + + # Maximum websocket message size to be received in MB + websocket_max_message_size : 2 +} + +administration { + # Note: the default value for admin is an invalid user id that cannot be registered. + # To become an admin: Register a user and set its address as the value below. + # Admin has a privilege to change passwords of other users using an agent robot. + admin_user : "@" + + # The wave id of the welcome template wave. (Without domain, for example: w+Fxjs_-ZPmmA). + # If filled in then a copy of this wave (actually only the root blip) will be + # automatically added to the inbox of every new user. + welcome_wave_id : "" + + # Set true to prevent anyone registering on your server. + # When true, only the admin user can use the RegistrationRobot to add new accounts + disable_registration : false + + # Disable login page - useful to force x509-only authentication + disable_loginpage : false + + # Google Analytics account. + analytics_account : "" +} + +threads { + # The number of threads to listen on wavelet updates. Default value: 1 + listener_executor_thread_count : 1 + + # The number of threads for loading wavelets. Default value: 1 + wavelet_load_executor_thread_count : 1 + + # The number of threads to persist deltas. Default value: 1 + delta_persist_executor_thread_count : 1 + + # The number of threads to perform post wavelet loading logic. Default value: 1 + storage_continuation_executor_thread_count : 1 + + # The number of threads for looking up the wavelet ids + # while creating a list of all wavelets in the persistent storage. Default value: 1 + lookup_executor_thread_count : 1 + + # The number of threads for making search/update requests to Solr. Default value: 1 + solr_thread_count : 1 + + # The number of threads for making for retrieving contacts. + contact_executor_thread_count : 1 +} + +security { + # Enable SSL for all address/port combinations listed (makes the next 2 settings non-optional). + enable_ssl : false + + # Path to keystore containg the ssl certificates to server + # Note: this is only used when enable_ssl set to true. + ssl_keystore_path : wiab.ks + + # Password to the keystore. + # Note: this is only used when enable_ssl set to true. + ssl_keystore_password : changeme + + # Enable client x509 cert. authentication? + enable_clientauth : false + + # Domain of the email to look for as email field of x509 client auth certificates when using client authentication + clientauth_cert_domain : "" +} + +federation { + # Federation Configuration for the Wave in a Box server + enable_federation : false + + # These will probably need to be changed + xmpp_server_secret : secret + + # The PKCS#8-PEM-encoded private key. + certificate_private_key : "local.net.key" + + # The list of file names that have the certificates of this signer. + # The first file name must have the signer's target certificate. The certificates can be DER or PEM encoded. + # The order of certificates is important. Place intermediate certs + # after "${wave_server_domain}.crt". Please refer to + # http://www.waveprotocol.org/federation/certificates + # for more details. + certificate_files : ["local.net.crt","sub.class1.server.ca.pem","ca.pem"] + + # The domain for which the certificate was issued. + certificate_domain : "local.net" + + xmpp_component_name : wave + + # This server's local JID + xmpp_jid : "wave.local.net" + + xmpp_server_description : "Wave in a Box" + + disco_info_category : "collaboration" + + disco_info_type : "apache-wave" + + xmpp_server_hostname : "local.net" + + xmpp_server_component_port : 5275 + + # How long to cache failed disco results. + xmpp_disco_failed_expiry : 300s + + # How long to cache successful disco results. + xmpp_disco_successful_expiry : 7200s + + disco_expiration : 6h + + # Set XMPP_SERVER_IP to localhost if the XMPP and Wave in a Box servers are + # running on the same host + xmpp_server_ip : localhost + + # Set true to disable the verification of signed deltas + waveserver_disable_verification : true + + # Set true to disable the verification of signers (certificates) + waveserver_disable_signer_verification : true +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/650d494f/wave/config/server-config.xml ---------------------------------------------------------------------- diff --git a/wave/config/server-config.xml b/wave/config/server-config.xml new file mode 100644 index 0000000..deb5f3b --- /dev/null +++ b/wave/config/server-config.xml @@ -0,0 +1,65 @@ +<!-- + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + --> +<project name="server config" basedir="../" default="prosody-config"> + <description>Creates the server configuration file.</description> + + <property name="wave_server_domain" value="local.net" /> + <property name="xmpp_server_secret" value="opensesame" /> + <property name="certificate_private_key" value="${wave_server_domain}.key" /> + <property name="certificate_files" value="${wave_server_domain}.crt,sub.class1.server.ca.pem,ca.pem" /> + <property name="certificate_domain" value="${wave_server_domain}" /> + <property name="xmpp_component_name" value="wave" /> + <property name="xmpp_jid" value="${xmpp_component_name}.${wave_server_domain}" /> + <property name="xmpp_server_description" value=""Wave in a Box"" /> + <property name="xmpp_server_hostname" value="${wave_server_domain}" /> + <property name="xmpp_server_component_port" value="5275" /> + <property name="xmpp_server_to_server_port" value="5269" /> + <property name="xmpp_server_ping" value="wavesandbox.com" /> + <property name="xmpp_server_ip" value="${xmpp_server_hostname}" /> + <property name="waveserver_disable_verification" value="false" /> + <property name="waveserver_disable_signer_verification" value="false" /> + + + <target name="prosody-config" + description="Run to create the prosody configuration files. + ant -f server-config.xml prosody-config"> + <echo>Generating ${certificate_domain}.cfg.lua</echo> + <copy file="${certificate_domain}.cfg.lua" + tofile="${certificate_domain}.cfg.lua.old" + overwrite="true" + failonerror="false" /> + <copy file="prosody.cfg.lua.example" tofile="${certificate_domain}.cfg.lua" overwrite="true"> + <filterchain> + <replacetokens> + <token key="BASEDIR" value="${basedir}" /> + <token key="XMPP_SERVER_SECRET" value="${xmpp_server_secret}" /> + <token key="CERTIFICATE_PRIVATE_KEY" value="${certificate_private_key}" /> + <token key="CERTIFICATE_DOMAIN" value="${certificate_domain}" /> + <token key="XMPP_JID" value="${xmpp_jid}" /> + <token key="XMPP_SERVER_DESCRIPTION" value="${xmpp_server_description}" /> + <token key="XMPP_SERVER_COMPONENT_PORT" value="${xmpp_server_component_port}" /> + <token key="XMPP_SERVER_TO_SERVER_PORT" value="${xmpp_server_to_server_port}" /> + </replacetokens> + </filterchain> + </copy> + <echo>Please, manually copy ${certificate_domain}.cfg.lua to your prosody configuration directory.</echo> + <echo>E.g. sudo cp ${certificate_domain}.cfg.lua /etc/prosody/conf.d/${certificate_domain}.cfg.lua</echo> + <echo>Additionally, ensure your ${certificate_domain} SRV record points to port ${xmpp_server_to_server_port}</echo> + </target> +</project> http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/650d494f/wave/config/wiab-logging.conf ---------------------------------------------------------------------- diff --git a/wave/config/wiab-logging.conf b/wave/config/wiab-logging.conf new file mode 100644 index 0000000..3b4cc37 --- /dev/null +++ b/wave/config/wiab-logging.conf @@ -0,0 +1,47 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the Licensae. +# +# This file sets up console and file logging for the wiab server + +handlers=java.util.logging.FileHandler, java.util.logging.ConsoleHandler + +# Available log levels are: +# ALL, FINEST, FINER, FINE, CONFIG, INFO, WARNING, SEVERE, OFF + +# Default global logging level. +# Loggers and Handlers may override this level +.level=INFO + +java.util.logging.ConsoleHandler.level = INFO +java.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter + +java.util.logging.FileHandler.level = ALL +java.util.logging.FileHandler.pattern = wiab-server.log +java.util.logging.FileHandler.count=5 +java.util.logging.FileHandler.append=false +java.util.logging.FileHandler.formatter = java.util.logging.SimpleFormatter +java.util.logging.FileHandler.limit=5242880 + +# Per-package logging levels. +# Add extra packages here to increase or decrease the log level +# per-package levels affect both console and file output + +org.eclipse.jetty.level = SEVERE +org.eclipse.jetty.websocket.level = SEVERE + +#org.waveprotocol.level=ALL +
