[jbpm-commits] JBoss JBPM SVN: r3230 - in jbpm3/trunk: modules/core/src/main/java/org/jbpm and 4 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Fri Dec 5 10:30:04 EST 2008
Author: thomas.diesler at jboss.com
Date: 2008-12-05 10:30:04 -0500 (Fri, 05 Dec 2008)
New Revision: 3230
Added:
jbpm3/trunk/eclipse/jbpm.code.style.xml
Removed:
jbpm3/trunk/eclipse/jbpm.profile.xml
Modified:
jbpm3/trunk/modules/core/src/main/java/org/jbpm/JbpmContext.java
jbpm3/trunk/modules/core/src/main/java/org/jbpm/taskmgmt/exe/TaskInstance.java
jbpm3/trunk/modules/core/src/main/java/org/jbpm/taskmgmt/exe/TaskMgmtInstance.java
jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/service/TaskServiceImpl.java
jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/task/TaskImpl.java
jbpm3/trunk/modules/integration/spec/src/test/java/org/jbpm/test/integration/spec/task/TaskTest.java
Log:
Task spec integration - ok
Added: jbpm3/trunk/eclipse/jbpm.code.style.xml
===================================================================
--- jbpm3/trunk/eclipse/jbpm.code.style.xml (rev 0)
+++ jbpm3/trunk/eclipse/jbpm.code.style.xml 2008-12-05 15:30:04 UTC (rev 3230)
@@ -0,0 +1,267 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<profiles version="11">
+<profile kind="CodeFormatterProfile" name="jbpm3.code.style" version="11">
+<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.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="next_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.insert_new_line_in_empty_annotation_declaration" value="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_space_after_opening_paren_in_annotation" value="do not 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.insert_space_between_empty_parens_in_annotation_type_member_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator" 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="do not insert"/>
+<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.indent_breaks_compare_to_cases" value="true"/>
+<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_space_between_empty_parens_in_enum_constant" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement" value="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="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_package" value="1"/>
+<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.5"/>
+<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_opening_paren_in_constructor_declaration" value="do not 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.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.blank_lines_before_member_type" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.align_type_members_on_columns" value="false"/>
+<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.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="true"/>
+<setting id="org.eclipse.jdt.core.formatter.lineSplit" value="164"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert"/>
+<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.insert_space_before_opening_brace_in_constructor_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration" value="0"/>
+<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.alignment_for_superclass_in_type_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_assignment" value="0"/>
+<setting id="org.eclipse.jdt.core.compiler.problem.assertIdentifier" value="error"/>
+<setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="space"/>
+<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.format_guardian_clause_on_one_line" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for" value="insert"/>
+<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="next_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body" value="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="next_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_conditional" value="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_before_closing_bracket_in_array_allocation_expression" 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.insert_space_before_comma_in_type_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.compiler.problem.enumIdentifier" value="error"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_ellipsis" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block" value="next_line"/>
+<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="next_line"/>
+<setting id="org.eclipse.jdt.core.formatter.compact_else_if" 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.insert_space_before_closing_bracket_in_array_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_constant" value="next_line"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.indent_root_tags" value="true"/>
+<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.insert_space_after_comma_in_explicitconstructorcall_arguments" value="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_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_comma_in_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="2"/>
+<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.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_space_before_opening_bracket_in_array_reference" value="do not 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_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_after_assignment_operator" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_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="do not 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="next_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.5"/>
+<setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="2"/>
+<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_before_at_in_annotation_type_declaration" value="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_after_opening_paren_in_cast" value="do not insert"/>
+<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.keep_imple_if_on_one_line" value="false"/>
+<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.insert_space_after_closing_angle_bracket_in_type_parameters" 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.insert_space_after_colon_in_for" 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_before_comma_in_parameterized_type_reference" 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.alignment_for_binary_expression" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration" value="next_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode" value="enabled"/>
+<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.insert_new_line_before_while_in_do_statement" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="168"/>
+<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.insert_space_before_semicolon" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration" value="next_line"/>
+<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.wrap_before_binary_operator" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations" value="1"/>
+<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.indent_statements_compare_to_block" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration" value="16"/>
+<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.alignment_for_compact_if" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits" value="insert"/>
+<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_colon_in_conditional" 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_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_before_opening_paren_in_synchronized" value="insert"/>
+<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_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.compiler.codegen.targetPlatform" value="1.5"/>
+<setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member" value="insert"/>
+<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_new_line_in_empty_block" value="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_space_before_closing_paren_in_parenthesized_expression" 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_closing_paren_in_catch" 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_opening_paren_in_switch" value="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_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="next_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.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.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.never_indent_block_comments_on_first_column" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line" value="false"/>
+</profile>
+</profiles>
Property changes on: jbpm3/trunk/eclipse/jbpm.code.style.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Deleted: jbpm3/trunk/eclipse/jbpm.profile.xml
===================================================================
--- jbpm3/trunk/eclipse/jbpm.profile.xml 2008-12-05 15:28:33 UTC (rev 3229)
+++ jbpm3/trunk/eclipse/jbpm.profile.xml 2008-12-05 15:30:04 UTC (rev 3230)
@@ -1,267 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<profiles version="11">
-<profile kind="CodeFormatterProfile" name="jbpm profile" version="11">
-<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.insert_space_after_colon_in_assert" value="insert"/>
-<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_semicolon" 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.insert_space_before_colon_in_case" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve" value="1"/>
-<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_switch" 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.insert_space_before_parenthesized_expression_in_return" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body" value="insert"/>
-<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.indent_statements_compare_to_body" value="true"/>
-<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_new_line_after_annotation_on_member" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line" value="false"/>
-<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_colon_in_for" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="2"/>
-<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.blank_lines_before_imports" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case" value="insert"/>
-<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.blank_lines_before_new_chunk" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="4"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_binary_operator" 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_after_opening_paren_in_for" 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.alignment_for_parameters_in_method_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_assignment" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_member_type" value="1"/>
-<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.alignment_for_conditional_expression" value="80"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.indent_parameter_description" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_html" 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_after_comma_in_method_declaration_throws" value="insert"/>
-<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.comment.format_source_code" 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.insert_space_before_closing_angle_bracket_in_parameterized_type_reference" value="do not 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_between_empty_parens_in_method_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional" value="insert"/>
-<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_after_question_in_conditional" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indentation.size" value="4"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations" value="insert"/>
-<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_superinterfaces_in_enum_declaration" value="16"/>
-<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_before_semicolon_in_for" 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_after_at_in_annotation_type_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_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.lineSplit" value="160"/>
-<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_before_opening_brace_in_block" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration" value="insert"/>
-<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_before_closing_paren_in_while" 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.comment.clear_blank_lines_in_block_comment" value="false"/>
-<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_new_line_in_empty_enum_constant" value="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_angle_bracket_in_type_parameters" 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.brace_position_for_array_initializer" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration" value="16"/>
-<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.insert_new_line_in_empty_enum_declaration" value="insert"/>
-<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.comment.format_header" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for" 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.insert_new_line_before_else_in_if_statement" value="do not 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_after_opening_paren_in_method_declaration" value="do not 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.alignment_for_multiple_fields" value="16"/>
-<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.insert_space_before_comma_in_explicitconstructorcall_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block" value="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_new_line_before_finally_in_try_statement" 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.insert_space_after_binary_operator" value="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_space_before_opening_brace_in_constructor_declaration" value="insert"/>
-<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.alignment_for_expressions_in_array_initializer" value="16"/>
-<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.brace_position_for_method_declaration" value="end_of_line"/>
-<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.insert_space_between_empty_parens_in_annotation_type_member_declaration" value="do not insert"/>
-<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.insert_space_after_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
-<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_before_field" value="0"/>
-<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_opening_paren_in_method_declaration" value="do not 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.insert_space_after_comma_in_type_parameters" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments" value="true"/>
-<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_paren_in_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_block_comments" value="true"/>
-<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_new_line_in_empty_anonymous_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_binary_expression" value="16"/>
-<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.wrap_before_binary_operator" value="true"/>
-<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_catch" value="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_colon_in_labeled_statement" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode" value="enabled"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter" value="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_new_line_before_while_in_do_statement" value="do not 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_method_declaration_throws" 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_space_before_ellipsis" 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_after_question_in_wildcard" value="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_arguments_in_allocation_expression" value="16"/>
-<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.blank_lines_after_imports" value="1"/>
-<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_opening_brace_in_enum_declaration" value="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_new_line_before_catch_in_try_statement" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.compiler.problem.assertIdentifier" value="error"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block_in_case" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration" value="end_of_line"/>
-<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_for" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_empty_lines" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw" value="insert"/>
-<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.insert_space_after_closing_brace_in_block" value="insert"/>
-<setting id="org.eclipse.jdt.core.compiler.source" value="1.5"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header" value="true"/>
-<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.comment.line_length" value="80"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator" value="do not 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_after_assignment_operator" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.compiler.compliance" value="1.5"/>
-<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_before_closing_angle_bracket_in_type_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.compact_else_if" value="true"/>
-<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_before_comma_in_enum_declarations" value="do not insert"/>
-<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_closing_angle_bracket_in_type_parameters" value="do not 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.use_tabs_only_for_leading_indentations" value="false"/>
-<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_switch" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration" value="16"/>
-<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_before_closing_paren_in_for" 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_before_opening_paren_in_synchronized" value="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_after_comma_in_annotation" 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.indent_switchstatements_compare_to_switch" value="false"/>
-<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_opening_paren_in_annotation" 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_colon_in_default" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.compiler.problem.enumIdentifier" value="error"/>
-<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_between_empty_parens_in_enum_constant" 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_new_line_after_annotation_on_local_variable" value="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.insert_space_after_comma_in_array_initializer" 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_after_opening_paren_in_synchronized" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line" value="false"/>
-<setting id="org.eclipse.jdt.core.compiler.codegen.targetPlatform" value="1.5"/>
-<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_space_before_closing_paren_in_switch" value="do not insert"/>
-<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_compact_if" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert" value="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.insert_space_after_ellipsis" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_block" value="true"/>
-<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.indent_body_declarations_compare_to_type_header" value="true"/>
-<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_comma_in_type_arguments" 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_between_empty_parens_in_method_invocation" 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.brace_position_for_annotation_type_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation" value="16"/>
-<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_before_opening_brace_in_switch" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator" value="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_after_unary_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement" value="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.indent_switchstatements_compare_to_cases" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="2"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.indent_root_tags" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="0"/>
-<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.insert_space_before_closing_paren_in_parenthesized_expression" value="do not 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_throws_clause_in_constructor_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="space"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_package" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments" 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_comma_in_for_inits" value="do not 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_superinterfaces" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_method" value="0"/>
-<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_after_comma_in_for_inits" value="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.insert_space_before_closing_paren_in_cast" value="do not 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.never_indent_block_comments_on_first_column" value="false"/>
-<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_before_opening_paren_in_parenthesized_expression" 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.insert_space_before_closing_paren_in_method_invocation" 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.brace_position_for_block" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer" value="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.insert_space_before_and_in_type_parameter" value="insert"/>
-</profile>
-</profiles>
Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/JbpmContext.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/JbpmContext.java 2008-12-05 15:28:33 UTC (rev 3229)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/JbpmContext.java 2008-12-05 15:30:04 UTC (rev 3230)
@@ -27,8 +27,6 @@
import java.util.Iterator;
import java.util.List;
-import javax.management.ObjectName;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.hibernate.Session;
Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/taskmgmt/exe/TaskInstance.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/taskmgmt/exe/TaskInstance.java 2008-12-05 15:28:33 UTC (rev 3229)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/taskmgmt/exe/TaskInstance.java 2008-12-05 15:30:04 UTC (rev 3230)
@@ -35,6 +35,7 @@
import org.jbpm.context.exe.VariableContainer;
import org.jbpm.context.exe.VariableInstance;
import org.jbpm.graph.def.Event;
+import org.jbpm.graph.def.Identifiable;
import org.jbpm.graph.def.Node;
import org.jbpm.graph.def.Transition;
import org.jbpm.graph.exe.Comment;
@@ -54,7 +55,7 @@
* is one task instance that can be assigned to an actor (read: put in someones task list) and that can trigger the
* coninuation of execution of the token upon completion.
*/
-public class TaskInstance extends VariableContainer implements Assignable
+public class TaskInstance extends VariableContainer implements Identifiable, Assignable
{
private static final long serialVersionUID = 1L;
Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/taskmgmt/exe/TaskMgmtInstance.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/taskmgmt/exe/TaskMgmtInstance.java 2008-12-05 15:28:33 UTC (rev 3229)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/taskmgmt/exe/TaskMgmtInstance.java 2008-12-05 15:30:04 UTC (rev 3230)
@@ -54,48 +54,55 @@
import org.jbpm.taskmgmt.def.Task;
import org.jbpm.taskmgmt.def.TaskMgmtDefinition;
import org.jbpm.taskmgmt.log.TaskCreateLog;
-import org.jbpm.util.ClassLoaderUtil;
import org.jbpm.util.Clock;
/**
* process instance extension for managing tasks on a process instance.
*/
-public class TaskMgmtInstance extends ModuleInstance {
+public class TaskMgmtInstance extends ModuleInstance
+{
private static final long serialVersionUID = 1L;
TaskMgmtDefinition taskMgmtDefinition = null;
- Map swimlaneInstances = null;
- Set taskInstances = null;
- /** non persistent collection that stores all the task instances that have
- * variable updates*/
- Collection taskInstanceVariableUpdates = null;
-
- public TaskMgmtInstance() {
+ Map<String, SwimlaneInstance> swimlaneInstances = null;
+ Set<TaskInstance> taskInstances = null;
+ /**
+ * non persistent collection that stores all the task instances that have variable updates
+ */
+ Collection<TaskInstance> taskInstanceVariableUpdates = null;
+
+ public TaskMgmtInstance()
+ {
}
-
- public TaskMgmtInstance(TaskMgmtDefinition taskMgmtDefinition) {
+
+ public TaskMgmtInstance(TaskMgmtDefinition taskMgmtDefinition)
+ {
this.taskMgmtDefinition = taskMgmtDefinition;
}
// task instances ///////////////////////////////////////////////////////////
- public TaskInstance createTaskInstance() {
+ public TaskInstance createTaskInstance()
+ {
return createTaskInstance(null, (ExecutionContext)null);
}
- public TaskInstance createTaskInstance(Task task) {
+ public TaskInstance createTaskInstance(Task task)
+ {
return createTaskInstance(task, (ExecutionContext)null);
}
- public TaskInstance createTaskInstance(Token token) {
+ public TaskInstance createTaskInstance(Token token)
+ {
return createTaskInstance(null, new ExecutionContext(token));
}
/**
* creates a new task instance on the given token, for the given task.
*/
- public TaskInstance createTaskInstance(Task task, Token token) {
+ public TaskInstance createTaskInstance(Task task, Token token)
+ {
ExecutionContext executionContext = new ExecutionContext(token);
executionContext.setTask(task);
return createTaskInstance(task, executionContext);
@@ -104,7 +111,8 @@
/**
* creates a new task instance on the given task, in the given execution context.
*/
- public TaskInstance createTaskInstance(Task task, ExecutionContext executionContext) {
+ public TaskInstance createTaskInstance(Task task, ExecutionContext executionContext)
+ {
// instantiate the new task instance
TaskInstance taskInstance = instantiateNewTaskInstance(executionContext);
@@ -112,81 +120,95 @@
addTaskInstance(taskInstance);
// initialize the task instance
- if (task!=null) taskInstance.setTask(task);
+ if (task != null)
+ taskInstance.setTask(task);
// assign an id to the task instance
Services.assignId(taskInstance);
// copy the task properties
- /* XXX property initialization was already done in taskInstance.setTask(task)
- String description = null;
- if (task!=null) {
- description = task.getDescription();
- taskInstance.setDescription(description);
- taskInstance.setBlocking(task.isBlocking());
- taskInstance.setSignalling(task.isSignalling());
- }
- */
+ /*
+ * XXX property initialization was already done in taskInstance.setTask(task) String description = null; if
+ * (task!=null) { description = task.getDescription(); taskInstance.setDescription(description);
+ * taskInstance.setBlocking(task.isBlocking()); taskInstance.setSignalling(task.isSignalling()); }
+ */
- if (executionContext!=null) {
+ if (executionContext != null)
+ {
Token token = executionContext.getToken();
taskInstance.setToken(token);
taskInstance.setProcessInstance(token.getProcessInstance());
-
+
taskInstance.initializeVariables();
-
- if (task != null && task.getDueDate()!=null) {
+
+ if (task != null && task.getDueDate() != null)
+ {
Date baseDate;
String dueDateString = task.getDueDate();
String durationString = null;
-
- if (dueDateString.startsWith("#")) {
- String baseDateEL = dueDateString.substring(0,dueDateString.indexOf("}")+1);
+
+ if (dueDateString.startsWith("#"))
+ {
+ String baseDateEL = dueDateString.substring(0, dueDateString.indexOf("}") + 1);
Object result = JbpmExpressionEvaluator.evaluate(baseDateEL, executionContext);
- if (result instanceof Date) {
- baseDate = (Date) result;
- } else if (result instanceof Calendar) {
- baseDate = ((Calendar) result).getTime();
- } else {
- throw new JbpmException("Invalid basedate type: " + baseDateEL + " is of type " + result.getClass().getName() +". Only Date and Calendar are supported");
+ if (result instanceof Date)
+ {
+ baseDate = (Date)result;
}
+ else if (result instanceof Calendar)
+ {
+ baseDate = ((Calendar)result).getTime();
+ }
+ else
+ {
+ throw new JbpmException("Invalid basedate type: " + baseDateEL + " is of type " + result.getClass().getName()
+ + ". Only Date and Calendar are supported");
+ }
int endOfELIndex = dueDateString.indexOf("}");
- if (endOfELIndex < (dueDateString.length() -1) ) {
- char durationSeparator = dueDateString.substring(endOfELIndex+1).trim().charAt(0);
- if (durationSeparator != '+' && durationSeparator != '-'){
+ if (endOfELIndex < (dueDateString.length() - 1))
+ {
+ char durationSeparator = dueDateString.substring(endOfELIndex + 1).trim().charAt(0);
+ if (durationSeparator != '+' && durationSeparator != '-')
+ {
throw new JbpmException("Invalid duedate, + or - missing after EL");
}
- durationString = dueDateString.substring(endOfELIndex+1).trim();
+ durationString = dueDateString.substring(endOfELIndex + 1).trim();
}
- } else {
+ }
+ else
+ {
baseDate = Clock.getCurrentTime();
durationString = dueDateString;
}
Date dueDate;
- if (durationString == null || durationString.length() == 0) {
+ if (durationString == null || durationString.length() == 0)
+ {
dueDate = baseDate;
- } else {
- BusinessCalendar businessCalendar = new BusinessCalendar();
- dueDate = businessCalendar.add(baseDate, new Duration(durationString) );
- }
- taskInstance.setDueDate(dueDate);
+ }
+ else
+ {
+ BusinessCalendar businessCalendar = new BusinessCalendar();
+ dueDate = businessCalendar.add(baseDate, new Duration(durationString));
+ }
+ taskInstance.setDueDate(dueDate);
}
-
-
- try {
+
+ try
+ {
// update the executionContext
executionContext.setTask(task);
executionContext.setTaskInstance(taskInstance);
executionContext.setEventSource(task);
// evaluate the description
- if (task != null) {
+ if (task != null)
+ {
String description = task.getDescription();
- if ( (description!=null)
- && (description.indexOf("#{")!=-1)
- ) {
+ if ((description != null) && (description.indexOf("#{") != -1))
+ {
Object result = JbpmExpressionEvaluator.evaluate(description, executionContext);
- if (result!=null) {
+ if (result != null)
+ {
taskInstance.setDescription(result.toString());
}
}
@@ -196,145 +218,184 @@
taskInstance.create(executionContext);
// if this task instance is created for a task, perform assignment
- if (task!=null) {
+ if (task != null)
+ {
taskInstance.assign(executionContext);
}
-
- } finally {
+
+ }
+ finally
+ {
// clean the executionContext
executionContext.setTask(null);
executionContext.setTaskInstance(null);
executionContext.setEventSource(null);
}
-
- // log this creation
+
+ // log this creation
// WARNING: The events create and assign are fired in the right order, but
// the logs are still not ordered properly.
token.addLog(new TaskCreateLog(taskInstance, taskInstance.getActorId()));
- } else {
+ }
+ else
+ {
taskInstance.create();
}
return taskInstance;
}
- public SwimlaneInstance getInitializedSwimlaneInstance(ExecutionContext executionContext, Swimlane swimlane) {
+ public SwimlaneInstance getInitializedSwimlaneInstance(ExecutionContext executionContext, Swimlane swimlane)
+ {
// initialize the swimlane
- if (swimlaneInstances==null) swimlaneInstances = new HashMap();
- SwimlaneInstance swimlaneInstance = (SwimlaneInstance) swimlaneInstances.get(swimlane.getName());
- if (swimlaneInstance==null) {
+ if (swimlaneInstances == null)
+ swimlaneInstances = new HashMap<String, SwimlaneInstance>();
+ SwimlaneInstance swimlaneInstance = swimlaneInstances.get(swimlane.getName());
+ if (swimlaneInstance == null)
+ {
swimlaneInstance = new SwimlaneInstance(swimlane);
addSwimlaneInstance(swimlaneInstance);
// assign the swimlaneInstance
- performAssignment(swimlane.getAssignmentDelegation(),
- swimlane.getActorIdExpression(),
- swimlane.getPooledActorsExpression(),
- swimlaneInstance,
- executionContext);
+ performAssignment(swimlane.getAssignmentDelegation(), swimlane.getActorIdExpression(), swimlane.getPooledActorsExpression(), swimlaneInstance,
+ executionContext);
}
return swimlaneInstance;
}
-
- public void performAssignment(Delegation assignmentDelegation,
- String actorIdExpression,
- String pooledActorsExpression,
- Assignable assignable,
- ExecutionContext executionContext) {
- try {
- if (assignmentDelegation!=null) {
+
+ public void performAssignment(Delegation assignmentDelegation, String actorIdExpression, String pooledActorsExpression, Assignable assignable,
+ ExecutionContext executionContext)
+ {
+ try
+ {
+ if (assignmentDelegation != null)
+ {
performAssignmentDelegation(assignmentDelegation, assignable, executionContext);
- } else {
- if (actorIdExpression!=null) {
+ }
+ else
+ {
+ if (actorIdExpression != null)
+ {
performAssignmentActorIdExpr(actorIdExpression, assignable, executionContext);
}
- if (pooledActorsExpression!=null) {
+ if (pooledActorsExpression != null)
+ {
performAssignmentPooledActorsExpr(pooledActorsExpression, assignable, executionContext);
}
}
-
- } catch (Exception exception) {
+
+ }
+ catch (Exception exception)
+ {
GraphElement graphElement = executionContext.getEventSource();
- if (graphElement!=null) {
+ if (graphElement != null)
+ {
graphElement.raiseException(exception, executionContext);
- } else {
+ }
+ else
+ {
throw new DelegationException(exception, executionContext);
}
}
}
- void performAssignmentDelegation(Delegation assignmentDelegation, Assignable assignable, ExecutionContext executionContext) throws Exception {
+ void performAssignmentDelegation(Delegation assignmentDelegation, Assignable assignable, ExecutionContext executionContext) throws Exception
+ {
ClassLoader surroundingClassLoader = Thread.currentThread().getContextClassLoader();
- try {
- // set context class loader correctly for delegation class (https://jira.jboss.org/jira/browse/JBPM-1448)
+ try
+ {
+ // set context class loader correctly for delegation class (https://jira.jboss.org/jira/browse/JBPM-1448)
Thread.currentThread().setContextClassLoader(JbpmConfiguration.getProcessClassLoader(executionContext.getProcessDefinition()));
// instantiate the assignment handler
- AssignmentHandler assignmentHandler = (AssignmentHandler) assignmentDelegation.instantiate();
+ AssignmentHandler assignmentHandler = (AssignmentHandler)assignmentDelegation.instantiate();
// invoke the assignment handler
- if (UserCodeInterceptorConfig.userCodeInterceptor != null) {
+ if (UserCodeInterceptorConfig.userCodeInterceptor != null)
+ {
UserCodeInterceptorConfig.userCodeInterceptor.executeAssignment(assignmentHandler, assignable, executionContext);
- } else {
+ }
+ else
+ {
assignmentHandler.assign(assignable, executionContext);
}
- } finally {
+ }
+ finally
+ {
Thread.currentThread().setContextClassLoader(surroundingClassLoader);
- }
+ }
}
- void performAssignmentActorIdExpr(String actorIdExpression, Assignable assignable, ExecutionContext executionContext) {
+ void performAssignmentActorIdExpr(String actorIdExpression, Assignable assignable, ExecutionContext executionContext)
+ {
Object result = null;
String actorId = null;
- try {
+ try
+ {
result = JbpmExpressionEvaluator.evaluate(actorIdExpression, executionContext);
- if (result==null) {
- throw new JbpmException("actor-id expression '"+actorIdExpression+"' returned null");
+ if (result == null)
+ {
+ throw new JbpmException("actor-id expression '" + actorIdExpression + "' returned null");
}
- actorId = (String) result;
- } catch (ClassCastException e) {
- throw new JbpmException("actor-id expression '"+actorIdExpression+"' didn't resolve to a java.lang.String: '"+result+"' ("+result.getClass().getName()+")");
+ actorId = (String)result;
}
+ catch (ClassCastException e)
+ {
+ throw new JbpmException("actor-id expression '" + actorIdExpression + "' didn't resolve to a java.lang.String: '" + result + "' ("
+ + result.getClass().getName() + ")");
+ }
assignable.setActorId(actorId);
}
- void performAssignmentPooledActorsExpr(String pooledActorsExpression, Assignable assignable, ExecutionContext executionContext) {
+ void performAssignmentPooledActorsExpr(String pooledActorsExpression, Assignable assignable, ExecutionContext executionContext)
+ {
String[] pooledActors = null;
Object result = JbpmExpressionEvaluator.evaluate(pooledActorsExpression, executionContext);
- if (result==null) {
- throw new JbpmException("pooled-actors expression '"+pooledActorsExpression+"' returned null");
+ if (result == null)
+ {
+ throw new JbpmException("pooled-actors expression '" + pooledActorsExpression + "' returned null");
}
- if (result instanceof String[]) {
- pooledActors = (String[]) result;
+ if (result instanceof String[])
+ {
+ pooledActors = (String[])result;
- } else if (result instanceof Collection) {
+ }
+ else if (result instanceof Collection)
+ {
Collection collection = (Collection)result;
- pooledActors = (String[]) collection.toArray(new String[collection.size()]);
-
- } else if (result instanceof String) {
+ pooledActors = (String[])collection.toArray(new String[collection.size()]);
+
+ }
+ else if (result instanceof String)
+ {
List pooledActorList = new ArrayList();
- StringTokenizer tokenizer = new StringTokenizer((String) result, ",");
- while (tokenizer.hasMoreTokens()) {
+ StringTokenizer tokenizer = new StringTokenizer((String)result, ",");
+ while (tokenizer.hasMoreTokens())
+ {
pooledActorList.add(tokenizer.nextToken().trim());
}
- pooledActors = (String[]) pooledActorList.toArray(new String[pooledActorList.size()]);
- } else {
- throw new JbpmException("pooled-actors expression '"+pooledActorsExpression+"' didn't resolve to a comma separated String, a Collection or a String[]: '"+result+"' ("+result.getClass().getName()+")");
+ pooledActors = (String[])pooledActorList.toArray(new String[pooledActorList.size()]);
}
+ else
+ {
+ throw new JbpmException("pooled-actors expression '" + pooledActorsExpression + "' didn't resolve to a comma separated String, a Collection or a String[]: '"
+ + result + "' (" + result.getClass().getName() + ")");
+ }
assignable.setPooledActors(pooledActors);
}
/**
- * creates a task instance on the rootToken, and assigns it
- * to the currently authenticated user.
+ * creates a task instance on the rootToken, and assigns it to the currently authenticated user.
*/
- public TaskInstance createStartTaskInstance() {
+ public TaskInstance createStartTaskInstance()
+ {
TaskInstance taskInstance = null;
Task startTask = taskMgmtDefinition.getStartTask();
- if (startTask!=null) {
+ if (startTask != null)
+ {
Token rootToken = processInstance.getRootToken();
ExecutionContext executionContext = new ExecutionContext(rootToken);
taskInstance = createTaskInstance(startTask, executionContext);
@@ -343,29 +404,30 @@
return taskInstance;
}
- TaskInstance instantiateNewTaskInstance(ExecutionContext executionContext) {
- TaskInstanceFactory taskInstanceFactory = (TaskInstanceFactory) JbpmConfiguration.Configs.getObject("jbpm.task.instance.factory");
- if (taskInstanceFactory == null) {
+ TaskInstance instantiateNewTaskInstance(ExecutionContext executionContext)
+ {
+ TaskInstanceFactory taskInstanceFactory = (TaskInstanceFactory)JbpmConfiguration.Configs.getObject("jbpm.task.instance.factory");
+ if (taskInstanceFactory == null)
+ {
throw new JbpmException("jbpm.task.instance.factory was not configured in jbpm.cfg.xml");
}
return taskInstanceFactory.createTaskInstance(executionContext);
}
/**
- * is true if the given token has task instances that keep the
- * token from leaving the current node.
+ * is true if the given token has task instances that keep the token from leaving the current node.
*/
- public boolean hasBlockingTaskInstances(Token token) {
+ public boolean hasBlockingTaskInstances(Token token)
+ {
boolean hasBlockingTasks = false;
- if (taskInstances!=null) {
- Iterator iter = taskInstances.iterator();
- while ( (iter.hasNext())
- && (! hasBlockingTasks)) {
- TaskInstance taskInstance = (TaskInstance) iter.next();
- if ( (! taskInstance.hasEnded())
- && (taskInstance.isBlocking())
- && (token!=null)
- && (token.equals(taskInstance.getToken())) ) {
+ if (taskInstances != null)
+ {
+ Iterator<TaskInstance> iter = taskInstances.iterator();
+ while (iter.hasNext() && !hasBlockingTasks)
+ {
+ TaskInstance taskInstance = iter.next();
+ if ((!taskInstance.hasEnded()) && (taskInstance.isBlocking()) && (token != null) && (token.equals(taskInstance.getToken())))
+ {
hasBlockingTasks = true;
}
}
@@ -376,24 +438,26 @@
/**
* is true if the given token has task instances that are not yet ended.
*/
- public boolean hasUnfinishedTasks(Token token) {
- return (getUnfinishedTasks(token).size()>0);
+ public boolean hasUnfinishedTasks(Token token)
+ {
+ return (getUnfinishedTasks(token).size() > 0);
}
/**
* is the collection of {@link TaskInstance}s on the given token that are not ended.
*/
- public Collection getUnfinishedTasks(Token token) {
- Collection unfinishedTasks = new ArrayList();
- if ( taskInstances != null ) {
- Iterator iter = taskInstances.iterator();
- while (iter.hasNext()) {
- TaskInstance task = (TaskInstance) iter.next();
- if ( (!task.hasEnded())
- && (token!=null)
- && (token.equals(task.getToken()))
- ) {
- unfinishedTasks.add( task );
+ public Collection<TaskInstance> getUnfinishedTasks(Token token)
+ {
+ Collection<TaskInstance> unfinishedTasks = new ArrayList<TaskInstance>();
+ if (taskInstances != null)
+ {
+ Iterator<TaskInstance> iter = taskInstances.iterator();
+ while (iter.hasNext())
+ {
+ TaskInstance task = iter.next();
+ if ((!task.hasEnded()) && (token != null) && (token.equals(task.getToken())))
+ {
+ unfinishedTasks.add(task);
}
}
}
@@ -401,109 +465,135 @@
}
/**
- * is true if there are {@link TaskInstance}s on the given token that can trigger
- * the token to continue.
+ * is true if there are {@link TaskInstance}s on the given token that can trigger the token to continue.
*/
- public boolean hasSignallingTasks(ExecutionContext executionContext) {
- return (getSignallingTasks(executionContext).size()>0);
+ public boolean hasSignallingTasks(ExecutionContext executionContext)
+ {
+ return (getSignallingTasks(executionContext).size() > 0);
}
/**
- * is the collection of {@link TaskInstance}s for the given token that can trigger
- * the token to continue.
+ * is the collection of {@link TaskInstance}s for the given token that can trigger the token to continue.
*/
- public Collection getSignallingTasks(ExecutionContext executionContext) {
- Collection signallingTasks = new ArrayList();
- if ( taskInstances != null ) {
- Iterator iter = taskInstances.iterator();
- while (iter.hasNext()) {
- TaskInstance taskInstance = (TaskInstance) iter.next();
- if (taskInstance.isSignalling()
- &&(executionContext.getToken().equals(taskInstance.getToken()))) {
+ public Collection<TaskInstance> getSignallingTasks(ExecutionContext executionContext)
+ {
+ Collection<TaskInstance> signallingTasks = new ArrayList<TaskInstance>();
+ if (taskInstances != null)
+ {
+ Iterator<TaskInstance> iter = taskInstances.iterator();
+ while (iter.hasNext())
+ {
+ TaskInstance taskInstance = iter.next();
+ if (taskInstance.isSignalling() && (executionContext.getToken().equals(taskInstance.getToken())))
+ {
signallingTasks.add(taskInstance);
}
}
}
return signallingTasks;
}
-
+
/**
- * returns all the taskInstances for the this process instance. This
- * includes task instances that have been completed previously.
+ * returns all the taskInstances for the this process instance. This includes task instances that have been completed
+ * previously.
*/
- public Collection getTaskInstances() {
+ public Collection<TaskInstance> getTaskInstances()
+ {
return taskInstances;
}
- public void addTaskInstance(TaskInstance taskInstance) {
- if (taskInstances==null) taskInstances = new HashSet();
+
+ public void addTaskInstance(TaskInstance taskInstance)
+ {
+ if (taskInstances == null)
+ taskInstances = new HashSet<TaskInstance>();
taskInstances.add(taskInstance);
taskInstance.setTaskMgmtInstance(this);
}
- public void removeTaskInstance(TaskInstance taskInstance) {
- if (taskInstances!=null) {
+
+ public void removeTaskInstance(TaskInstance taskInstance)
+ {
+ if (taskInstances != null)
+ {
taskInstances.remove(taskInstance);
}
}
// swimlane instances ///////////////////////////////////////////////////////
- public Map getSwimlaneInstances() {
+ public Map<String, SwimlaneInstance> getSwimlaneInstances()
+ {
return swimlaneInstances;
}
- public void addSwimlaneInstance( SwimlaneInstance swimlaneInstance ) {
- if (swimlaneInstances==null) swimlaneInstances = new HashMap();
+
+ public void addSwimlaneInstance(SwimlaneInstance swimlaneInstance)
+ {
+ if (swimlaneInstances == null)
+ swimlaneInstances = new HashMap<String, SwimlaneInstance>();
swimlaneInstances.put(swimlaneInstance.getName(), swimlaneInstance);
swimlaneInstance.setTaskMgmtInstance(this);
}
- public SwimlaneInstance getSwimlaneInstance(String swimlaneName) {
- return (SwimlaneInstance) (swimlaneInstances!=null ? swimlaneInstances.get(swimlaneName) : null );
+
+ public SwimlaneInstance getSwimlaneInstance(String swimlaneName)
+ {
+ return swimlaneInstances != null ? swimlaneInstances.get(swimlaneName) : null;
}
- public SwimlaneInstance createSwimlaneInstance(String swimlaneName) {
- Swimlane swimlane = (taskMgmtDefinition!=null ? taskMgmtDefinition.getSwimlane(swimlaneName) : null);
- if (swimlane!=null) {
+ public SwimlaneInstance createSwimlaneInstance(String swimlaneName)
+ {
+ Swimlane swimlane = (taskMgmtDefinition != null ? taskMgmtDefinition.getSwimlane(swimlaneName) : null);
+ if (swimlane != null)
+ {
return createSwimlaneInstance(swimlane);
}
- throw new JbpmException("couldn't create swimlane instance for non-existing swimlane "+swimlaneName);
+ throw new JbpmException("couldn't create swimlane instance for non-existing swimlane " + swimlaneName);
}
- public SwimlaneInstance createSwimlaneInstance(Swimlane swimlane) {
- if (swimlaneInstances==null) swimlaneInstances = new HashMap();
+ public SwimlaneInstance createSwimlaneInstance(Swimlane swimlane)
+ {
+ if (swimlaneInstances == null)
+ swimlaneInstances = new HashMap<String, SwimlaneInstance>();
SwimlaneInstance swimlaneInstance = new SwimlaneInstance(swimlane);
- try {
+ try
+ {
swimlaneInstance.setTaskMgmtInstance(this);
- Class persistentMapClass = swimlaneInstances.getClass();
+ Class<?> persistentMapClass = swimlaneInstances.getClass();
Field mapField = persistentMapClass.getDeclaredField("map");
mapField.setAccessible(true);
// TODO remove the size when we switch to hibernate 3.2.1 (it's a workaround for a bug)
swimlaneInstances.size();
swimlaneInstances.put(swimlaneInstance.getName(), swimlaneInstance);
- } catch (Exception e) {
+ }
+ catch (Exception e)
+ {
e.printStackTrace();
}
return swimlaneInstance;
}
-
+
// getters and setters //////////////////////////////////////////////////////
- public TaskMgmtDefinition getTaskMgmtDefinition() {
+ public TaskMgmtDefinition getTaskMgmtDefinition()
+ {
return taskMgmtDefinition;
}
/**
* suspends all task instances for this process instance.
*/
- public void suspend(Token token) {
- if (token==null) {
+ public void suspend(Token token)
+ {
+ if (token == null)
+ {
throw new JbpmException("can't suspend task instances for token null");
}
- if (taskInstances!=null) {
- Iterator iter = taskInstances.iterator();
- while (iter.hasNext()) {
- TaskInstance taskInstance = (TaskInstance) iter.next();
- if ( (token.equals(taskInstance.getToken()))
- && (taskInstance.isOpen())
- ) {
+ if (taskInstances != null)
+ {
+ Iterator<TaskInstance> iter = taskInstances.iterator();
+ while (iter.hasNext())
+ {
+ TaskInstance taskInstance = iter.next();
+ if ((token.equals(taskInstance.getToken())) && (taskInstance.isOpen()))
+ {
taskInstance.suspend();
}
}
@@ -513,45 +603,56 @@
/**
* resumes all task instances for this process instance.
*/
- public void resume(Token token) {
- if (token==null) {
+ public void resume(Token token)
+ {
+ if (token == null)
+ {
throw new JbpmException("can't suspend task instances for token null");
}
- if (taskInstances!=null) {
- Iterator iter = taskInstances.iterator();
- while (iter.hasNext()) {
- TaskInstance taskInstance = (TaskInstance) iter.next();
- if ( (token.equals(taskInstance.getToken()))
- && (taskInstance.isOpen())
- ) {
+ if (taskInstances != null)
+ {
+ Iterator<TaskInstance> iter = taskInstances.iterator();
+ while (iter.hasNext())
+ {
+ TaskInstance taskInstance = iter.next();
+ if ((token.equals(taskInstance.getToken())) && (taskInstance.isOpen()))
+ {
taskInstance.resume();
}
}
}
}
-
- void notifyVariableUpdate(TaskInstance taskInstance) {
- if (taskInstanceVariableUpdates==null) {
- taskInstanceVariableUpdates=new HashSet();
+
+ void notifyVariableUpdate(TaskInstance taskInstance)
+ {
+ if (taskInstanceVariableUpdates == null)
+ {
+ taskInstanceVariableUpdates = new HashSet<TaskInstance>();
}
taskInstanceVariableUpdates.add(taskInstance);
}
+
/**
* returns the collection of task instance with variable updates.
*/
- public Collection getTaskInstancesWithVariableUpdates() {
+ public Collection<TaskInstance> getTaskInstancesWithVariableUpdates()
+ {
return taskInstanceVariableUpdates;
}
/**
* convenience method to end all tasks related to a given process instance.
*/
- public void endAll() {
- if (taskInstances!=null) {
- Iterator iter = taskInstances.iterator();
- while (iter.hasNext()) {
- TaskInstance taskInstance = (TaskInstance) iter.next();
- if (!taskInstance.hasEnded()) {
+ public void endAll()
+ {
+ if (taskInstances != null)
+ {
+ Iterator<TaskInstance> iter = taskInstances.iterator();
+ while (iter.hasNext())
+ {
+ TaskInstance taskInstance = iter.next();
+ if (!taskInstance.hasEnded())
+ {
taskInstance.end();
}
}
@@ -561,14 +662,16 @@
/**
* removes signalling capabilities from all task instances related to the given token.
*/
- public void removeSignalling(Token token) {
- if (taskInstances!=null) {
- Iterator iter = taskInstances.iterator();
- while (iter.hasNext()) {
- TaskInstance taskInstance = (TaskInstance) iter.next();
- if ( (token!=null)
- && (token.equals(taskInstance.getToken()))
- ) {
+ public void removeSignalling(Token token)
+ {
+ if (taskInstances != null)
+ {
+ Iterator<TaskInstance> iter = taskInstances.iterator();
+ while (iter.hasNext())
+ {
+ TaskInstance taskInstance = iter.next();
+ if ((token != null) && (token.equals(taskInstance.getToken())))
+ {
taskInstance.setSignalling(false);
}
}
Modified: jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/service/TaskServiceImpl.java
===================================================================
--- jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/service/TaskServiceImpl.java 2008-12-05 15:28:33 UTC (rev 3229)
+++ jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/service/TaskServiceImpl.java 2008-12-05 15:30:04 UTC (rev 3230)
@@ -24,17 +24,21 @@
// $Id$
import java.util.ArrayList;
+import java.util.Collection;
import java.util.List;
import javax.management.ObjectName;
-import org.jboss.bpm.api.NotImplementedException;
import org.jboss.bpm.api.client.ProcessEngine;
+import org.jboss.bpm.api.model.Process;
import org.jboss.bpm.api.runtime.ExecutionContext;
import org.jboss.bpm.api.service.ExecutionContextService;
+import org.jboss.bpm.api.service.ProcessService;
import org.jboss.bpm.api.service.internal.AbstractTaskService;
import org.jboss.bpm.api.task.Task;
import org.jbpm.JbpmContext;
+import org.jbpm.integration.spec.model.ProcessImpl;
+import org.jbpm.integration.spec.runtime.InvocationProxy;
import org.jbpm.integration.spec.task.TaskImpl;
import org.jbpm.taskmgmt.exe.TaskInstance;
import org.slf4j.Logger;
@@ -59,20 +63,47 @@
public List<Task> getTasksByProcess(ObjectName procID)
{
- throw new NotImplementedException();
+ ExecutionContextService ctxService = getProcessEngine().getService(ExecutionContextService.class);
+ ExecutionContext bpmContext = ctxService.getExecutionContext(true);
+ try
+ {
+ ProcessService procService = getProcessEngine().getService(ProcessService.class);
+ Process proc = procService.getProcess(procID);
+ if (proc == null)
+ throw new IllegalStateException("Cannot obtain process: " + procID);
+
+ List<Task> tasks = new ArrayList<Task>();
+ ProcessImpl procImpl = InvocationProxy.getUnderlying(proc, ProcessImpl.class);
+ Collection<TaskInstance> taskInstances = procImpl.getDelegate().getTaskMgmtInstance().getTaskInstances();
+ for (TaskInstance taskInst : taskInstances)
+ {
+ Task task = new TaskImpl(getProcessEngine(), taskInst);
+ task = InvocationProxy.newInstance((TaskImpl)task, Task.class);
+ tasks.add(task);
+ }
+
+ return tasks;
+ }
+ catch (RuntimeException rte)
+ {
+ throw rte;
+ }
+ finally
+ {
+ bpmContext.close();
+ }
}
-
+
public Task getTask(ObjectName taskID)
{
- Task task = null;
-
ExecutionContextService ctxService = getProcessEngine().getService(ExecutionContextService.class);
ExecutionContext bpmContext = ctxService.getExecutionContext(true);
try
{
JbpmContext jbpmContext = bpmContext.getAttachment(JbpmContext.class);
- TaskInstance oldTask = jbpmContext.getTaskInstance(adaptKey(taskID));
- task = new TaskImpl(getProcessEngine(), oldTask);
+ TaskInstance taskInst = jbpmContext.getTaskInstance(adaptKey(taskID));
+ Task task = new TaskImpl(getProcessEngine(), taskInst);
+ return InvocationProxy.newInstance((TaskImpl)task, Task.class);
}
catch (RuntimeException rte)
{
@@ -82,23 +113,23 @@
{
bpmContext.close();
}
-
- return task;
}
+ @SuppressWarnings("unchecked")
public List<Task> getTasksByActor(String actor)
{
- List<Task> tasks = new ArrayList<Task>();
-
ExecutionContextService ctxService = getProcessEngine().getService(ExecutionContextService.class);
ExecutionContext bpmContext = ctxService.getExecutionContext(true);
try
{
+ List<Task> tasks = new ArrayList<Task>();
JbpmContext jbpmContext = bpmContext.getAttachment(JbpmContext.class);
for (TaskInstance oldTask : (List<TaskInstance>)jbpmContext.getTaskList(actor))
{
- tasks.add(new TaskImpl(getProcessEngine(), oldTask));
+ TaskImpl taskImpl = new TaskImpl(getProcessEngine(), oldTask);
+ tasks.add(InvocationProxy.newInstance(taskImpl, Task.class));
}
+ return tasks;
}
catch (RuntimeException rte)
{
@@ -108,33 +139,57 @@
{
bpmContext.close();
}
-
- return tasks;
}
public void closeTask(ObjectName taskID, String signalName)
{
- TaskImpl taskImpl = (TaskImpl)getTask(taskID);
- TaskInstance taskInstance = taskImpl.getOldTask();
-
- if (signalName != null)
- taskInstance.end(signalName);
- else
- taskInstance.end();
+ ExecutionContextService ctxService = getProcessEngine().getService(ExecutionContextService.class);
+ ExecutionContext bpmContext = ctxService.getExecutionContext(true);
+ try
+ {
+ TaskImpl taskImpl = InvocationProxy.getUnderlying(getTask(taskID), TaskImpl.class);
+ TaskInstance taskInst = taskImpl.getDelegate();
+
+ if (signalName != null)
+ taskInst.end(signalName);
+ else
+ taskInst.end();
+ }
+ catch (RuntimeException rte)
+ {
+ throw rte;
+ }
+ finally
+ {
+ bpmContext.close();
+ }
}
public void reassignTask(ObjectName taskID, String actor)
{
- TaskImpl taskImpl = (TaskImpl)getTask(taskID);
- TaskInstance taskInstance = taskImpl.getOldTask();
-
- if (taskInstance.getStart() != null)
+ ExecutionContextService ctxService = getProcessEngine().getService(ExecutionContextService.class);
+ ExecutionContext bpmContext = ctxService.getExecutionContext(true);
+ try
{
- log.warn("Force stop on task " + taskInstance.getId() + ". Will be restarted.");
- taskInstance.setStart(null); // strange, but means isNotStarted()
+ TaskImpl taskImpl = InvocationProxy.getUnderlying(getTask(taskID), TaskImpl.class);
+ TaskInstance taskInst = taskImpl.getDelegate();
+
+ if (taskInst.getStart() != null)
+ {
+ log.warn("Force stop on task " + taskInst.getId() + ". Will be restarted.");
+ taskInst.setStart(null); // strange, but means isNotStarted()
+ }
+
+ taskInst.start(actor, true);
}
-
- taskInstance.start(actor, true);
+ catch (RuntimeException rte)
+ {
+ throw rte;
+ }
+ finally
+ {
+ bpmContext.close();
+ }
}
private Long adaptKey(ObjectName key)
Modified: jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/task/TaskImpl.java
===================================================================
--- jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/task/TaskImpl.java 2008-12-05 15:28:33 UTC (rev 3229)
+++ jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/task/TaskImpl.java 2008-12-05 15:30:04 UTC (rev 3230)
@@ -33,6 +33,7 @@
import org.jboss.bpm.api.runtime.Token;
import org.jboss.bpm.api.service.ExecutionService;
import org.jboss.bpm.api.task.Task;
+import org.jbpm.integration.spec.model.AbstractElementImpl;
import org.jbpm.integration.spec.runtime.InvocationProxy;
import org.jbpm.integration.spec.runtime.TokenImpl;
import org.jbpm.taskmgmt.exe.PooledActor;
@@ -46,46 +47,88 @@
* @author thomas.diesler at jboss.com
* @since 28-Nov-2008
*/
-public class TaskImpl implements Task
+public class TaskImpl extends AbstractElementImpl<TaskInstance> implements Task
{
+ private static final long serialVersionUID = 1L;
+
// Provide logging
final Logger log = LoggerFactory.getLogger(TaskImpl.class);
- private ProcessEngine engine;
- private TaskInstance oldTask;
- private Token token;
+ private ObjectName keyCache;
- public TaskImpl(ProcessEngine engine, TaskInstance oldTask)
+ public TaskImpl(ProcessEngine engine, TaskInstance tmpTask)
{
- this.engine = engine;
- this.oldTask = oldTask;
+ super(engine, tmpTask, TaskInstance.class);
+
+ if (tmpTask.getId() > 0)
+ keyCache = getKey(tmpTask);
}
- public TaskInstance getOldTask()
+ public ObjectName getKey()
{
- return oldTask;
+ ObjectName objKey = keyCache;
+ if (objKey == null)
+ {
+ TaskInstance delegate = getDelegate();
+ objKey = getKey(delegate);
+ if (delegate.getId() > 0)
+ keyCache = objKey;
+ }
+ return objKey;
}
- public ObjectName getKey()
+ public static ObjectName getKey(TaskInstance tmpTask)
{
- return ObjectNameFactory.create("Task:id=" + oldTask.getId());
+ return ObjectNameFactory.create("Task:id=" + tmpTask.getId());
}
+ public String getName()
+ {
+ return getDelegate().getName();
+ }
+
+ public void end(String targetName)
+ {
+ getDelegate().end(targetName);
+ }
+
+ public boolean hasEnded()
+ {
+ return getDelegate().hasEnded();
+ }
+
+ public boolean isCancelled()
+ {
+ return getDelegate().isCancelled();
+ }
+
+ public boolean isBlocking()
+ {
+ return getDelegate().isBlocking();
+ }
+
+ public boolean isSignalling()
+ {
+ return getDelegate().isSignalling();
+ }
+
public String getActor()
{
- return oldTask.getActorId();
+ return getDelegate().getActorId();
}
public ObjectName getCorrelationKey()
{
- if (token == null)
+ Token token = null;
+
+ if (getDelegate().getToken() != null)
{
- long tokenId = oldTask.getToken().getId();
- ExecutionService exService = engine.getService(ExecutionService.class);
+ long tokenID = getDelegate().getToken().getId();
+ ExecutionService exService = getProcessEngine().getService(ExecutionService.class);
for (Token auxTok : exService.getTokens())
{
TokenImpl tokenImpl = InvocationProxy.getUnderlying(auxTok, TokenImpl.class);
- if (tokenImpl.getDelegate().getId() == tokenId)
+ if (tokenImpl.getDelegate().getId() == tokenID)
{
token = auxTok;
break;
@@ -99,29 +142,13 @@
return token.getKey();
}
- public String getName()
- {
- return oldTask.getName();
- }
-
public Set<String> getPooledActors()
{
Set<String> actors = new HashSet<String>();
- for (PooledActor pa : oldTask.getPooledActors())
+ for (PooledActor pa : getDelegate().getPooledActors())
{
actors.add(pa.getActorId());
}
return actors;
}
-
- public boolean isBlocking()
- {
- return oldTask.isBlocking();
- }
-
- public boolean isSignalling()
- {
- return oldTask.isSignalling();
- }
-
}
Modified: jbpm3/trunk/modules/integration/spec/src/test/java/org/jbpm/test/integration/spec/task/TaskTest.java
===================================================================
--- jbpm3/trunk/modules/integration/spec/src/test/java/org/jbpm/test/integration/spec/task/TaskTest.java 2008-12-05 15:28:33 UTC (rev 3229)
+++ jbpm3/trunk/modules/integration/spec/src/test/java/org/jbpm/test/integration/spec/task/TaskTest.java 2008-12-05 15:30:04 UTC (rev 3230)
@@ -23,23 +23,15 @@
// $Id$
-import java.util.Collection;
-import java.util.Iterator;
-
import org.jboss.bpm.api.deployment.Deployment;
import org.jboss.bpm.api.deployment.SimpleDeployment;
import org.jboss.bpm.api.model.Process;
import org.jboss.bpm.api.model.ProcessDefinition;
import org.jboss.bpm.api.runtime.Token;
import org.jboss.bpm.api.service.DeploymentService;
+import org.jboss.bpm.api.service.TaskService;
+import org.jboss.bpm.api.task.Task;
import org.jboss.bpm.api.test.APITestCase;
-import org.jbpm.JbpmConfiguration;
-import org.jbpm.JbpmContext;
-import org.jbpm.db.GraphSession;
-import org.jbpm.graph.def.ActionHandler;
-import org.jbpm.graph.exe.ExecutionContext;
-import org.jbpm.graph.exe.ProcessInstance;
-import org.jbpm.taskmgmt.exe.TaskInstance;
/**
* This uses the API to do the same as the EndTasksDbTest
@@ -49,10 +41,6 @@
*/
public class TaskTest extends APITestCase
{
- private JbpmConfiguration jbpmConfiguration;
- private JbpmContext jbpmContext;
- private GraphSession graphSession;
-
public void testCancel()
{
Deployment dep = new SimpleDeployment(
@@ -64,9 +52,7 @@
" <task name='approve' description='Review order'>" +
" <assignment pooled-actors='reviewers' />" +
" </task>" +
- " <transition name='approve' to='process'>" +
- " <action class='" + Buzz.class.getName() + "' />" +
- " </transition>" +
+ " <transition name='approve' to='process'/>" +
" <transition name='cancel' to='cancelled'/>" +
" </task-node>" +
" <state name='process' />" +
@@ -94,13 +80,10 @@
}
}
- public void _testApprove()
+ public void testApprove()
{
- jbpmContext = createJbpmContext();
- graphSession = jbpmContext.getGraphSession();
-
- org.jbpm.graph.def.ProcessDefinition processDefinition = org.jbpm.graph.def.ProcessDefinition.parseXmlString(
- "<process-definition name='endtasksprocess'>" +
+ Deployment dep = new SimpleDeployment(
+ "<process-definition name='endtasksprocess' xmlns='urn:jbpm.org:jpdl-3.2'>" +
" <start-state>" +
" <transition to='approval' />" +
" </start-state>" +
@@ -116,36 +99,35 @@
" <state name='cancelled' />" +
"</process-definition>"
);
- jbpmContext.deployProcessDefinition(processDefinition);
+
+ DeploymentService depService = getProcessEngine().getService(DeploymentService.class);
+ ProcessDefinition procDef = depService.deploy(dep);
try
{
- newTransaction();
+ Process proc = procDef.newInstance();
+
+ Token token = proc.startProcess();
- ProcessInstance processInstance = jbpmContext.newProcessInstanceForUpdate("endtasksprocess");
- processInstance.signal();
-
- processInstance = saveAndReload(processInstance);
-
- assertEquals("approval", processInstance.getRootToken().getNode().getName());
- TaskInstance taskInstance = (TaskInstance)processInstance.getTaskMgmtInstance().getTaskInstances().iterator().next();
+ assertEquals("approval", token.getCurrentNode().getName());
- taskInstance.end("approve");
- assertEquals("process", processInstance.getRootToken().getNode().getName());
+ TaskService taskService = getProcessEngine().getService(TaskService.class);
+ Task task = taskService.getTasksByProcess(proc.getKey()).iterator().next();
+ assertNotNull("One task", task);
+ assertEquals("Task name", "approve", task.getName());
+
+ task.end("approve");
+ assertEquals("process", token.getCurrentNode().getName());
}
finally
{
- jbpmContext.getGraphSession().deleteProcessDefinition(processDefinition.getId());
- jbpmContext.close();
+ depService.undeploy(dep);
}
}
- public void _testReject()
+ public void testReject()
{
- jbpmContext = createJbpmContext();
- graphSession = jbpmContext.getGraphSession();
-
- org.jbpm.graph.def.ProcessDefinition processDefinition = org.jbpm.graph.def.ProcessDefinition.parseXmlString(
- "<process-definition name='endtasksprocess'>" +
+ Deployment dep = new SimpleDeployment(
+ "<process-definition name='endtasksprocess' xmlns='urn:jbpm.org:jpdl-3.2'>" +
" <start-state>" +
" <transition to='approval' />" +
" </start-state>" +
@@ -161,36 +143,33 @@
" <state name='cancelled' />" +
"</process-definition>"
);
- jbpmContext.deployProcessDefinition(processDefinition);
+
+ DeploymentService depService = getProcessEngine().getService(DeploymentService.class);
+ ProcessDefinition procDef = depService.deploy(dep);
try
{
- newTransaction();
+ Process proc = procDef.newInstance();
+
+ Token token = proc.startProcess();
- ProcessInstance processInstance = jbpmContext.newProcessInstanceForUpdate("endtasksprocess");
- processInstance.signal();
-
- processInstance = saveAndReload(processInstance);
-
- assertEquals("approval", processInstance.getRootToken().getNode().getName());
- TaskInstance taskInstance = (TaskInstance)processInstance.getTaskMgmtInstance().getTaskInstances().iterator().next();
+ assertEquals("approval", token.getCurrentNode().getName());
- taskInstance.end("reject");
- assertEquals("cancelled", processInstance.getRootToken().getNode().getName());
+ TaskService taskService = getProcessEngine().getService(TaskService.class);
+ Task task = taskService.getTasksByProcess(proc.getKey()).iterator().next();
+ task.end("reject");
+
+ assertEquals("cancelled", token.getCurrentNode().getName());
}
finally
{
- jbpmContext.getGraphSession().deleteProcessDefinition(processDefinition.getId());
- jbpmContext.close();
+ depService.undeploy(dep);
}
}
- public void _testTaskInstancesAfterCancellation()
+ public void testTaskInstancesAfterCancellation()
{
- jbpmContext = createJbpmContext();
- graphSession = jbpmContext.getGraphSession();
-
- org.jbpm.graph.def.ProcessDefinition processDefinition = org.jbpm.graph.def.ProcessDefinition.parseXmlString(
- "<process-definition name='endtasksprocess'>" +
+ Deployment dep = new SimpleDeployment(
+ "<process-definition name='endtasksprocess' xmlns='urn:jbpm.org:jpdl-3.2'>" +
" <start-state>" +
" <transition to='approval' />" +
" </start-state>" +
@@ -206,73 +185,26 @@
" <state name='cancelled' />" +
"</process-definition>"
);
- jbpmContext.deployProcessDefinition(processDefinition);
+
+ DeploymentService depService = getProcessEngine().getService(DeploymentService.class);
+ ProcessDefinition procDef = depService.deploy(dep);
try
{
- newTransaction();
+ Process proc = procDef.newInstance();
+
+ Token token = proc.startProcess();
+ token.signal("cancel");
- ProcessInstance processInstance = jbpmContext.newProcessInstanceForUpdate("endtasksprocess");
- processInstance.signal();
-
- processInstance = saveAndReload(processInstance);
- processInstance.signal("cancel");
-
- Collection taskInstances = processInstance.getTaskMgmtInstance().getTaskInstances();
- Iterator iter = taskInstances.iterator();
- while(iter.hasNext()) {
- TaskInstance taskInstance = (TaskInstance) iter.next();
- assertTrue(taskInstance.getName()+" ended", taskInstance.hasEnded());
- assertFalse(taskInstance.getName()+" not cancelled", taskInstance.isCancelled());
- assertFalse(taskInstance.getName()+" not blocking", taskInstance.isBlocking());
- assertFalse(taskInstance.getName()+" not signalling", taskInstance.isSignalling());
- }
+ TaskService taskService = getProcessEngine().getService(TaskService.class);
+ Task task = taskService.getTasksByProcess(proc.getKey()).iterator().next();
+ assertTrue(task.getName() + " ended", task.hasEnded());
+ assertFalse(task.getName() + " not cancelled", task.isCancelled());
+ assertFalse(task.getName() + " not blocking", task.isBlocking());
+ assertFalse(task.getName() + " not signalling", task.isSignalling());
}
finally
{
- jbpmContext.getGraphSession().deleteProcessDefinition(processDefinition.getId());
- jbpmContext.close();
+ depService.undeploy(dep);
}
}
-
- public static class Buzz implements ActionHandler
- {
- private static final long serialVersionUID = 1L;
-
- public void execute(ExecutionContext executionContext) throws Exception
- {
- throw new RuntimeException("buzz");
- }
- }
-
- private JbpmContext createJbpmContext()
- {
- return getJbpmConfiguration().createJbpmContext();
- }
-
- private ProcessInstance saveAndReload(ProcessInstance pi)
- {
- if (jbpmContext == null)
- jbpmContext = createJbpmContext();
-
- jbpmContext.save(pi);
- newTransaction();
- return graphSession.loadProcessInstance(pi.getId());
- }
-
- private void newTransaction()
- {
- if (jbpmContext != null)
- jbpmContext.close();
-
- jbpmContext = createJbpmContext();
- graphSession = jbpmContext.getGraphSession();
- }
-
- private JbpmConfiguration getJbpmConfiguration()
- {
- if (jbpmConfiguration == null)
- jbpmConfiguration = JbpmConfiguration.getInstance();
-
- return jbpmConfiguration;
- }
}
More information about the jbpm-commits
mailing list