cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aadamc...@apache.org
Subject svn commit: r552547 - in /cayenne/main/trunk/build-tools/maven-cayenne-doc-plugin: .settings/ src/main/java/org/apache/cayenne/maven/plugin/confluence/ src/test/java/org/ src/test/java/org/apache/ src/test/java/org/apache/cayenne/ src/test/java/org/apa...
Date Mon, 02 Jul 2007 17:09:49 GMT
Author: aadamchik
Date: Mon Jul  2 10:09:47 2007
New Revision: 552547

URL: http://svn.apache.org/viewvc?view=rev&rev=552547
Log:
CAY-822 Wikidocs table of contents ordering is broken

Added:
    cayenne/main/trunk/build-tools/maven-cayenne-doc-plugin/.settings/
    cayenne/main/trunk/build-tools/maven-cayenne-doc-plugin/.settings/org.eclipse.jdt.core.prefs
    cayenne/main/trunk/build-tools/maven-cayenne-doc-plugin/.settings/org.eclipse.jdt.ui.prefs
    cayenne/main/trunk/build-tools/maven-cayenne-doc-plugin/src/main/java/org/apache/cayenne/maven/plugin/confluence/AlphabeticalTitleComparator.java
    cayenne/main/trunk/build-tools/maven-cayenne-doc-plugin/src/main/java/org/apache/cayenne/maven/plugin/confluence/PreorderedTitleComparator.java
    cayenne/main/trunk/build-tools/maven-cayenne-doc-plugin/src/test/java/org/
    cayenne/main/trunk/build-tools/maven-cayenne-doc-plugin/src/test/java/org/apache/
    cayenne/main/trunk/build-tools/maven-cayenne-doc-plugin/src/test/java/org/apache/cayenne/
    cayenne/main/trunk/build-tools/maven-cayenne-doc-plugin/src/test/java/org/apache/cayenne/maven/
    cayenne/main/trunk/build-tools/maven-cayenne-doc-plugin/src/test/java/org/apache/cayenne/maven/plugin/
    cayenne/main/trunk/build-tools/maven-cayenne-doc-plugin/src/test/java/org/apache/cayenne/maven/plugin/confluence/
    cayenne/main/trunk/build-tools/maven-cayenne-doc-plugin/src/test/java/org/apache/cayenne/maven/plugin/confluence/DocPageTest.java
Modified:
    cayenne/main/trunk/build-tools/maven-cayenne-doc-plugin/src/main/java/org/apache/cayenne/maven/plugin/confluence/DocGenerator.java
    cayenne/main/trunk/build-tools/maven-cayenne-doc-plugin/src/main/java/org/apache/cayenne/maven/plugin/confluence/DocPage.java

Added: cayenne/main/trunk/build-tools/maven-cayenne-doc-plugin/.settings/org.eclipse.jdt.core.prefs
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/build-tools/maven-cayenne-doc-plugin/.settings/org.eclipse.jdt.core.prefs?view=auto&rev=552547
==============================================================================
--- cayenne/main/trunk/build-tools/maven-cayenne-doc-plugin/.settings/org.eclipse.jdt.core.prefs (added)
+++ cayenne/main/trunk/build-tools/maven-cayenne-doc-plugin/.settings/org.eclipse.jdt.core.prefs Mon Jul  2 10:09:47 2007
@@ -0,0 +1,253 @@
+#Sun Nov 06 11:58:01 MSK 2005
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4
+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=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
+org.eclipse.jdt.core.compiler.source=1.4
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=48
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=48
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=48
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=48
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=48
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+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=48
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=48
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+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=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=1
+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_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=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_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=end_of_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=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines=true
+org.eclipse.jdt.core.formatter.comment.format_comments=true
+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_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=do not insert
+org.eclipse.jdt.core.formatter.comment.line_length=90
+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_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_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=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=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=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=do not 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=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=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=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not 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=do not 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=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_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=90
+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=true
+org.eclipse.jdt.core.formatter.tabulation.char=space
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false

Added: cayenne/main/trunk/build-tools/maven-cayenne-doc-plugin/.settings/org.eclipse.jdt.ui.prefs
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/build-tools/maven-cayenne-doc-plugin/.settings/org.eclipse.jdt.ui.prefs?view=auto&rev=552547
==============================================================================
--- cayenne/main/trunk/build-tools/maven-cayenne-doc-plugin/.settings/org.eclipse.jdt.ui.prefs (added)
+++ cayenne/main/trunk/build-tools/maven-cayenne-doc-plugin/.settings/org.eclipse.jdt.ui.prefs Mon Jul  2 10:09:47 2007
@@ -0,0 +1,8 @@
+#Tue Jul 18 15:18:47 EDT 2006
+eclipse.preferences.version=1
+formatter_settings_version=8
+internal.default.compliance=user
+org.eclipse.jdt.ui.ignorelowercasenames=true
+org.eclipse.jdt.ui.importorder=java;javax;org;com;
+org.eclipse.jdt.ui.ondemandthreshold=99
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment"></template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment"></template><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"></template><template autoinsert\="true" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecom
 ment" name\="filecomment">/**\n * \n */</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author \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"></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"></template><template autoinsert\="true" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment"></template><templ
 ate autoinsert\="false" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">/*****************************************************************\n *   Licensed to the Apache Software Foundation (ASF) under one\n *  or more contributor license agreements.  See the NOTICE file\n *  distributed with this work for additional information\n *  regarding copyright ownership.  The ASF licenses this file\n *  to you under the Apache License, Version 2.0 (the\n *  "License"); you may not use this file except in compliance\n *  with the License.  You may obtain a copy of the License at\n *\n *    http\://www.apache.org/licenses/LICENSE-2.0\n *\n *  Unless required by applicable law or agreed to in writing,\n *  software distributed under the License is distributed on an\n *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY\n *  KIND, either express or implied.  See the Lic
 ense for the\n *  specific language governing permissions and limitations\n *  under the License.\n ****************************************************************/\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" 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\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">${body_statement}</template><template autoinsert\="true" 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><t
 emplate 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><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\="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\="t
 rue" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.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></templates>

Added: cayenne/main/trunk/build-tools/maven-cayenne-doc-plugin/src/main/java/org/apache/cayenne/maven/plugin/confluence/AlphabeticalTitleComparator.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/build-tools/maven-cayenne-doc-plugin/src/main/java/org/apache/cayenne/maven/plugin/confluence/AlphabeticalTitleComparator.java?view=auto&rev=552547
==============================================================================
--- cayenne/main/trunk/build-tools/maven-cayenne-doc-plugin/src/main/java/org/apache/cayenne/maven/plugin/confluence/AlphabeticalTitleComparator.java (added)
+++ cayenne/main/trunk/build-tools/maven-cayenne-doc-plugin/src/main/java/org/apache/cayenne/maven/plugin/confluence/AlphabeticalTitleComparator.java Mon Jul  2 10:09:47 2007
@@ -0,0 +1,30 @@
+/*****************************************************************
+ *   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.
+ ****************************************************************/
+package org.apache.cayenne.maven.plugin.confluence;
+
+import java.util.Comparator;
+
+class AlphabeticalTitleComparator implements Comparator {
+
+    public int compare(Object arg0, Object arg1) {
+        DocPage child0 = (DocPage) arg0;
+        DocPage child1 = (DocPage) arg1;
+        return (child0.getTitle().compareTo(child1.getTitle()));
+    }
+}
\ No newline at end of file

Modified: cayenne/main/trunk/build-tools/maven-cayenne-doc-plugin/src/main/java/org/apache/cayenne/maven/plugin/confluence/DocGenerator.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/build-tools/maven-cayenne-doc-plugin/src/main/java/org/apache/cayenne/maven/plugin/confluence/DocGenerator.java?view=diff&rev=552547&r1=552546&r2=552547
==============================================================================
--- cayenne/main/trunk/build-tools/maven-cayenne-doc-plugin/src/main/java/org/apache/cayenne/maven/plugin/confluence/DocGenerator.java (original)
+++ cayenne/main/trunk/build-tools/maven-cayenne-doc-plugin/src/main/java/org/apache/cayenne/maven/plugin/confluence/DocGenerator.java Mon Jul  2 10:09:47 2007
@@ -100,19 +100,20 @@
 		}
 	}
 
+	/**
+	 * Main worker method for documentation generation from Wiki.
+	 */
 	public void generateDocs() throws Exception {
 
 		login();
-
 		createPath(docBase);
 
 		// Build a page hierarchy first..
-		DocPage page = getPage(null, startPage);
+		DocPage root = getPage(null, startPage);
 
-		iterateChildren(page);
+		iterateChildren(root);
 
-		// Now render the content nodes..
-		renderPage(page, docBase);
+		renderPage(root, docBase);
 	}
 
 	protected void iterateChildren(DocPage parent) throws Exception {
@@ -141,7 +142,6 @@
 				.hasNext();) {
 			renderPage((DocPage) childIter.next(), currentPath);
 		}
-
 	}
 
 	protected RemotePageSummary[] getChildren(DocPage page) throws Exception {
@@ -189,7 +189,6 @@
 
 	protected void createPath(String path) {
 		new File(path).mkdirs();
-
 	}
 
 	public String getBaseUrl() {

Modified: cayenne/main/trunk/build-tools/maven-cayenne-doc-plugin/src/main/java/org/apache/cayenne/maven/plugin/confluence/DocPage.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/build-tools/maven-cayenne-doc-plugin/src/main/java/org/apache/cayenne/maven/plugin/confluence/DocPage.java?view=diff&rev=552547&r1=552546&r2=552547
==============================================================================
--- cayenne/main/trunk/build-tools/maven-cayenne-doc-plugin/src/main/java/org/apache/cayenne/maven/plugin/confluence/DocPage.java (original)
+++ cayenne/main/trunk/build-tools/maven-cayenne-doc-plugin/src/main/java/org/apache/cayenne/maven/plugin/confluence/DocPage.java Mon Jul  2 10:09:47 2007
@@ -31,179 +31,155 @@
 import java.util.regex.Pattern;
 
 /**
- * Represents a TOC entry. This has a lot of tree-like search functions, but I
- * did not find a tree implementation that I thought was worth using for this.
+ * Represents a TOC entry. This has a lot of tree-like search functions, but I did not
+ * find a tree implementation that I thought was worth using for this.
  * 
  * @author Cris Daniluk
  */
 public class DocPage {
 
-	private static final Pattern orderingPattern = Pattern
-			.compile("\n?\\{excerpt(.*?)\\}");
+    private static final Pattern TOC_BLOCK = Pattern.compile("\n?\\{excerpt(.*?)\\}");
+    private static final Pattern TOC_LINE = Pattern.compile("\\[([^|]*\\|)?(.+)\\]");
 
-	private static final Map titleMap = new HashMap();
+    private static final Map titleMap = new HashMap();
 
-	private String title = null;
+    private String title;
 
-	private long id;
-
-	private String rawContent;
-
-	private DocPage parentRef;
-
-	private List children = null;
-
-	private List ordering;
-
-	private int depth;
-
-	public static DocPage getPageByTitle(String title) {
-		return (DocPage) titleMap.get(title);
-	}
-
-	public DocPage(DocPage parentRef, String title, long id, String rawContent) {
-		this.parentRef = parentRef;
-		this.title = title;
-		this.id = id;
-		this.rawContent = rawContent;
-
-		titleMap.put(title, this);
-
-		// Look for a page ordering...
-		Matcher matcher = orderingPattern.matcher(rawContent);
-		if (matcher.find()) {
-			int regionStart = matcher.end() + 1;
-			matcher.find();
-
-			ordering = Arrays.asList(rawContent.substring(regionStart,
-					matcher.start()).split("\n"));
-
-		}
-
-		if (parentRef == null) {
-			depth = 1;
-		} else if (ordering == null && parentRef.ordering != null) {
-			ordering = parentRef.ordering;
-		}
-
-		children = new ArrayList();
-	}
-
-	public void addChild(DocPage child) {
-		child.depth = depth + 1;
-		children.add(child);
-	}
-
-	public String getTitle() {
-		return title;
-	}
-
-	public int getDepth() {
-		return depth;
-	}
-
-	public List getChildren() {
-		// If an ordering is present, sort by it...
-		if (ordering != null) {
-
-			Collections.sort(children, new Comparator() {
-
-				public int compare(Object arg0, Object arg1) {
-					// we're the only one who modified this list, so we can
-					// trust it
-					// (and live with the consequences if we're wrong)
-					DocPage child0 = (DocPage) arg0;
-					DocPage child1 = (DocPage) arg1;
-
-					if (child0.getTitle().equals(child1.getTitle())) {
-						return 0;
-					} else if (ordering.indexOf(child1.getTitle()) == -1) {
-						// if its not on the list, float it to the bottom
-						return 1;
-					}
-					if (ordering.indexOf(child0.getTitle()) < ordering
-							.indexOf(child1.getTitle())) {
-						return -1;
-					} else {
-						return 1;
-					}
-				}
-
-			});
-		} else {
-
-			// no beanutils, so do this manually...
-			Collections.sort(children, new Comparator() {
-
-				public int compare(Object arg0, Object arg1) {
-					DocPage child0 = (DocPage) arg0;
-					DocPage child1 = (DocPage) arg1;
-					return (child0.getTitle().compareTo(child1.getTitle()));
-				}
-
-			});
-		}
-		return Collections.unmodifiableList(children);
-	}
-
-	public long getId() {
-		return id;
-	}
-
-	public String getRawContent() {
-		return rawContent;
-	}
-
-	public DocPage getParentRef() {
-		return parentRef;
-	}
-
-	public DocPage findPageId(long searchId) {
-
-		return findChild(this, searchId);
-	}
-
-	public boolean hasDescendent(DocPage page) {
-		if (findChild(this, page.getId()) != null) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Get the "module" root. This returns the next-to-top element in the tree.
-	 */
-	public DocPage getRoot() {
-		DocPage base = this;
-		while (base.parentRef != null && base.parentRef.parentRef != null) {
-			base = base.parentRef;
-		}
-		return base;
-	}
-
-	private DocPage findChild(DocPage page, long searchId) {
-
-		if (page.getId() == searchId) {
-			return page;
-		}
-		Iterator pageIter = page.getChildren().iterator();
-		while (pageIter.hasNext()) {
-			DocPage match = findChild((DocPage) pageIter.next(), searchId);
-			if (match != null) {
-				return match;
-			}
-		}
-		return null;
-	}
-
-	public String getLinkPath() {
-		return buildLinkPath(this);
-	}
-
-	private String buildLinkPath(DocPage page) {
-		if (page.getParentRef() == null) {
-			return page.getTitle();
-		}
-		return buildLinkPath(page.getParentRef()) + "/" + page.getTitle();
-	}
+    private long id;
+    private String rawContent;
+    private DocPage parentRef;
+    private List children;
+    private Comparator ordering;
+    private int depth;
+
+    public static DocPage getPageByTitle(String title) {
+        return (DocPage) titleMap.get(title);
+    }
+
+    DocPage(String title) {
+        this.title = title;
+    }
+
+    public DocPage(DocPage parentRef, String title, long id, String rawContent) {
+        this.parentRef = parentRef;
+        this.title = title;
+        this.id = id;
+        this.rawContent = rawContent;
+        this.children = new ArrayList();
+        this.ordering = createChildOrdering(rawContent);
+
+        titleMap.put(title, this);
+
+        if (parentRef == null) {
+            depth = 1;
+        }
+    }
+
+    /**
+     * Infers the order of children based on the content "excerpt" tags.
+     */
+    Comparator createChildOrdering(String rawContent) {
+        Matcher matcher = TOC_BLOCK.matcher(rawContent);
+        if (matcher.find()) {
+            int regionStart = matcher.end() + 1;
+            matcher.find();
+
+            List lines = Arrays.asList(rawContent
+                    .substring(regionStart, matcher.start())
+                    .split("\n"));
+
+            List titles = new ArrayList(lines.size());
+            Iterator it = lines.iterator();
+            while (it.hasNext()) {
+                Matcher lineMatcher = TOC_LINE.matcher((String) it.next());
+                if (lineMatcher.find()) {
+                    titles.add(lineMatcher.group(2));
+                }
+            }
+
+            return new PreorderedTitleComparator(titles);
+        }
+        else {
+            return new AlphabeticalTitleComparator();
+        }
+    }
+
+    public void addChild(DocPage child) {
+        child.depth = depth + 1;
+        children.add(child);
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public int getDepth() {
+        return depth;
+    }
+
+    public List getChildren() {
+        Collections.sort(children, ordering);
+        return Collections.unmodifiableList(children);
+    }
+
+    public long getId() {
+        return id;
+    }
+
+    public String getRawContent() {
+        return rawContent;
+    }
+
+    public DocPage getParentRef() {
+        return parentRef;
+    }
+
+    public DocPage findPageId(long searchId) {
+
+        return findChild(this, searchId);
+    }
+
+    public boolean hasDescendent(DocPage page) {
+        if (findChild(this, page.getId()) != null) {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Get the "module" root. This returns the next-to-top element in the tree.
+     */
+    public DocPage getRoot() {
+        DocPage base = this;
+        while (base.parentRef != null && base.parentRef.parentRef != null) {
+            base = base.parentRef;
+        }
+        return base;
+    }
+
+    private DocPage findChild(DocPage page, long searchId) {
+
+        if (page.getId() == searchId) {
+            return page;
+        }
+        Iterator pageIter = page.getChildren().iterator();
+        while (pageIter.hasNext()) {
+            DocPage match = findChild((DocPage) pageIter.next(), searchId);
+            if (match != null) {
+                return match;
+            }
+        }
+        return null;
+    }
+
+    public String getLinkPath() {
+        return buildLinkPath(this);
+    }
+
+    private String buildLinkPath(DocPage page) {
+        if (page.getParentRef() == null) {
+            return page.getTitle();
+        }
+        return buildLinkPath(page.getParentRef()) + "/" + page.getTitle();
+    }
 }

Added: cayenne/main/trunk/build-tools/maven-cayenne-doc-plugin/src/main/java/org/apache/cayenne/maven/plugin/confluence/PreorderedTitleComparator.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/build-tools/maven-cayenne-doc-plugin/src/main/java/org/apache/cayenne/maven/plugin/confluence/PreorderedTitleComparator.java?view=auto&rev=552547
==============================================================================
--- cayenne/main/trunk/build-tools/maven-cayenne-doc-plugin/src/main/java/org/apache/cayenne/maven/plugin/confluence/PreorderedTitleComparator.java (added)
+++ cayenne/main/trunk/build-tools/maven-cayenne-doc-plugin/src/main/java/org/apache/cayenne/maven/plugin/confluence/PreorderedTitleComparator.java Mon Jul  2 10:09:47 2007
@@ -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.
+ ****************************************************************/
+package org.apache.cayenne.maven.plugin.confluence;
+
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.List;
+
+/**
+ * A comparator of pages based on preset case-insensitive ordering of titles.
+ * 
+ * @author Andrus Adamchik
+ */
+class PreorderedTitleComparator implements Comparator {
+
+    private List titles;
+
+    PreorderedTitleComparator(List titles) {
+        this.titles = new ArrayList(titles.size());
+        Iterator it = titles.iterator();
+        while (it.hasNext()) {
+            String title = (String) it.next();
+            this.titles.add(title.toUpperCase());
+        }
+    }
+
+    public int compare(Object o1, Object o2) {
+        DocPage child0 = (DocPage) o1;
+        DocPage child1 = (DocPage) o2;
+
+        String title0 = child0.getTitle().toUpperCase();
+        String title1 = child1.getTitle().toUpperCase();
+
+        if (title0.equals(title1)) {
+            return 0;
+        }
+        else if (titles.indexOf(title1) == -1) {
+            // if its not on the list, float it to the bottom
+            return 1;
+        }
+        if (titles.indexOf(title0) < titles.indexOf(title1)) {
+            return -1;
+        }
+        else {
+            return 1;
+        }
+    }
+}
\ No newline at end of file

Added: cayenne/main/trunk/build-tools/maven-cayenne-doc-plugin/src/test/java/org/apache/cayenne/maven/plugin/confluence/DocPageTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/build-tools/maven-cayenne-doc-plugin/src/test/java/org/apache/cayenne/maven/plugin/confluence/DocPageTest.java?view=auto&rev=552547
==============================================================================
--- cayenne/main/trunk/build-tools/maven-cayenne-doc-plugin/src/test/java/org/apache/cayenne/maven/plugin/confluence/DocPageTest.java (added)
+++ cayenne/main/trunk/build-tools/maven-cayenne-doc-plugin/src/test/java/org/apache/cayenne/maven/plugin/confluence/DocPageTest.java Mon Jul  2 10:09:47 2007
@@ -0,0 +1,148 @@
+/*****************************************************************
+ *   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.
+ ****************************************************************/
+package org.apache.cayenne.maven.plugin.confluence;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
+import junit.framework.TestCase;
+
+public class DocPageTest extends TestCase {
+
+    public void testCreateChildOrdering1() {
+
+        String ex = "{excerpt}\n"
+                + "[c4]\n"
+                + "[c2]\n"
+                + "[c3]\n"
+                + "[c1]\n"
+                + "{excerpt}";
+
+        DocPage parent = new DocPage("parent");
+
+        Comparator ordering = parent.createChildOrdering(ex);
+        List children = createChildren();
+        Collections.sort(children, ordering);
+
+        assertEquals("c4", ((DocPage) children.get(0)).getTitle());
+        assertEquals("c2", ((DocPage) children.get(1)).getTitle());
+        assertEquals("c3", ((DocPage) children.get(2)).getTitle());
+        assertEquals("c1", ((DocPage) children.get(3)).getTitle());
+    }
+
+    public void testCreateChildOrdering2() {
+
+        String ex = "{excerpt}\n"
+                + "# [c4]\n"
+                + "# [c2]\n"
+                + "# [c3]\n"
+                + "# [c1]\n"
+                + "{excerpt}";
+
+        DocPage parent = new DocPage("parent");
+
+        Comparator ordering = parent.createChildOrdering(ex);
+        List children = createChildren();
+        Collections.sort(children, ordering);
+
+        assertEquals("c4", ((DocPage) children.get(0)).getTitle());
+        assertEquals("c2", ((DocPage) children.get(1)).getTitle());
+        assertEquals("c3", ((DocPage) children.get(2)).getTitle());
+        assertEquals("c1", ((DocPage) children.get(3)).getTitle());
+    }
+
+    public void testCreateChildOrdering3() {
+
+        String ex = "{excerpt}\n"
+                + "[X|c4]\n"
+                + "[M|c2]\n"
+                + "[Z a|c3]\n"
+                + "[c1]\n"
+                + "{excerpt}";
+
+        DocPage parent = new DocPage("parent");
+
+        Comparator ordering = parent.createChildOrdering(ex);
+        List children = createChildren();
+        Collections.sort(children, ordering);
+
+        assertEquals("c4", ((DocPage) children.get(0)).getTitle());
+        assertEquals("c2", ((DocPage) children.get(1)).getTitle());
+        assertEquals("c3", ((DocPage) children.get(2)).getTitle());
+        assertEquals("c1", ((DocPage) children.get(3)).getTitle());
+    }
+
+    public void testCreateChildOrdering4() {
+
+        String ex = "{excerpt}\n"
+                + "[c4 yy]\n"
+                + "[c2 ww]\n"
+                + "[c3 aa]\n"
+                + "[c1 xx]\n"
+                + "{excerpt}";
+
+        DocPage parent = new DocPage("parent");
+
+        Comparator ordering = parent.createChildOrdering(ex);
+        List children = new ArrayList(4);
+        children.add(new DocPage("c1 xx"));
+        children.add(new DocPage("c2 ww"));
+        children.add(new DocPage("c3 aa"));
+        children.add(new DocPage("c4 yy"));
+
+        Collections.sort(children, ordering);
+
+        assertEquals("c4 yy", ((DocPage) children.get(0)).getTitle());
+        assertEquals("c2 ww", ((DocPage) children.get(1)).getTitle());
+        assertEquals("c3 aa", ((DocPage) children.get(2)).getTitle());
+        assertEquals("c1 xx", ((DocPage) children.get(3)).getTitle());
+    }
+    
+    public void testCreateChildOrdering5() {
+
+        String ex = "{excerpt}\n"
+                + "# [c4]\n"
+                + "# [C2]\n"
+                + "# [c3]\n"
+                + "# [c1]\n"
+                + "{excerpt}";
+
+        DocPage parent = new DocPage("parent");
+
+        Comparator ordering = parent.createChildOrdering(ex);
+        List children = createChildren();
+        Collections.sort(children, ordering);
+
+        assertEquals("c4", ((DocPage) children.get(0)).getTitle());
+        assertEquals("c2", ((DocPage) children.get(1)).getTitle());
+        assertEquals("c3", ((DocPage) children.get(2)).getTitle());
+        assertEquals("c1", ((DocPage) children.get(3)).getTitle());
+    }
+
+    private List createChildren() {
+        List children = new ArrayList(4);
+        children.add(new DocPage("c1"));
+        children.add(new DocPage("c2"));
+        children.add(new DocPage("c3"));
+        children.add(new DocPage("c4"));
+        return children;
+    }
+}



Mime
View raw message