August 2010 - jbpm-commits - Jboss List Archives

JBoss JBPM SVN: r6615 - in jbpm4/trunk: modules/api/src/main/java/org/jbpm/api and 4 other directories.

by do-not-reply＠jboss.org

Author: alex.guizar(a)jboss.com Date: 2010-08-19 23:14:27 -0400 (Thu, 19 Aug 2010) New Revision: 6615 Modified: jbpm4/trunk/eclipse/Preferences-Java-CodeStyle-CodeTemplates.xml jbpm4/trunk/eclipse/Preferences-Java-CodeStyle-Formatter.xml jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/JbpmException.java jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JmsExtensions.java jbpm4/trunk/modules/test-cfg/src/test/java/org/jbpm/test/jms/JmsQueueTest.java jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/Buzzz.java jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/QueueExceptionTest.java jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/QueueMapMessageTest.java jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/QueueObjectMessageTest.java jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/QueueTextMessageTest.java jbpm4/trunk/qa/hudson-jbpm4-enterprise.sh jbpm4/trunk/qa/hudson-jbpm4-jboss.sh jbpm4/trunk/qa/hudson-jbpm4-tomcat.sh Log: increase jms message reception timeouts and sanitize jms code; replace JBOSS_BINDADDR and TOMCAT_BINDADDR with MYTESTIP_1 in hudson scripts Modified: jbpm4/trunk/eclipse/Preferences-Java-CodeStyle-CodeTemplates.xml =================================================================== --- jbpm4/trunk/eclipse/Preferences-Java-CodeStyle-CodeTemplates.xml 2010-08-19 14:20:33 UTC (rev 6614) +++ jbpm4/trunk/eclipse/Preferences-Java-CodeStyle-CodeTemplates.xml 2010-08-20 03:14:27 UTC (rev 6615) @@ -1,4 +1,15 @@ -<?xml version="1.0" encoding="UTF-8"?><templates><template autoinsert="false" context="gettercomment_context" deleted="false" description="Comment for getter method" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name="gettercomment"></template><template autoinsert="false" context="settercomment_context" deleted="false" description="Comment for setter method" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.settercomment" name="settercomment"></template><template autoinsert="false" context="constructorcomment_context" deleted="false" description="Comment for created constructors" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name="constructorcomment"></template><template autoinsert="false" context="filecomment_context" deleted="false" description="Comment for created Java files" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.filecomment" name="filecomment">/* +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<templates> +<template autoinsert="true" context="gettercomment_context" deleted="false" description="Comment for getter method" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name="gettercomment">/** + * @return the ${bare_field_name} + */</template> +<template autoinsert="true" context="settercomment_context" deleted="false" description="Comment for setter method" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.settercomment" name="settercomment">/** + * @param ${param} the ${bare_field_name} to set + */</template> +<template autoinsert="true" context="constructorcomment_context" deleted="false" description="Comment for created constructors" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name="constructorcomment">/** + * ${tags} + */</template> +<template autoinsert="false" context="filecomment_context" deleted="false" description="Comment for created Java files" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.filecomment" name="filecomment">/* * JBoss, Home of Professional Open Source * Copyright 2005, JBoss Inc., and individual contributors as indicated * by the @authors tag. See the copyright.txt in the distribution for a @@ -18,40 +29,34 @@ * License along with this software; if not, write to the Free * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */</template><template autoinsert="false" context="typecomment_context" deleted="false" description="Comment for created types" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.typecomment" name="typecomment">/** - * @author Tom Baeyens - */</template><template autoinsert="false" context="fieldcomment_context" deleted="false" description="Comment for fields" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name="fieldcomment"></template><template autoinsert="false" context="methodcomment_context" deleted="false" description="Comment for non-overriding methods" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name="methodcomment"></template><template autoinsert="false" context="overridecomment_context" deleted="false" description="Comment for overriding methods" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name="overridecomment"></template><template autoinsert="false" context="delegatecomment_context" deleted="false" description="Comment for delegate methods" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name="delegatecomment"></template><template autoinsert="false" context="newtype_context" deleted="false" ! description="Newly created files" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.newtype" name="newtype">${filecomment} -${package_declaration} - -${typecomment} -${type_declaration}</template><template autoinsert="true" context="classbody_context" deleted="false" description="Code in new class type bodies" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.classbody" name="classbody"> -</template><template autoinsert="true" context="interfacebody_context" deleted="false" description="Code in new interface type bodies" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name="interfacebody"> -</template><template autoinsert="true" context="enumbody_context" deleted="false" description="Code in new enum type bodies" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.enumbody" name="enumbody"> -</template><template autoinsert="true" context="annotationbody_context" deleted="false" description="Code in new annotation type bodies" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name="annotationbody"> -</template><template autoinsert="false" context="catchblock_context" deleted="false" description="Code in new catch blocks" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.catchblock" name="catchblock">${exception_var}.printStackTrace();</template><template autoinsert="false" context="methodbody_context" deleted="false" description="Code in created method stubs" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.methodbody" name="methodbody">${body_statement}</template><template autoinsert="false" context="constructorbody_context" deleted="false" description="Code in created constructor stubs" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name="constructorbody">${body_statement}</template><template autoinsert="true" context="getterbody_context" deleted="false" description="Code in created getters" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.getterbody" name="getterbody">return ${field};</template><template autoinsert="! true" context="setterbody_context" deleted="false" description="Code in created setters" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.setterbody" name="setterbody">${field} = ${param};</template><template autoinsert="true" context="gettercomment_context" deleted="false" description="Comment for getter function" enabled="true" id="org.eclipse.wst.jsdt.ui.text.codetemplates.gettercomment" name="gettercomment">/** - * @return the ${bare_field_name} - */</template><template autoinsert="true" context="settercomment_context" deleted="false" description="Comment for setter function" enabled="true" id="org.eclipse.wst.jsdt.ui.text.codetemplates.settercomment" name="settercomment">/** - * @param ${param} the ${bare_field_name} to set - */</template><template autoinsert="true" context="constructorcomment_context" deleted="false" description="Comment for created constructors" enabled="true" id="org.eclipse.wst.jsdt.ui.text.codetemplates.constructorcomment" name="constructorcomment">/** - * ${tags} - */</template><template autoinsert="true" context="filecomment_context" deleted="false" description="Comment for created JavaScript files" enabled="true" id="org.eclipse.wst.jsdt.ui.text.codetemplates.filecomment" name="filecomment">/** - * - */</template><template autoinsert="true" context="typecomment_context" deleted="false" description="Comment for created types" enabled="true" id="org.eclipse.wst.jsdt.ui.text.codetemplates.typecomment" name="typecomment">/** + */</template> +<template autoinsert="false" context="typecomment_context" deleted="false" description="Comment for created types" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.typecomment" name="typecomment">/** * @author ${user} - * + */</template> +<template autoinsert="false" context="fieldcomment_context" deleted="false" description="Comment for fields" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name="fieldcomment"/> +<template autoinsert="true" context="methodcomment_context" deleted="false" description="Comment for non-overriding methods" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name="methodcomment">/** * ${tags} - */</template><template autoinsert="true" context="fieldcomment_context" deleted="false" description="Comment for vars" enabled="true" id="org.eclipse.wst.jsdt.ui.text.codetemplates.fieldcomment" name="fieldcomment">/** - * - */</template><template autoinsert="true" context="methodcomment_context" deleted="false" description="Comment for non-overriding function" enabled="true" id="org.eclipse.wst.jsdt.ui.text.codetemplates.methodcomment" name="methodcomment">/** + */</template> +<template autoinsert="false" context="overridecomment_context" deleted="false" description="Comment for overriding methods" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name="overridecomment"/> +<template autoinsert="true" context="delegatecomment_context" deleted="false" description="Comment for delegate methods" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name="delegatecomment">/** * ${tags} - */</template><template autoinsert="true" context="overridecomment_context" deleted="false" description="Comment for overriding functions" enabled="true" id="org.eclipse.wst.jsdt.ui.text.codetemplates.overridecomment" name="overridecomment">/* (non-Jsdoc) - * ${see_to_overridden} - */</template><template autoinsert="true" context="delegatecomment_context" deleted="false" description="Comment for delegate functions" enabled="true" id="org.eclipse.wst.jsdt.ui.text.codetemplates.delegatecomment" name="delegatecomment">/** - * ${tags} * ${see_to_target} - */</template><template autoinsert="true" context="newtype_context" deleted="false" description="Newly created files" enabled="true" id="org.eclipse.wst.jsdt.ui.text.codetemplates.newtype" name="newtype">${filecomment} + */</template> +<template autoinsert="true" context="newtype_context" deleted="false" description="Newly created files" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.newtype" name="newtype">${filecomment} ${package_declaration} ${typecomment} -${type_declaration}</template><template autoinsert="true" context="classbody_context" deleted="false" description="Code in new class type bodies" enabled="true" id="org.eclipse.wst.jsdt.ui.text.codetemplates.classbody" name="classbody"> -</template><template autoinsert="false" context="catchblock_context" deleted="false" description="Code in new catch blocks" enabled="true" id="org.eclipse.wst.jsdt.ui.text.codetemplates.catchblock" name="catchblock">${exception_var}.printStackTrace();</template><template autoinsert="false" context="methodbody_context" deleted="false" description="Code in created function stubs" enabled="true" id="org.eclipse.wst.jsdt.ui.text.codetemplates.methodbody" name="methodbody">${body_statement}</template><template autoinsert="false" context="constructorbody_context" deleted="false" description="Code in created constructor stubs" enabled="true" id="org.eclipse.wst.jsdt.ui.text.codetemplates.constructorbody" name="constructorbody">${body_statement}</template><template autoinsert="true" context="getterbody_context" deleted="false" description="Code in created getters" enabled="true" id="org.eclipse.wst.jsdt.ui.text.codetemplates.getterbody" name="getterbody">return ${field};</template>! <template autoinsert="true" context="setterbody_context" deleted="false" description="Code in created setters" enabled="true" id="org.eclipse.wst.jsdt.ui.text.codetemplates.setterbody" name="setterbody">${field} = ${param};</template></templates> \ No newline at end of file +${type_declaration}</template> +<template autoinsert="true" context="classbody_context" deleted="false" description="Code in new class type bodies" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.classbody" name="classbody"/> +<template autoinsert="true" context="interfacebody_context" deleted="false" description="Code in new interface type bodies" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name="interfacebody"/> +<template autoinsert="true" context="enumbody_context" deleted="false" description="Code in new enum type bodies" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.enumbody" name="enumbody"/> +<template autoinsert="true" context="annotationbody_context" deleted="false" description="Code in new annotation type bodies" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name="annotationbody"/> +<template autoinsert="true" context="catchblock_context" deleted="false" description="Code in new catch blocks" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.catchblock" name="catchblock">// ${todo} Auto-generated catch block +${exception_var}.printStackTrace();</template> +<template autoinsert="true" context="methodbody_context" deleted="false" description="Code in created method stubs" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.methodbody" name="methodbody">// ${todo} Auto-generated method stub +${body_statement}</template> +<template autoinsert="true" context="constructorbody_context" deleted="false" description="Code in created constructor stubs" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name="constructorbody">${body_statement} +// ${todo} Auto-generated constructor stub</template> +<template autoinsert="true" context="getterbody_context" deleted="false" description="Code in created getters" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.getterbody" name="getterbody">return ${field};</template> +<template autoinsert="true" context="setterbody_context" deleted="false" description="Code in created setters" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.setterbody" name="setterbody">${field} = ${param};</template> +</templates> \ No newline at end of file Modified: jbpm4/trunk/eclipse/Preferences-Java-CodeStyle-Formatter.xml =================================================================== --- jbpm4/trunk/eclipse/Preferences-Java-CodeStyle-Formatter.xml 2010-08-19 14:20:33 UTC (rev 6614) +++ jbpm4/trunk/eclipse/Preferences-Java-CodeStyle-Formatter.xml 2010-08-20 03:14:27 UTC (rev 6615) @@ -1,267 +1,269 @@ -<?xml version="1.0" encoding="UTF-8"?> +<?xml version="1.0" encoding="UTF-8" standalone="no"?> <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"/> +<profile kind="CodeFormatterProfile" name="jBPM 4" 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="end_of_line"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.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_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="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_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.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.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.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="1"/> <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.alignment_for_arguments_in_method_invocation" value="80"/> +<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_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_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.join_wrapped_lines" value="true"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call" value="80"/> +<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="80"/> +<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.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.lineSplit" value="96"/> +<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.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.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_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_closing_paren_in_cast" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration" value="16"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration" value="end_of_line"/> +<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.brace_position_for_switch" value="end_of_line"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_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="false"/> +<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="end_of_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="end_of_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="end_of_line"/> +<setting id="org.eclipse.jdt.core.formatter.comment.indent_root_tags" value="false"/> +<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.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.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="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="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_after_comma_in_method_declaration_parameters" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block_in_case" value="end_of_line"/> +<setting id="org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve" value="1"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression" value="80"/> +<setting id="org.eclipse.jdt.core.compiler.compliance" value="1.5"/> +<setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="1"/> +<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="80"/> +<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="true"/> <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.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.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.formatter.brace_position_for_enum_declaration" value="end_of_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.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.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="do not 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="true"/> +<setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="96"/> <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.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="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.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.join_lines_in_comments" value="true"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.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.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_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_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_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_opening_paren_in_constructor_declaration" 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.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_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_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_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.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.brace_position_for_type_declaration" value="end_of_line"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.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_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.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_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.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.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"/> +<setting id="org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line" value="false"/> </profile> </profiles> Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/JbpmException.java =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/JbpmException.java 2010-08-19 14:20:33 UTC (rev 6614) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/JbpmException.java 2010-08-20 03:14:27 UTC (rev 6615) @@ -31,14 +31,12 @@ super(); } public JbpmException(String msg, Throwable cause) { - super(msg); - super.initCause(cause); + super(msg, cause); } public JbpmException(String msg) { super(msg); } public JbpmException(Throwable cause) { - super(); - super.initCause(cause); + super(cause); } } Modified: jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java =================================================================== --- jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java 2010-08-19 14:20:33 UTC (rev 6614) +++ jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java 2010-08-20 03:14:27 UTC (rev 6615) @@ -27,6 +27,7 @@ import java.util.Timer; import java.util.TimerTask; +import javax.jms.Message; import javax.jms.Session; import org.hibernate.criterion.Projections; @@ -105,64 +106,69 @@ super.tearDown(); - if (errorMsg!=null) { + if (errorMsg != null) { throw new JbpmException(errorMsg); } } - public static void jmsCreateQueue(String connectionFactoryJndiName, String queueJndiName) { - JmsExtensions.createQueue(connectionFactoryJndiName, queueJndiName); + public static Message jmsConsumeMessage(String connectionFactoryName, String destinationName) { + return jmsConsumeMessage(connectionFactoryName, destinationName, Session.AUTO_ACKNOWLEDGE); } - public static Object jmsConsumeMessageFromQueue(String connectionFactoryJndiName, String queueJndiName) { - return jmsConsumeMessageFromQueue(connectionFactoryJndiName, queueJndiName, 1000, true, Session.AUTO_ACKNOWLEDGE); + public static Message jmsConsumeMessage(String connectionFactoryName, String destinationName, + int acknowledgeMode) { + return jmsConsumeMessage(connectionFactoryName, destinationName, acknowledgeMode, 5000); } - public static Object jmsConsumeMessageFromQueue(String connectionFactoryJndiName, String queueJndiName, long timeout, boolean transacted, int acknowledgeMode) { - return JmsExtensions.consumeMessageFromQueue(connectionFactoryJndiName, queueJndiName, timeout, transacted, acknowledgeMode); + public static Message jmsConsumeMessage(String connectionFactoryName, String destinationName, + int acknowledgeMode, long timeout) { + return JmsExtensions.consumeMessage(connectionFactoryName, + destinationName, + acknowledgeMode, + timeout); } - public static Object jmsConsumeMessageFromQueueXA(String connectionFactoryJndiName, String queueJndiName, long timeout) { - return JmsExtensions.consumeMessageFromQueueXA(connectionFactoryJndiName, queueJndiName, timeout); + public static void jmsCreateQueue(String connectionFactoryName, String queueName) { + JmsExtensions.createQueue(connectionFactoryName, queueName); } - public static void jmsAssertQueueEmpty(String connectionFactoryJndiName, String queueJndiName, long timeout, boolean transacted, int acknowledgeMode) { - JmsExtensions.jmsAssertQueueEmpty(connectionFactoryJndiName, queueJndiName, timeout, transacted, acknowledgeMode); + public static void jmsAssertQueueEmpty(String connectionFactoryName, String queueName, + int acknowledgeMode, long timeout) { + assertTrue("expected queue '" + queueName + "' to be empty", + JmsExtensions.isQueueEmpty(connectionFactoryName, queueName, acknowledgeMode, timeout)); } - public static void jmsAssertQueueEmptyXA(String connectionFactoryJndiName, String queueJndiName, long timeout) { - JmsExtensions.jmsAssertQueueEmptyXA(connectionFactoryJndiName, queueJndiName, timeout); + public static void jmsRemoveQueue(String connectionFactoryName, String queueName) { + JmsExtensions.removeQueue(connectionFactoryName, queueName); } - public static void jmsRemoveQueue(String connectionFactoryJndiName, String queueJndiName) { - JmsExtensions.removeQueue(connectionFactoryJndiName, queueJndiName); + public static void jmsCreateTopic(String connectionFactoryName, String topicName) { + JmsExtensions.createTopic(connectionFactoryName, topicName); } - public static void jmsCreateTopic(String connectionFactoryJndiName, String topicJndiName) { - JmsExtensions.createTopic(connectionFactoryJndiName, topicJndiName); + public static JmsTopicListener jmsStartTopicListener(String connectionFactoryName, + String topicName, boolean transacted, int acknowledgeMode) { + return new JmsNonXATopicListener(connectionFactoryName, + topicName, + transacted, + acknowledgeMode); } - public static JmsTopicListener jmsStartTopicListener(String connectionFactoryJndiName, String topicJndiName, boolean transacted, int acknowledgeMode) { - return new JmsNonXATopicListener(connectionFactoryJndiName, topicJndiName, transacted, acknowledgeMode); + public static JmsTopicListener jmsStartTopicListenerXA(String connectionFactoryName, + String topicName) { + return new JmsXATopicListener(connectionFactoryName, topicName); } - public static JmsTopicListener jmsStartTopicListenerXA(String connectionFactoryJndiName, String topicJndiName) { - return new JmsXATopicListener(connectionFactoryJndiName, topicJndiName); + public static void jmsRemoveTopic(String connectionFactoryName, String topicName) { + JmsExtensions.removeTopic(connectionFactoryName, topicName); } - public static void jmsRemoveTopic(String connectionFactoryJndiName, String topicJndiName) { - JmsExtensions.removeTopic(connectionFactoryJndiName, topicJndiName); - } - protected String verifyDbClean() { - String errorMsg = null; String recordsLeftMsg = Db.verifyClean(processEngine); - if ( (recordsLeftMsg!=null) - && (recordsLeftMsg.length()>0) - ) { - errorMsg = "database was not clean after test: "+recordsLeftMsg; + if (recordsLeftMsg != null && recordsLeftMsg.length() > 0) { + return "database was not clean after test: " + recordsLeftMsg; } - return errorMsg; + return null; } protected void deleteRegisteredDeployments() { @@ -176,10 +182,9 @@ // deployment helper methods //////////////////////////////////////////////// public String deployFromClasspath(String resourceName) { - String deploymentDbid = - repositoryService.createDeployment() - .addResourceFromClasspath(resourceName) - .deploy(); + String deploymentDbid = repositoryService.createDeployment() + .addResourceFromClasspath(resourceName) + .deploy(); registerDeployment(deploymentDbid); @@ -189,10 +194,9 @@ /** deploys the process, keeps a reference to the deployment and * automatically deletes the deployment in the tearDown */ public String deployJpdlXmlString(String jpdlXmlString) { - String deploymentDbid = - repositoryService.createDeployment() - .addResourceFromString("xmlstring.jpdl.xml", jpdlXmlString) - .deploy(); + String deploymentDbid = repositoryService.createDeployment() + .addResourceFromString("xmlstring.jpdl.xml", jpdlXmlString) + .deploy(); registerDeployment(deploymentDbid); @@ -200,10 +204,9 @@ } public String deployBpmn2XmlString(String bpmn2XmlString) { - String deploymentDbid = - repositoryService.createDeployment() - .addResourceFromString("xmlstring.bpmn.xml", bpmn2XmlString) - .deploy(); + String deploymentDbid = repositoryService.createDeployment() + .addResourceFromString("xmlstring.bpmn.xml", bpmn2XmlString) + .deploy(); registerDeployment(deploymentDbid); return deploymentDbid; @@ -218,14 +221,15 @@ // task helper methods ////////////////////////////////////////////////////// public static void assertContainsTask(List<Task> taskList, String taskName) { - if (getTask(taskList, taskName)==null) { - fail("tasklist doesn't contain task '"+taskName+"': "+taskList); + if (getTask(taskList, taskName) == null) { + fail("tasklist doesn't contain task '" + taskName + "': " + taskList); } } public static void assertContainsTask(List<Task> taskList, String taskName, String assignee) { - if (getTask(taskList, taskName, assignee)==null) { - fail("tasklist doesn't contain task '"+taskName+"' for assignee '"+assignee+"': "+taskList); + if (getTask(taskList, taskName, assignee) == null) { + fail("tasklist doesn't contain task '" + taskName + "' for assignee '" + assignee + "': " + + taskList); } } @@ -241,11 +245,12 @@ public static Task getTask(List<Task> taskList, String taskName, String assignee) { for (Task task : taskList) { if (taskName.equals(task.getName())) { - if (assignee==null) { - if (task.getAssignee()==null) { + if (assignee == null) { + if (task.getAssignee() == null) { return task; } - } else { + } + else { if (assignee.equals(task.getAssignee())) { return task; } @@ -256,14 +261,18 @@ } public void assertNoOpenTasks(String processInstanceId) { - List<Task> tasks = taskService.createTaskQuery().processInstanceId(processInstanceId).list(); - assertTrue("There were still open tasks found for the process instance with id " + - processInstanceId + ". Current tasks are: " + - listAllOpenTasks(processInstanceId), tasks.isEmpty()); + List<Task> tasks = taskService.createTaskQuery() + .processInstanceId(processInstanceId) + .list(); + assertTrue("There were still open tasks found for the process instance with id " + + processInstanceId + ". Current tasks are: " + listAllOpenTasks(processInstanceId), + tasks.isEmpty()); } protected String listAllOpenTasks(String processInstanceId) { - List<Task> tasks = taskService.createTaskQuery().processInstanceId(processInstanceId).list(); + List<Task> tasks = taskService.createTaskQuery() + .processInstanceId(processInstanceId) + .list(); StringBuilder result = new StringBuilder(); for (Task task : tasks) { result.append("'" + task.getName() + "', "); @@ -280,7 +289,7 @@ public void assertExecutionEnded(String processInstanceId) { assertNull("Error: an active process instance with id " + processInstanceId + " was found", - executionService.findProcessInstanceById(processInstanceId)); + executionService.findProcessInstanceById(processInstanceId)); } public void assertProcessInstanceEnded(String processInstanceId) { @@ -292,19 +301,18 @@ } public void assertProcessInstanceActive(ProcessInstance processInstance) { - assertProcessInstanceActive(processInstance.getId()); + assertProcessInstanceActive(processInstance.getId()); } public void assertProcessInstanceActive(String processInstanceId) { - assertNotNull("Error: an active process instance with id " + processInstanceId + " was not found", - executionService.findProcessInstanceById(processInstanceId)); + assertNotNull("Error: an active process instance with id " + processInstanceId + + " was not found", executionService.findProcessInstanceById(processInstanceId)); } public void assertActivityActive(String executionId, String activityName) { - assertTrue("The execution with id '" + executionId + - "' is not active in the activity '" + activityName + "'." + - "Current activitites are: " + listAllActiveActivites(executionId), - executionService.findExecutionById(executionId).isActive(activityName)); + assertTrue("The execution with id '" + executionId + "' is not active in the activity '" + + activityName + "'." + "Current activitites are: " + listAllActiveActivites(executionId), + executionService.findExecutionById(executionId).isActive(activityName)); } public void assertNotActivityActive(String executionId, String activityName) { @@ -312,14 +320,15 @@ assertFalse(execution.isActive(activityName)); } - public void assertActivitiesActive(String executionId, String ... activityNames) { - CollectionAssertions.assertContainsSameElements( - executionService.findExecutionById(executionId).findActiveActivityNames(), activityNames); + public void assertActivitiesActive(String executionId, String... activityNames) { + CollectionAssertions.assertContainsSameElements(executionService.findExecutionById(executionId) + .findActiveActivityNames(), + activityNames); } /** Checks if the given execution is active in one (or more) of the given activities */ - public void assertExecutionInOneOrMoreActivitiesActive(String executionId, String ... activityNames) { - + public void assertExecutionInOneOrMoreActivitiesActive(String executionId, + String... activityNames) { boolean inOneActivityActive = false; Execution execution = executionService.findExecutionById(executionId); @@ -329,10 +338,9 @@ } } - assertTrue("The execution with id '" + executionId + - "' is not active in one of these activities: " + activityNames + - "Current activitites are: " + listAllActiveActivites(executionId), - inOneActivityActive); + assertTrue("The execution with id '" + executionId + + "' is not active in one of these activities: " + activityNames + + "Current activitites are: " + listAllActiveActivites(executionId), inOneActivityActive); } protected String listAllActiveActivites(String executionId) { @@ -374,9 +382,11 @@ log.debug("waiting " + checkInterval + " ms for " + jobCount + " jobs to execute"); Thread.sleep(checkInterval); } - } catch (InterruptedException e) { + } + catch (InterruptedException e) { fail("test execution exceeded treshold of " + timeout + " milliseconds"); - } finally { + } + finally { timer.cancel(); } } Modified: jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JmsExtensions.java =================================================================== --- jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JmsExtensions.java 2010-08-19 14:20:33 UTC (rev 6614) +++ jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JmsExtensions.java 2010-08-20 03:14:27 UTC (rev 6615) @@ -24,20 +24,19 @@ import java.util.HashMap; import java.util.Map; +import javax.jms.Connection; +import javax.jms.ConnectionFactory; +import javax.jms.Destination; +import javax.jms.JMSException; import javax.jms.Message; import javax.jms.MessageConsumer; import javax.jms.Queue; -import javax.jms.QueueConnection; -import javax.jms.QueueConnectionFactory; -import javax.jms.QueueSession; -import javax.jms.XAQueueConnection; -import javax.jms.XAQueueConnectionFactory; -import javax.jms.XAQueueSession; +import javax.jms.QueueBrowser; +import javax.jms.Session; +import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; -import junit.framework.AssertionFailedError; - import org.jbpm.api.JbpmException; import com.mockrunner.ejb.JNDIUtil; @@ -47,212 +46,217 @@ import com.mockrunner.mock.jms.MockQueueConnectionFactory; import com.mockrunner.mock.jms.MockTopic; - /** * @author Tom Baeyens + * @author Alejandro Guizar */ -public abstract class JmsExtensions { - +public class JmsExtensions { + static { + try { + new InitialContext().getEnvironment(); + } + catch (NamingException e) { try { - new InitialContext().getEnvironment(); - } catch (NamingException e) { - try { - JNDIUtil.initMockContextFactory(); - } catch (Exception e2) { - e.printStackTrace(); - throw new RuntimeException("coudn't initialize mock jndi: "+e2.getMessage(), e2); - } + JNDIUtil.initMockContextFactory(); } + catch (NamingException e2) { + throw new JbpmException("failed to initialize mock jndi", e2); + } + } } - - static Map<String, JMSMockObjectFactory> jmsMockObjectFactories = new HashMap<String, JMSMockObjectFactory>(); - static Map<String, JMSTestModule> jmsTestModules = new HashMap<String, JMSTestModule>(); - - public static void createQueue(String connectionFactoryJndiName, String queueJndiName) { - MockQueue queue = getJmsTestModule(connectionFactoryJndiName) - .getDestinationManager() - .createQueue(queueJndiName); - - bindToJndi(queueJndiName, queue); + + // hide default constructor to prevent instantiation + private JmsExtensions() { } - public static void removeQueue(String connectionFactoryJndiName, String queueJndiName) { - getJmsTestModule(connectionFactoryJndiName) - .getDestinationManager() - .removeQueue(queueJndiName); + private static final Map<String, JMSMockObjectFactory> jmsMockObjectFactories = new HashMap<String, JMSMockObjectFactory>(); + private static final Map<String, JMSTestModule> jmsTestModules = new HashMap<String, JMSTestModule>(); - unbindFromJndi(queueJndiName); + public static void createQueue(String connectionFactoryName, String queueName) { + MockQueue queue = getJmsTestModule(connectionFactoryName).getDestinationManager() + .createQueue(queueName); + + bindToJndi(queueName, queue); } - public static void createTopic(String connectionFactoryJndiName, String topicJndiName) { - MockTopic topic = getJmsTestModule(connectionFactoryJndiName) - .getDestinationManager() - .createTopic(topicJndiName); + public static void removeQueue(String connectionFactoryName, String queueName) { + getJmsTestModule(connectionFactoryName).getDestinationManager().removeQueue(queueName); + unbindFromJndi(queueName); + } - bindToJndi(topicJndiName, topic); + public static void createTopic(String connectionFactoryName, String topicName) { + MockTopic topic = getJmsTestModule(connectionFactoryName).getDestinationManager() + .createTopic(topicName); + bindToJndi(topicName, topic); } - public static void removeTopic(String connectionFactoryJndiName, String topicJndiName) { - getJmsTestModule(connectionFactoryJndiName) - .getDestinationManager() - .removeTopic(topicJndiName); - - unbindFromJndi(topicJndiName); + public static void removeTopic(String connectionFactoryName, String topicName) { + getJmsTestModule(connectionFactoryName).getDestinationManager().removeTopic(topicName); + unbindFromJndi(topicName); } protected static void bindToJndi(String jndiName, Object object) { try { new InitialContext().bind(jndiName, object); - } catch (Exception e) { - throw new JbpmException("couldn't bind object '"+object+"' to jndi name '"+jndiName+"': "+e.getMessage(), e); } + catch (NamingException e) { + throw new JbpmException("could not bind '" + jndiName + "' to: " + object, e); + } } protected static void unbindFromJndi(String jndiName) { try { new InitialContext().unbind(jndiName); - } catch (Exception e) { - throw new JbpmException("couldn't unbind object from jndi name '"+jndiName+"': "+e.getMessage(), e); } + catch (NamingException e) { + throw new JbpmException("could not unbind: " + jndiName, e); + } } - private static JMSTestModule getJmsTestModule(String connectionFactoryJndiName) { - JMSTestModule jmsTestModule = jmsTestModules.get(connectionFactoryJndiName); - if (jmsTestModule==null) { - JMSMockObjectFactory jmsMockObjectFactory = getMockObjectFactory(connectionFactoryJndiName); + private static JMSTestModule getJmsTestModule(String connectionFactoryName) { + JMSTestModule jmsTestModule = jmsTestModules.get(connectionFactoryName); + if (jmsTestModule == null) { + JMSMockObjectFactory jmsMockObjectFactory = getMockObjectFactory(connectionFactoryName); jmsTestModule = new JMSTestModule(jmsMockObjectFactory); - jmsTestModules.put(connectionFactoryJndiName, jmsTestModule); + jmsTestModules.put(connectionFactoryName, jmsTestModule); } return jmsTestModule; } - private static JMSMockObjectFactory getMockObjectFactory(String connectionFactoryJndiName) { - JMSMockObjectFactory jmsMockObjectFactory = jmsMockObjectFactories.get(connectionFactoryJndiName); - if (jmsMockObjectFactory==null) { + private static JMSMockObjectFactory getMockObjectFactory(String connectionFactoryName) { + JMSMockObjectFactory jmsMockObjectFactory = jmsMockObjectFactories.get(connectionFactoryName); + if (jmsMockObjectFactory == null) { jmsMockObjectFactory = new JMSMockObjectFactory(); - jmsMockObjectFactories.put(connectionFactoryJndiName, jmsMockObjectFactory); + jmsMockObjectFactories.put(connectionFactoryName, jmsMockObjectFactory); MockQueueConnectionFactory mockQueueConnectionFactory = jmsMockObjectFactory.getMockQueueConnectionFactory(); try { - new InitialContext().bind(connectionFactoryJndiName, mockQueueConnectionFactory); - } catch (Exception e) { - throw new JbpmException("couldn't bind mock queue connection factory '"+connectionFactoryJndiName+"': "+e.getMessage(), e); + new InitialContext().bind(connectionFactoryName, mockQueueConnectionFactory); } + catch (NamingException e) { + throw new JbpmException("couldn't bind mock queue connection factory '" + + connectionFactoryName + "': " + e.getMessage(), e); + } } return jmsMockObjectFactory; } - public static Object consumeMessageFromQueueXA(String connectionFactoryJndiName, String queueJndiName, long timeout) { + public static Message consumeMessage(String connectionFactoryName, String destinationName, + int acknowledgeMode, long timeout) { + Context context = null; + ConnectionFactory connectionFactory; + Destination queue; try { - InitialContext context = new InitialContext(); - Queue queue = (Queue)context.lookup(queueJndiName); - XAQueueConnectionFactory xaQueueConnectionFactory = (XAQueueConnectionFactory) context.lookup(connectionFactoryJndiName); - - XAQueueConnection xaQueueConnection = null; - XAQueueSession queueSession = null; - MessageConsumer messageConsumer = null; - try { - xaQueueConnection = xaQueueConnectionFactory.createXAQueueConnection(); - xaQueueConnection.start(); - queueSession = xaQueueConnection.createXAQueueSession(); - messageConsumer = queueSession.createConsumer(queue); - Message message = messageConsumer.receive(timeout); - if (message==null) { - throw new AssertionFailedError("no message on queue "+queueJndiName); + context = new InitialContext(); + queue = (Destination) context.lookup(destinationName); + connectionFactory = (ConnectionFactory) context.lookup(connectionFactoryName); + } + catch (NamingException e) { + throw new JbpmException("failed to receive message", e); + } + finally { + if (context != null) { + try { + context.close(); } - return message; - - } finally { - try { - messageConsumer.close(); - } catch (Exception e) { + catch (NamingException e) { e.printStackTrace(); } + } + } + + Connection connection = null; + try { + connection = connectionFactory.createConnection(); + connection.start(); + + Session session = connection.createSession(acknowledgeMode == Session.SESSION_TRANSACTED, + acknowledgeMode); + + MessageConsumer consumer = session.createConsumer(queue); + Message message = consumer.receive(timeout); + if (message == null) { + throw new JbpmException("no message on queue " + destinationName); + } + consumer.close(); + + if (acknowledgeMode == Session.SESSION_TRANSACTED) { + session.commit(); + } + session.close(); + + return message; + } + catch (JMSException e) { + throw new JbpmException("failed to receive message", e); + } + finally { + if (connection != null) { try { - queueSession.close(); - } catch (Exception e) { - e.printStackTrace(); + connection.close(); } - try { - xaQueueConnection.close(); - } catch (Exception e) { + catch (JMSException e) { e.printStackTrace(); } } - } catch (RuntimeException e) { - throw e; - } catch (Exception e) { - throw new JbpmException("couldn't receive message from queue: "+e.getMessage(), e); } } - public static Message consumeMessageFromQueue(String connectionFactoryJndiName, String queueJndiName, long timeout, boolean transacted, int acknowledgeMode) { + public static boolean isQueueEmpty(String connectionFactoryName, String queueName, + int acknowledgeMode, long timeout) { + Context context = null; + ConnectionFactory connectionFactory; + Queue queue; try { - InitialContext context = new InitialContext(); - QueueConnectionFactory queueConnectionFactory = (QueueConnectionFactory) context.lookup(connectionFactoryJndiName); - Queue queue = (Queue)context.lookup(queueJndiName); - - QueueConnection queueConnection = null; - QueueSession queueSession = null; - MessageConsumer messageConsumer = null; - - try { - queueConnection = queueConnectionFactory.createQueueConnection(); - queueConnection.start(); - queueSession = queueConnection.createQueueSession(transacted, acknowledgeMode); - messageConsumer = queueSession.createConsumer(queue); - Message message = messageConsumer.receive(timeout); - if (message==null) { - throw new AssertionFailedError("no message on queue "+queueJndiName); - } - if (transacted) { - queueSession.commit(); - } - return message; - - } finally { + context = new InitialContext(); + queue = (Queue) context.lookup(queueName); + connectionFactory = (ConnectionFactory) context.lookup(connectionFactoryName); + } + catch (NamingException e) { + throw new JbpmException("failed to receive message", e); + } + finally { + if (context != null) { try { - messageConsumer.close(); - } catch (Exception e) { - e.printStackTrace(); + context.close(); } - try { - queueSession.close(); - } catch (Exception e) { + catch (NamingException e) { e.printStackTrace(); } - try { - queueConnection.close(); - } catch (Exception e) { - e.printStackTrace(); - } } - } catch (RuntimeException e) { - throw e; - } catch (Exception e) { - throw new JbpmException("couldn't receive message from queue: "+e.getMessage(), e); } - } - public static void jmsAssertQueueEmptyXA(String connectionFactoryJndiName, String queueJndiName, long timeout) { + Connection connection = null; try { - consumeMessageFromQueueXA(connectionFactoryJndiName, queueJndiName, timeout); - } catch (AssertionFailedError e) { - if (e.getMessage().startsWith("no message on queue")) { - return; + connection = connectionFactory.createConnection(); + connection.start(); + + Session session = connection.createSession(acknowledgeMode == Session.SESSION_TRANSACTED, + acknowledgeMode); + + QueueBrowser browser = session.createBrowser(queue); + boolean isEmpty = !browser.getEnumeration().hasMoreElements(); + browser.close(); + + if (acknowledgeMode == Session.SESSION_TRANSACTED) { + session.commit(); } + session.close(); + + return isEmpty; } - throw new AssertionFailedError("message available on queue "+queueJndiName); - } - - public static void jmsAssertQueueEmpty(String connectionFactoryJndiName, String queueJndiName, long timeout, boolean transacted, int acknowledgeMode) { - try { - consumeMessageFromQueue(connectionFactoryJndiName, queueJndiName, timeout, transacted, acknowledgeMode); - } catch (AssertionFailedError e) { - if (e.getMessage().startsWith("no message on queue")) { - return; + catch (JMSException e) { + throw new JbpmException("failed to receive message", e); + } + finally { + if (connection != null) { + try { + connection.close(); + } + catch (JMSException e) { + e.printStackTrace(); + } } } - throw new AssertionFailedError("message available on queue "+queueJndiName); } } Modified: jbpm4/trunk/modules/test-cfg/src/test/java/org/jbpm/test/jms/JmsQueueTest.java =================================================================== --- jbpm4/trunk/modules/test-cfg/src/test/java/org/jbpm/test/jms/JmsQueueTest.java 2010-08-19 14:20:33 UTC (rev 6614) +++ jbpm4/trunk/modules/test-cfg/src/test/java/org/jbpm/test/jms/JmsQueueTest.java 2010-08-20 03:14:27 UTC (rev 6615) @@ -25,36 +25,36 @@ import org.jbpm.test.JbpmCustomCfgTestCase; - /** * @author Tom Baeyens */ public class JmsQueueTest extends JbpmCustomCfgTestCase { String deploymentId; - + protected void setUp() throws Exception { super.setUp(); - + deploymentId = repositoryService.createDeployment() - .addResourceFromClasspath("org/jbpm/test/jms/queueprocess.jpdl.xml") - .deploy(); - + .addResourceFromClasspath("org/jbpm/test/jms/queueprocess.jpdl.xml") + .deploy(); + jmsCreateQueue("jms/ConnectionFactory", "queue/ProductQueue"); } protected void tearDown() throws Exception { jmsRemoveQueue("jms/ConnectionFactory", "queue/ProductQueue"); - + repositoryService.deleteDeploymentCascade(deploymentId); - + super.tearDown(); } public void testQueueMessage() throws Exception { executionService.startProcessInstanceByKey("JmsQueue"); - - MapMessage mapMessage = (MapMessage) jmsConsumeMessageFromQueue("jms/ConnectionFactory", "queue/ProductQueue"); + + MapMessage mapMessage = (MapMessage) jmsConsumeMessage("jms/ConnectionFactory", + "queue/ProductQueue"); assertEquals("shampoo", mapMessage.getString("product")); } } Modified: jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/Buzzz.java =================================================================== --- jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/Buzzz.java 2010-08-19 14:20:33 UTC (rev 6614) +++ jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/Buzzz.java 2010-08-20 03:14:27 UTC (rev 6615) @@ -21,10 +21,10 @@ */ package org.jbpm.test.jms; +import org.jbpm.api.JbpmException; import org.jbpm.api.activity.ActivityBehaviour; import org.jbpm.api.activity.ActivityExecution; - /** * @author Tom Baeyens */ @@ -33,6 +33,6 @@ private static final long serialVersionUID = 1L; public void execute(ActivityExecution execution) throws Exception { - throw new RuntimeException("buzzz"); + throw new JbpmException("buzzz"); } } Modified: jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/QueueExceptionTest.java =================================================================== --- jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/QueueExceptionTest.java 2010-08-19 14:20:33 UTC (rev 6614) +++ jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/QueueExceptionTest.java 2010-08-20 03:14:27 UTC (rev 6615) @@ -21,12 +21,14 @@ */ package org.jbpm.test.jms; +import javax.jms.Session; + import junit.framework.Test; import org.apache.cactus.ServletTestSuite; +import org.jbpm.api.JbpmException; import org.jbpm.test.JbpmTestCase; - /** * @author Tom Baeyens */ @@ -37,24 +39,24 @@ servletTestSuite.addTestSuite(QueueTextMessageTest.class); return servletTestSuite; } - + protected void setUp() throws Exception { - super.setUp(); + super.setUp(); registerDeployment(repositoryService.createDeployment() - .addResourceFromClasspath("org/jbpm/test/jms/queue.text.process.jpdl.xml") - .deploy()); + .addResourceFromClasspath("org/jbpm/test/jms/queue.exception.process.jpdl.xml") + .deploy()); } - + public void testQueueMessageException() throws Exception { try { executionService.startProcessInstanceByKey("JmsQueueException"); fail("expected exception"); - } catch (Exception e) { + } + catch (JbpmException e) { // OK } - jmsAssertQueueEmptyXA("java:JmsXA", "queue/jbpm-test-queue", 1000); - + jmsAssertQueueEmpty("java:JmsXA", "queue/jbpm-test-queue", Session.AUTO_ACKNOWLEDGE, 1000); assertEquals(0, executionService.createProcessInstanceQuery().list().size()); } } Modified: jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/QueueMapMessageTest.java =================================================================== --- jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/QueueMapMessageTest.java 2010-08-19 14:20:33 UTC (rev 6614) +++ jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/QueueMapMessageTest.java 2010-08-20 03:14:27 UTC (rev 6615) @@ -45,7 +45,7 @@ public void testQueueMapMessage() throws Exception { executionService.startProcessInstanceByKey("JmsQueueMap"); - MapMessage mapMessage = (MapMessage) jmsConsumeMessageFromQueue("java:JmsXA", "queue/jbpm-test-queue", 1000, false, Session.AUTO_ACKNOWLEDGE); + MapMessage mapMessage = (MapMessage) jmsConsumeMessage("java:JmsXA", "queue/jbpm-test-queue"); assertTrue(mapMessage.itemExists("x")); assertEquals("foo", mapMessage.getObject("x")); } Modified: jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/QueueObjectMessageTest.java =================================================================== --- jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/QueueObjectMessageTest.java 2010-08-19 14:20:33 UTC (rev 6614) +++ jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/QueueObjectMessageTest.java 2010-08-20 03:14:27 UTC (rev 6615) @@ -52,7 +52,7 @@ Map<String, Object> variables = new HashMap<String, Object>(); variables.put("object", "this is the object"); executionService.startProcessInstanceByKey("JmsQueueObject", variables); - ObjectMessage objectMessage = (ObjectMessage) jmsConsumeMessageFromQueue("java:JmsXA", "queue/jbpm-test-queue", 1000, false, Session.AUTO_ACKNOWLEDGE); + ObjectMessage objectMessage = (ObjectMessage) jmsConsumeMessage("java:JmsXA", "queue/jbpm-test-queue"); assertEquals("this is the object", objectMessage.getObject()); } Modified: jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/QueueTextMessageTest.java =================================================================== --- jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/QueueTextMessageTest.java 2010-08-19 14:20:33 UTC (rev 6614) +++ jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/QueueTextMessageTest.java 2010-08-20 03:14:27 UTC (rev 6615) @@ -46,7 +46,7 @@ public void testQueueTextMessage() throws Exception { executionService.startProcessInstanceByKey("JmsQueueText"); - TextMessage textMessage = (TextMessage) jmsConsumeMessageFromQueue("java:JmsXA", "queue/jbpm-test-queue", 1000, false, Session.AUTO_ACKNOWLEDGE); + TextMessage textMessage = (TextMessage) jmsConsumeMessage("java:JmsXA", "queue/jbpm-test-queue", Session.AUTO_ACKNOWLEDGE, 1000); assertEquals("This is the body", textMessage.getText()); } } Modified: jbpm4/trunk/qa/hudson-jbpm4-enterprise.sh =================================================================== --- jbpm4/trunk/qa/hudson-jbpm4-enterprise.sh 2010-08-19 14:20:33 UTC (rev 6614) +++ jbpm4/trunk/qa/hudson-jbpm4-enterprise.sh 2010-08-20 03:14:27 UTC (rev 6615) @@ -2,7 +2,7 @@ # # runs the jboss integration test suite -export MAVEN_OPTS="-Dbind.address=$JBOSS_BINDADDR" +export MAVEN_OPTS="-Dbind.address=$MYTESTIP_1" JBPM_VERSION=`mvn -Dexpression=project.version help:evaluate | grep '^4\.'` export ANT_OPTS="-Djbpm.parent.dir=$WORKSPACE -Djbpm.version=$JBPM_VERSION \ Modified: jbpm4/trunk/qa/hudson-jbpm4-jboss.sh =================================================================== --- jbpm4/trunk/qa/hudson-jbpm4-jboss.sh 2010-08-19 14:20:33 UTC (rev 6614) +++ jbpm4/trunk/qa/hudson-jbpm4-jboss.sh 2010-08-20 03:14:27 UTC (rev 6615) @@ -2,7 +2,7 @@ # # runs the jboss integration test suite -export MAVEN_OPTS="-Dbind.address=$JBOSS_BINDADDR" +export MAVEN_OPTS="-Dbind.address=$MYTESTIP_1" JBPM_VERSION=`mvn -Dexpression=project.version help:evaluate | grep '^4\.'` export ANT_OPTS="-Djbpm.parent.dir=$WORKSPACE -Djbpm.version=$JBPM_VERSION \ Modified: jbpm4/trunk/qa/hudson-jbpm4-tomcat.sh =================================================================== --- jbpm4/trunk/qa/hudson-jbpm4-tomcat.sh 2010-08-19 14:20:33 UTC (rev 6614) +++ jbpm4/trunk/qa/hudson-jbpm4-tomcat.sh 2010-08-20 03:14:27 UTC (rev 6615) @@ -2,7 +2,7 @@ # # runs the tomcat integration test suite -export MAVEN_OPTS="-Dbind.address=$TOMCAT_BINDADDR" +export MAVEN_OPTS="-Dbind.address=$MYTESTIP_1" JBPM_VERSION=`mvn -Dexpression=project.version help:evaluate | grep '^4\.'` export ANT_OPTS="-Djbpm.parent.dir=$WORKSPACE -Djbpm.version=$JBPM_VERSION \

13 years, 10 months

1
0
0 / 0

JBoss JBPM SVN: r6614 - in jbpm4/trunk/modules: api/src/main/java/org/jbpm/api/model and 1 other directories.

by do-not-reply＠jboss.org

Author: rebody Date: 2010-08-19 10:20:33 -0400 (Thu, 19 Aug 2010) New Revision: 6614 Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/listener/EventListenerExecution.java jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/model/Event.java jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/eventlistener/EventListenerTest.java Log: JBPM-2805 expose event from EventListenerExecution. Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/listener/EventListenerExecution.java =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/listener/EventListenerExecution.java 2010-08-19 14:14:16 UTC (rev 6613) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/listener/EventListenerExecution.java 2010-08-19 14:20:33 UTC (rev 6614) @@ -22,20 +22,24 @@ package org.jbpm.api.listener; import org.jbpm.api.Execution; +import org.jbpm.api.model.Event; import org.jbpm.api.model.OpenExecution; -/** view upon an {@link Execution path of execution} exposed to +/** view upon an {@link Execution path of execution} exposed to * {@link EventListener} implementations. - * + * * @author Tom Baeyens */ public interface EventListenerExecution extends OpenExecution { - - /** setter for the priority. The default priority is 0, which means - * NORMAL. Other recognized named priorities are HIGHEST (2), HIGH (1), - * LOW (-1) and LOWEST (-2). For the rest, the user can set any other - * priority integer value, but then, the UI will have to display it as + + /** setter for the priority. The default priority is 0, which means + * NORMAL. Other recognized named priorities are HIGHEST (2), HIGH (1), + * LOW (-1) and LOWEST (-2). For the rest, the user can set any other + * priority integer value, but then, the UI will have to display it as * an integer and not the named value.*/ void setPriority(int priority); + + /** get the event of execution. */ + Event getEvent(); } Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/model/Event.java =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/model/Event.java 2010-08-19 14:14:16 UTC (rev 6613) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/model/Event.java 2010-08-19 14:20:33 UTC (rev 6614) @@ -23,7 +23,7 @@ /** event constants. - * + * * @author Tom Baeyens */ public interface Event { @@ -38,4 +38,7 @@ String ASSIGN = "assign"; /** fired when an assignee is reminded of a task */ String REMIND = "remind"; + + /** get the name of event. */ + String getName(); } Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/eventlistener/EventListenerTest.java =================================================================== --- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/eventlistener/EventListenerTest.java 2010-08-19 14:14:16 UTC (rev 6613) +++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/eventlistener/EventListenerTest.java 2010-08-19 14:20:33 UTC (rev 6614) @@ -36,7 +36,7 @@ * @author Tom Baeyens */ public class EventListenerTest extends JbpmTestCase { - + public static class ProcessStartListener implements EventListener { private static final long serialVersionUID = 1L; public void notify(EventListenerExecution execution) { @@ -56,15 +56,15 @@ " <state name='a' />" + "</process>" ); - + String processInstanceId = executionService.startProcessInstanceByKey("ICL").getId(); assertEquals("true", executionService.getVariable(processInstanceId, "isInvoked")); - + executionService.setVariable(processInstanceId, "isInvoked", "false"); - + executionService.signalExecutionById(processInstanceId); - + assertEquals("false", executionService.getVariable(processInstanceId, "isInvoked")); } @@ -95,15 +95,15 @@ " <state name='b' />" + "</process>" ); - + String processInstanceId = executionService.startProcessInstanceByKey("ICL").getId(); - // the PropagationEnabledListener is invoked once for the start event + // the PropagationEnabledListener is invoked once for the start event // of the process and once for the start event of activity a assertEquals(2, executionService.getVariable(processInstanceId, "invocations")); - + executionService.signalExecutionById(processInstanceId); - + // the listener is invoked once more for the start of activity b assertEquals(3, executionService.getVariable(processInstanceId, "invocations")); } @@ -130,9 +130,9 @@ " <state name='end' />" + "</process>" ); - + String processInstanceId = executionService.startProcessInstanceByKey("ICL").getId(); - + assertEquals("true", executionService.getVariable(processInstanceId, "isInvoked")); } @@ -158,12 +158,12 @@ " <state name='end' />" + "</process>" ); - + ProcessInstance processInstance = executionService.startProcessInstanceByKey("ICL"); String processInstanceId = processInstance.getId(); assertNull(executionService.getVariable(processInstanceId, "isInvoked")); - + executionService.signalExecutionById(processInstance.getId()); assertEquals("true", executionService.getVariable(processInstanceId, "isInvoked")); @@ -187,9 +187,9 @@ " <state name='end' />" + "</process>" ); - + String processInstanceId = executionService.startProcessInstanceByKey("ICL").getId(); - + assertEquals("true", executionService.getVariable(processInstanceId, "isInvoked")); } @@ -228,21 +228,46 @@ " <state name='end' />" + "</process>" ); - + Map<String, Object> variables = new HashMap<String, Object>(); variables.put("order", new ArrayList<Integer>()); String processInstanceId = executionService.startProcessInstanceByKey("ICL", variables).getId(); - + List<Integer> expectedOrder = new ArrayList<Integer>(); expectedOrder.add(1); expectedOrder.add(2); expectedOrder.add(3); expectedOrder.add(4); expectedOrder.add(5); - + assertEquals(expectedOrder, executionService.getVariable(processInstanceId, "order")); } + public static class RetrieveEventNameListener implements EventListener { + private static final long serialVersionUID = 1L; + public void notify(EventListenerExecution execution) { + execution.setVariable("retrieveEventName", execution.getEvent().getName()); + } + } + + public void testRetrieveEventNameListener() { + deployJpdlXmlString( + "<process name='retrieve event name' key='ICL'>" + + " <start>" + + " <on event='end'>" + + " <event-listener class='" + RetrieveEventNameListener.class.getName() + "' />" + + " </on>" + + " <transition to='end'/>" + + " </start>" + + " <state name='end' />" + + "</process>" + ); + + String processInstanceId = executionService.startProcessInstanceByKey("ICL").getId(); + + assertEquals("end", executionService.getVariable(processInstanceId, "retrieveEventName")); + } + public void testProcessStartListenerExpr() { deployJpdlXmlString( "<process name='Insurance claim' key='ICL'>" + @@ -255,17 +280,17 @@ " <state name='a' />" + "</process>" ); - + Map<String, Object> variables = new HashMap<String, Object>(); variables.put("processstartlistener", new ProcessStartListener()); String processInstanceId = executionService.startProcessInstanceByKey("ICL", variables).getId(); assertEquals("true", executionService.getVariable(processInstanceId, "isInvoked")); - + executionService.setVariable(processInstanceId, "isInvoked", "false"); - + executionService.signalExecutionById(processInstanceId); - + assertEquals("false", executionService.getVariable(processInstanceId, "isInvoked")); } @@ -284,11 +309,11 @@ " <state name='end' />" + "</process>" ); - + Map<String, Object> variables = new HashMap<String, Object>(); variables.put("activitystartlistener", new ActivityStartListener()); String processInstanceId = executionService.startProcessInstanceByKey("ICL", variables).getId(); - + assertEquals("true", executionService.getVariable(processInstanceId, "isInvoked")); } @@ -307,14 +332,14 @@ " <state name='end' />" + "</process>" ); - + Map<String, Object> variables = new HashMap<String, Object>(); variables.put("activityendlistener", new ActivityEndListener()); ProcessInstance processInstance = executionService.startProcessInstanceByKey("ICL", variables); String processInstanceId = processInstance.getId(); assertNull(executionService.getVariable(processInstanceId, "isInvoked")); - + executionService.signalExecutionById(processInstance.getId()); assertEquals("true", executionService.getVariable(processInstanceId, "isInvoked"));

13 years, 10 months

1
0
0 / 0

JBoss JBPM SVN: r6613 - in jbpm4/trunk/modules: pvm/src/main/java/org/jbpm/pvm/internal/id and 1 other directory.

by do-not-reply＠jboss.org

Author: rebody Date: 2010-08-19 10:14:16 -0400 (Thu, 19 Aug 2010) New Revision: 6613 Modified: jbpm4/trunk/modules/db/src/main/java/org/jbpm/db/Upgrade.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/id/PropertyImpl.java Log: JBPM-2927 move propertiesTableExists() method to DbSession in jbpm-db module. Modified: jbpm4/trunk/modules/db/src/main/java/org/jbpm/db/Upgrade.java =================================================================== --- jbpm4/trunk/modules/db/src/main/java/org/jbpm/db/Upgrade.java 2010-08-19 07:18:17 UTC (rev 6612) +++ jbpm4/trunk/modules/db/src/main/java/org/jbpm/db/Upgrade.java 2010-08-19 14:14:16 UTC (rev 6613) @@ -37,6 +37,7 @@ import org.jbpm.pvm.internal.processengine.ProcessEngineImpl; import org.jbpm.pvm.internal.repository.DeploymentImpl; import org.jbpm.pvm.internal.repository.DeploymentProperty; +import org.jbpm.pvm.internal.session.DbSession; import org.jbpm.pvm.internal.util.CollectionUtil; /** @@ -92,8 +93,8 @@ static final PropertiesTableExists INSTANCE = new PropertiesTableExists(); public Boolean execute(Environment environment) throws Exception { - Session session = environment.get(Session.class); - return PropertyImpl.propertiesTableExists(session); + DbSession dbSession = environment.get(DbSession.class); + return dbSession.propertiesTableExists(); } } Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/id/PropertyImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/id/PropertyImpl.java 2010-08-19 07:18:17 UTC (rev 6612) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/id/PropertyImpl.java 2010-08-19 14:14:16 UTC (rev 6613) @@ -93,17 +93,6 @@ } } - public static boolean propertiesTableExists(Session session) { - try { - session.createCriteria(PropertyImpl.class) - .setMaxResults(1) - .uniqueResult(); - return true; - } catch (RuntimeException e) { - return false; - } - } - protected static String getPropertyValue(Session session, String propertyKey) { PropertyImpl dbidProperty = getProperty(session, propertyKey); if (dbidProperty == null) {

13 years, 10 months

1
0
0 / 0

JBoss JBPM SVN: r6612 - jbpm3/branches/jbpm-3.2-soa/docs/images and 2 other directories.

by do-not-reply＠jboss.org

Author: alex.guizar(a)jboss.com Date: 2010-08-19 03:18:17 -0400 (Thu, 19 Aug 2010) New Revision: 6612 Added: jbpm3/branches/jbpm-3.2-soa/docs/images/definition_data_model.png jbpm3/branches/jbpm-3.2-soa/docs/images/execution_data_model.png jbpm3/branches/jbpm-3.2-soa/modules/examples/src/test/resources/door/processimage.jpg Removed: jbpm3/branches/jbpm-3.2-soa/docs/cobertura/ jbpm3/branches/jbpm-3.2-soa/docs/db/ jbpm3/branches/jbpm-3.2-soa/docs/tattletale/ Modified: jbpm3/branches/jbpm-3.2-soa/modules/examples/src/test/resources/door/gpd.xml jbpm3/branches/jbpm-3.2-soa/modules/examples/src/test/resources/door/processdefinition.xml projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/.project Log: remove generated reports, they make checkouts slow and grow ever staler Copied: jbpm3/branches/jbpm-3.2-soa/docs/images/definition_data_model.png (from rev 6598, jbpm3/branches/jbpm-3.2-soa/docs/db/JBossjBPMDefinitionDataModel.png) =================================================================== (Binary files differ) Copied: jbpm3/branches/jbpm-3.2-soa/docs/images/execution_data_model.png (from rev 6598, jbpm3/branches/jbpm-3.2-soa/docs/db/JBossjBPMExecutionDataModel.png) =================================================================== (Binary files differ) Modified: jbpm3/branches/jbpm-3.2-soa/modules/examples/src/test/resources/door/gpd.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/examples/src/test/resources/door/gpd.xml 2010-08-19 04:35:22 UTC (rev 6611) +++ jbpm3/branches/jbpm-3.2-soa/modules/examples/src/test/resources/door/gpd.xml 2010-08-19 07:18:17 UTC (rev 6612) @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> -<root-container name="door" width="781" height="626"> - <node name="Locked" x="96" y="24" width="140" height="40"> +<root-container name="door" width="237" height="420"> + <node name="Locked" x="48" y="25" width="140" height="40"> <edge> <label x="-34" y="-12"/> <bendpoint w1="-26" h1="54" w2="-26" h2="-54"/> </edge> </node> - <node name="Closed" x="96" y="132" width="140" height="40"> + <node name="Closed" x="48" y="133" width="140" height="40"> <edge> <label x="5" y="-10"/> <bendpoint w1="22" h1="-54" w2="22" h2="54"/> @@ -17,7 +17,7 @@ <bendpoint w1="-27" h1="55" w2="-27" h2="-53"/> </edge> </node> - <node name="Open" x="96" y="240" width="140" height="40"> + <node name="Open" x="48" y="241" width="140" height="40"> <edge> <label x="7" y="-6"/> <bendpoint w1="21" h1="-55" w2="21" h2="53"/> @@ -27,10 +27,18 @@ <bendpoint w1="-23" h1="55" w2="-23" h2="-53"/> </edge> </node> - <node name="Open Locked" x="96" y="348" width="140" height="40"> + <node name="Open Locked" x="48" y="349" width="140" height="40"> <edge> <label x="5" y="-10"/> <bendpoint w1="21" h1="-53" w2="21" h2="55"/> </edge> </node> + <deployment serverName="" serverPort="" serverDeployer=""> + <classesAndResources/> + <filesAndFolders> + <element value="/jbpm-examples/src/test/resources/door/gpd.xml"/> + <element value="/jbpm-examples/src/test/resources/door/processdefinition.xml"/> + <element value="/jbpm-examples/src/test/resources/door/processimage.jpg"/> + </filesAndFolders> + </deployment> </root-container> Modified: jbpm3/branches/jbpm-3.2-soa/modules/examples/src/test/resources/door/processdefinition.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/examples/src/test/resources/door/processdefinition.xml 2010-08-19 04:35:22 UTC (rev 6611) +++ jbpm3/branches/jbpm-3.2-soa/modules/examples/src/test/resources/door/processdefinition.xml 2010-08-19 07:18:17 UTC (rev 6612) @@ -1,20 +1,21 @@ <?xml version="1.0" encoding="UTF-8"?> <process-definition name="door" initial="Closed"> + <state name="Locked"> + <transition name="unlock" to="Closed" /> + </state> - <state name="Locked"> - <transition name="unlock" to="Closed" /> - </state> - <state name="Closed"> - <transition name="lock" to="Locked" /> - <transition name="open" to="Open" /> - </state> - <state name="Open"> - <transition name="close" to="Closed" /> - <transition name="lock" to="Open Locked" /> - </state> - <state name="Open Locked"> - <transition name="unlock" to="Open" /> - </state> + <state name="Closed"> + <transition name="lock" to="Locked" /> + <transition name="open" to="Open" /> + </state> + <state name="Open"> + <transition name="close" to="Closed" /> + <transition name="lock" to="Open Locked" /> + </state> + + <state name="Open Locked"> + <transition name="unlock" to="Open" /> + </state> </process-definition> \ No newline at end of file Added: jbpm3/branches/jbpm-3.2-soa/modules/examples/src/test/resources/door/processimage.jpg =================================================================== (Binary files differ) Property changes on: jbpm3/branches/jbpm-3.2-soa/modules/examples/src/test/resources/door/processimage.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/.project =================================================================== --- projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/.project 2010-08-19 04:35:22 UTC (rev 6611) +++ projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/.project 2010-08-19 07:18:17 UTC (rev 6612) @@ -16,12 +16,12 @@ </arguments> </buildCommand> <buildCommand> - <name>org.maven.ide.eclipse.maven2Builder</name> + <name>org.eclipse.wst.validation.validationbuilder</name> <arguments> </arguments> </buildCommand> <buildCommand> - <name>org.eclipse.wst.validation.validationbuilder</name> + <name>org.maven.ide.eclipse.maven2Builder</name> <arguments> </arguments> </buildCommand>

13 years, 10 months

1
0
0 / 0

JBoss JBPM SVN: r6611 - in jbpm4/trunk/modules: test-db/src/test/java/org/jbpm/test and 1 other directories.

by do-not-reply＠jboss.org

Author: alex.guizar(a)jboss.com Date: 2010-08-19 00:35:22 -0400 (Thu, 19 Aug 2010) New Revision: 6611 Added: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/auth/AuthenticatedUserExprTest.java Removed: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/authenticateduser/ Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/id/PropertyImpl.java jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/auth/UserProvidedAuthenticationTest.java Log: restore method PropertyImpl.propertyTableExists(), needed by org.jbpm.db.Upgrade in jbpm-db module; align AuthenticatedUserExprTest package with directory location to restore jboss and tomcat hudson jobs Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/id/PropertyImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/id/PropertyImpl.java 2010-08-19 03:18:32 UTC (rev 6610) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/id/PropertyImpl.java 2010-08-19 04:35:22 UTC (rev 6611) @@ -21,31 +21,12 @@ */ package org.jbpm.pvm.internal.id; -import java.util.ArrayList; -import java.util.List; - import org.hibernate.Session; import org.jbpm.internal.log.Log; import org.jbpm.pvm.internal.env.EnvironmentImpl; -import org.jbpm.pvm.internal.history.model.HistoryActivityInstanceImpl; -import org.jbpm.pvm.internal.history.model.HistoryDetailImpl; -import org.jbpm.pvm.internal.history.model.HistoryTaskImpl; -import org.jbpm.pvm.internal.history.model.HistoryVariableImpl; -import org.jbpm.pvm.internal.identity.impl.GroupImpl; -import org.jbpm.pvm.internal.identity.impl.MembershipImpl; -import org.jbpm.pvm.internal.identity.impl.UserImpl; -import org.jbpm.pvm.internal.job.JobImpl; -import org.jbpm.pvm.internal.lob.Lob; -import org.jbpm.pvm.internal.model.ExecutionImpl; import org.jbpm.pvm.internal.processengine.ProcessEngineImpl; -import org.jbpm.pvm.internal.repository.DeploymentImpl; -import org.jbpm.pvm.internal.repository.DeploymentProperty; import org.jbpm.pvm.internal.session.DbSession; -import org.jbpm.pvm.internal.task.ParticipationImpl; -import org.jbpm.pvm.internal.task.SwimlaneImpl; -import org.jbpm.pvm.internal.task.TaskImpl; -import org.jbpm.pvm.internal.type.Variable; /** jbpm installation properties. * @@ -112,6 +93,17 @@ } } + public static boolean propertiesTableExists(Session session) { + try { + session.createCriteria(PropertyImpl.class) + .setMaxResults(1) + .uniqueResult(); + return true; + } catch (RuntimeException e) { + return false; + } + } + protected static String getPropertyValue(Session session, String propertyKey) { PropertyImpl dbidProperty = getProperty(session, propertyKey); if (dbidProperty == null) { Copied: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/auth/AuthenticatedUserExprTest.java (from rev 6609, jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/authenticateduser/AuthenticatedUserExprTest.java) =================================================================== --- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/auth/AuthenticatedUserExprTest.java (rev 0) +++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/auth/AuthenticatedUserExprTest.java 2010-08-19 04:35:22 UTC (rev 6611) @@ -0,0 +1,54 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jbpm.test.auth; + +import java.util.List; + +import org.jbpm.api.task.Task; +import org.jbpm.test.JbpmTestCase; + +/** + * @author Huisheng Xu + */ +public class AuthenticatedUserExprTest extends JbpmTestCase { + + public void testTaskAssignmentHandlerExpr() { + deployJpdlXmlString( + "<process name='AuthenticatedUser'>" + + " <start>" + + " <transition to='review' />" + + " </start>" + + " <task name='review' assignee='#{environment.authenticatedUserId}'>" + + " <transition to='wait' />" + + " </task>" + + " <state name='wait'/>" + + "</process>" + ); + processEngine.setAuthenticatedUserId("johndoe"); + executionService.startProcessInstanceByKey("AuthenticatedUser"); + + List<Task> taskList = taskService.findPersonalTasks("johndoe"); + assertEquals("Expected a single task being created", 1, taskList.size()); + Task task = taskList.get(0); + assertEquals("review", task.getName()); + } +} Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/auth/UserProvidedAuthenticationTest.java =================================================================== --- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/auth/UserProvidedAuthenticationTest.java 2010-08-19 03:18:32 UTC (rev 6610) +++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/auth/UserProvidedAuthenticationTest.java 2010-08-19 04:35:22 UTC (rev 6611) @@ -22,10 +22,10 @@ package org.jbpm.test.auth; import org.jbpm.api.Execution; +import org.jbpm.api.history.HistoryComment; import org.jbpm.api.task.Task; import org.jbpm.test.JbpmTestCase; - /** * @author Tom Baeyens */ @@ -51,8 +51,8 @@ .uniqueResult(); processEngine.setAuthenticatedUserId("jackblack"); - taskService.addTaskComment(task.getId(), "the lord of the ring"); + HistoryComment comment = taskService.addTaskComment(task.getId(), "the lord of the ring"); - task.getId(); + assertEquals("jackblack", comment.getUserId()); } }

13 years, 10 months

1
0
0 / 0

JBoss JBPM SVN: r6610 - jbpm4/trunk/modules/api.

by do-not-reply＠jboss.org

Author: alex.guizar(a)jboss.com Date: 2010-08-18 23:18:32 -0400 (Wed, 18 Aug 2010) New Revision: 6610 Modified: jbpm4/trunk/modules/api/pom.xml Log: point xsddoc tool to jpdl 4.4 schema Modified: jbpm4/trunk/modules/api/pom.xml =================================================================== --- jbpm4/trunk/modules/api/pom.xml 2010-08-18 10:59:15 UTC (rev 6609) +++ jbpm4/trunk/modules/api/pom.xml 2010-08-19 03:18:32 UTC (rev 6610) @@ -104,8 +104,8 @@ <arg value="target/schemadocs" /> <arg value="-nodialog" /> <arg value="-launchviewer=false" /> - <arg value="-p:docTitle=jPDL 4.0 Schema" /> - <arg value="src/main/resources/jpdl-4.0.xsd" /> + <arg value="-p:docTitle=jPDL 4.4 Schema" /> + <arg value="src/main/resources/jpdl-4.4.xsd" /> </java> </tasks> </configuration> @@ -116,4 +116,4 @@ </build> </profile> </profiles> -</project> \ No newline at end of file +</project>

13 years, 10 months

1
0
0 / 0

JBoss JBPM SVN: r6609 - in jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal: id and 1 other directories.

by do-not-reply＠jboss.org

Author: rebody Date: 2010-08-18 06:59:15 -0400 (Wed, 18 Aug 2010) New Revision: 6609 Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/DbSessionImpl.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/id/InitializePropertiesCmd.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/id/PropertyImpl.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/session/DbSession.java Log: JBPM-2927 move getMaxId() to DbSession. Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/DbSessionImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/DbSessionImpl.java 2010-08-18 10:04:59 UTC (rev 6608) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/DbSessionImpl.java 2010-08-18 10:59:15 UTC (rev 6609) @@ -22,6 +22,7 @@ package org.jbpm.pvm.internal.hibernate; import java.io.Serializable; +import java.util.ArrayList; import java.util.Collection; import java.util.List; @@ -39,14 +40,23 @@ import org.jbpm.internal.log.Log; import org.jbpm.pvm.internal.client.ClientExecution; import org.jbpm.pvm.internal.env.EnvironmentImpl; +import org.jbpm.pvm.internal.history.model.HistoryActivityInstanceImpl; +import org.jbpm.pvm.internal.history.model.HistoryDetailImpl; import org.jbpm.pvm.internal.history.model.HistoryCommentImpl; import org.jbpm.pvm.internal.history.model.HistoryProcessInstanceImpl; +import org.jbpm.pvm.internal.history.model.HistoryTaskImpl; +import org.jbpm.pvm.internal.history.model.HistoryVariableImpl; import org.jbpm.pvm.internal.id.DbidGenerator; import org.jbpm.pvm.internal.id.PropertyImpl; +import org.jbpm.pvm.internal.identity.impl.GroupImpl; +import org.jbpm.pvm.internal.identity.impl.MembershipImpl; +import org.jbpm.pvm.internal.identity.impl.UserImpl; import org.jbpm.pvm.internal.job.JobImpl; +import org.jbpm.pvm.internal.lob.Lob; import org.jbpm.pvm.internal.job.StartProcessTimer; import org.jbpm.pvm.internal.job.TimerImpl; import org.jbpm.pvm.internal.model.ExecutionImpl; +import org.jbpm.pvm.internal.processengine.ProcessEngineImpl; import org.jbpm.pvm.internal.query.DeploymentQueryImpl; import org.jbpm.pvm.internal.query.HistoryActivityInstanceQueryImpl; import org.jbpm.pvm.internal.query.HistoryDetailQueryImpl; @@ -54,8 +64,13 @@ import org.jbpm.pvm.internal.query.JobQueryImpl; import org.jbpm.pvm.internal.query.ProcessInstanceQueryImpl; import org.jbpm.pvm.internal.query.TaskQueryImpl; +import org.jbpm.pvm.internal.repository.DeploymentImpl; +import org.jbpm.pvm.internal.repository.DeploymentProperty; import org.jbpm.pvm.internal.session.DbSession; +import org.jbpm.pvm.internal.task.ParticipationImpl; +import org.jbpm.pvm.internal.task.SwimlaneImpl; import org.jbpm.pvm.internal.task.TaskImpl; +import org.jbpm.pvm.internal.type.Variable; import org.jbpm.pvm.internal.util.Clock; import org.jbpm.pvm.internal.util.CollectionUtil; @@ -422,4 +437,97 @@ return false; } } + + /** property. */ + public Long initializeNextId(long blocksize) { + PropertyImpl property = (PropertyImpl) session.createQuery( + "select property " + + "from " + PropertyImpl.class.getName() + " as property " + + "where property.key = '" + PropertyImpl.NEXT_DBID_KEY + "'" + ).uniqueResult(); + + Long nextId; + if (property == null) { + nextId = getMaxDbid(); + nextId++; + property = new PropertyImpl(PropertyImpl.NEXT_DBID_KEY, Long.toString(nextId + blocksize)); + session.save(property); + + } else { + String nextIdText = property.getValue(); + nextId = new Long(nextIdText); + property.setValue(Long.toString(nextId.longValue() + blocksize)); + session.update(property); + } + + return nextId; + } + + public Long getMaxDbid() { + Long nextId = 0L; + + List<String> persistedTypes = new ArrayList<String>(); + persistedTypes.add(DeploymentImpl.class.getName()); + persistedTypes.add(DeploymentProperty.class.getName()); + persistedTypes.add(ExecutionImpl.class.getName()); + persistedTypes.add(GroupImpl.class.getName()); + persistedTypes.add(HistoryActivityInstanceImpl.class.getName()); + persistedTypes.add(HistoryDetailImpl.class.getName()); + persistedTypes.add(HistoryTaskImpl.class.getName()); + persistedTypes.add(HistoryVariableImpl.class.getName()); + persistedTypes.add(JobImpl.class.getName()); + persistedTypes.add(Lob.class.getName()); + persistedTypes.add(MembershipImpl.class.getName()); + persistedTypes.add(ParticipationImpl.class.getName()); + persistedTypes.add(PropertyImpl.class.getName()); + persistedTypes.add(SwimlaneImpl.class.getName()); + persistedTypes.add(TaskImpl.class.getName()); + persistedTypes.add(UserImpl.class.getName()); + persistedTypes.add(Variable.class.getName()); + + for (String persistedType: persistedTypes) { + try { + Long maxDbid = (Long) session.createQuery( + "select max(object.dbid) " + + "from " + persistedType + " as object" + ).uniqueResult(); + + if ( (maxDbid != null) + && (maxDbid.longValue() > nextId) + ) { + nextId = maxDbid.longValue(); + } + } catch (Exception e) { + log.info("couldn't get max dbid for " + persistedType); + } + } + return nextId; + } + + + public void initializeSchemaVersion() { + PropertyImpl property = (PropertyImpl) session.createQuery( + "select property " + + "from " + PropertyImpl.class.getName() + " as property " + + "where property.key = '" + PropertyImpl.DB_VERSION_KEY + "'" + ).uniqueResult(); + + if (log.isDebugEnabled()) { + log.debug("version of jbpm library: " + ProcessEngineImpl.JBPM_LIBRARY_VERSION); + } + + if (property == null) { + log.info("version of jbpm db schema: none"); + + } else { + String dbSchemaVersion = property.getValue(); + if (log.isDebugEnabled()) { + log.debug("version of jbpm db schema: " + dbSchemaVersion); + } + if (!ProcessEngineImpl.JBPM_LIBRARY_VERSION.equals(dbSchemaVersion)) { + throw new JbpmException("jBPM runtime version " + ProcessEngineImpl.JBPM_LIBRARY_VERSION + + " doesn't match with DB schema, which is version "); + } + } + } } Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/id/InitializePropertiesCmd.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/id/InitializePropertiesCmd.java 2010-08-18 10:04:59 UTC (rev 6608) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/id/InitializePropertiesCmd.java 2010-08-18 10:59:15 UTC (rev 6609) @@ -24,7 +24,6 @@ import java.util.ArrayList; import java.util.List; -import org.hibernate.Session; import org.jbpm.api.JbpmException; import org.jbpm.api.cmd.Command; import org.jbpm.api.cmd.Environment; @@ -42,6 +41,7 @@ import org.jbpm.pvm.internal.processengine.ProcessEngineImpl; import org.jbpm.pvm.internal.repository.DeploymentImpl; import org.jbpm.pvm.internal.repository.DeploymentProperty; +import org.jbpm.pvm.internal.session.DbSession; import org.jbpm.pvm.internal.task.ParticipationImpl; import org.jbpm.pvm.internal.task.SwimlaneImpl; import org.jbpm.pvm.internal.task.TaskImpl; @@ -56,108 +56,21 @@ private static final long serialVersionUID = 1L; private static Log log = Log.getLog(InitializePropertiesCmd.class.getName()); - + long blocksize; - + public InitializePropertiesCmd(long blocksize) { this.blocksize = blocksize; } public Long execute(Environment environment) throws Exception { - Session session = environment.get(Session.class); - - Long nextId = initializeNextId(session); - initializeSchemaVersion(session); - - session.flush(); + DbSession dbSession = environment.get(DbSession.class); - return nextId; - } + Long nextId = dbSession.initializeNextId(blocksize); + dbSession.initializeSchemaVersion(); - void initializeSchemaVersion(Session session) { - PropertyImpl property = (PropertyImpl) session.createQuery( - "select property " + - "from "+PropertyImpl.class.getName()+" as property " + - "where property.key = '"+PropertyImpl.DB_VERSION_KEY+"'" - ).uniqueResult(); + dbSession.flush(); - log.debug("version of jbpm library: "+ProcessEngineImpl.JBPM_LIBRARY_VERSION); - - if (property==null) { - log.info("version of jbpm db schema: none"); - - } else { - String dbSchemaVersion = property.getValue(); - log.debug("version of jbpm db schema: "+dbSchemaVersion); - if (!ProcessEngineImpl.JBPM_LIBRARY_VERSION.equals(dbSchemaVersion)) { - throw new JbpmException("jBPM runtime version "+ProcessEngineImpl.JBPM_LIBRARY_VERSION+" doesn't match with DB schema, which is version "); - } - } - } - - Long initializeNextId(Session session) { - PropertyImpl property = (PropertyImpl) session.createQuery( - "select property " + - "from "+PropertyImpl.class.getName()+" as property " + - "where property.key = '"+PropertyImpl.NEXT_DBID_KEY+"'" - ).uniqueResult(); - - Long nextId; - if (property==null) { - nextId = getMaxDbid(session); - nextId++; - property = new PropertyImpl(PropertyImpl.NEXT_DBID_KEY, Long.toString(nextId+blocksize)); - session.save(property); - - } else { - String nextIdText = property.getValue(); - nextId = new Long(nextIdText); - property.setValue(Long.toString(nextId.longValue()+blocksize)); - session.update(property); - } - return nextId; } - - private Long getMaxDbid(Session session) { - Long nextId; - nextId = 0L; - - List<String> persistedTypes = new ArrayList<String>(); - persistedTypes.add(DeploymentImpl.class.getName()); - persistedTypes.add(DeploymentProperty.class.getName()); - persistedTypes.add(ExecutionImpl.class.getName()); - persistedTypes.add(GroupImpl.class.getName()); - persistedTypes.add(HistoryActivityInstanceImpl.class.getName()); - persistedTypes.add(HistoryDetailImpl.class.getName()); - persistedTypes.add(HistoryTaskImpl.class.getName()); - persistedTypes.add(HistoryVariableImpl.class.getName()); - persistedTypes.add(JobImpl.class.getName()); - persistedTypes.add(Lob.class.getName()); - persistedTypes.add(MembershipImpl.class.getName()); - persistedTypes.add(ParticipationImpl.class.getName()); - persistedTypes.add(PropertyImpl.class.getName()); - persistedTypes.add(SwimlaneImpl.class.getName()); - persistedTypes.add(TaskImpl.class.getName()); - persistedTypes.add(UserImpl.class.getName()); - persistedTypes.add(Variable.class.getName()); - - for (String persistedType: persistedTypes) { - try { - Long maxDbid = (Long) session.createQuery( - "select max(object.dbid) " + - "from "+persistedType+" as object" - ).uniqueResult(); - - if ( (maxDbid!=null) - && (maxDbid.longValue()>nextId) - ) { - nextId = maxDbid.longValue(); - } - } catch (Exception e) { - log.info("couldn't get max dbid for "+persistedType); - } - } - return nextId; - } } Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/id/PropertyImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/id/PropertyImpl.java 2010-08-18 10:04:59 UTC (rev 6608) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/id/PropertyImpl.java 2010-08-18 10:59:15 UTC (rev 6609) @@ -27,6 +27,7 @@ import org.hibernate.Session; import org.jbpm.internal.log.Log; +import org.jbpm.pvm.internal.env.EnvironmentImpl; import org.jbpm.pvm.internal.history.model.HistoryActivityInstanceImpl; import org.jbpm.pvm.internal.history.model.HistoryDetailImpl; import org.jbpm.pvm.internal.history.model.HistoryTaskImpl; @@ -40,6 +41,7 @@ import org.jbpm.pvm.internal.processengine.ProcessEngineImpl; import org.jbpm.pvm.internal.repository.DeploymentImpl; import org.jbpm.pvm.internal.repository.DeploymentProperty; +import org.jbpm.pvm.internal.session.DbSession; import org.jbpm.pvm.internal.task.ParticipationImpl; import org.jbpm.pvm.internal.task.SwimlaneImpl; import org.jbpm.pvm.internal.task.TaskImpl; @@ -102,55 +104,14 @@ } public static void initializeNextDbid(Session session) { - long nextDbid = getMaxDbid(session) + 1; + DbSession dbSession = EnvironmentImpl.getFromCurrent(DbSession.class); + long nextDbid = dbSession.getMaxDbid() + 1; setNextDbid(session, nextDbid); if (log.isInfoEnabled()) { log.info("nextDbid is initialized to " + nextDbid); } } - protected static long getMaxDbid(Session session) { - long maxDbid = 0; - - List<String> persistedTypes = new ArrayList<String>(); - persistedTypes.add(DeploymentImpl.class.getName()); - persistedTypes.add(DeploymentProperty.class.getName()); - persistedTypes.add(ExecutionImpl.class.getName()); - persistedTypes.add(GroupImpl.class.getName()); - persistedTypes.add(HistoryActivityInstanceImpl.class.getName()); - persistedTypes.add(HistoryDetailImpl.class.getName()); - persistedTypes.add(HistoryTaskImpl.class.getName()); - persistedTypes.add(HistoryVariableImpl.class.getName()); - persistedTypes.add(JobImpl.class.getName()); - persistedTypes.add(Lob.class.getName()); - persistedTypes.add(MembershipImpl.class.getName()); - persistedTypes.add(ParticipationImpl.class.getName()); - persistedTypes.add(SwimlaneImpl.class.getName()); - persistedTypes.add(TaskImpl.class.getName()); - persistedTypes.add(UserImpl.class.getName()); - persistedTypes.add(Variable.class.getName()); - - for (String persistedType: persistedTypes) { - try { - Long typeMaxDbid = (Long) session.createQuery( - "select max(o.dbid) " + - "from " + persistedType + " as o" - ).uniqueResult(); - - if ( (typeMaxDbid!=null) - && (typeMaxDbid.longValue()>maxDbid) - ) { - maxDbid = typeMaxDbid.longValue(); - } - } catch (Exception e) { - log.info("couldn't get max dbid for " + persistedType, e); - e.printStackTrace(); - } - } - - return maxDbid; - } - protected static String getPropertyValue(Session session, String propertyKey) { PropertyImpl dbidProperty = getProperty(session, propertyKey); if (dbidProperty == null) { Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/session/DbSession.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/session/DbSession.java 2010-08-18 10:04:59 UTC (rev 6608) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/session/DbSession.java 2010-08-18 10:59:15 UTC (rev 6609) @@ -116,4 +116,9 @@ /** check table. */ boolean executionTableExists(); boolean propertiesTableExists(); + + /** property. */ + Long initializeNextId(long blocksize); + void initializeSchemaVersion(); + Long getMaxDbid(); }

13 years, 10 months

1
0
0 / 0

JBoss JBPM SVN: r6608 - in jbpm3/branches/jbpm-3.2-soa: modules/core/scripts and 4 other directories.

by do-not-reply＠jboss.org

Author: alex.guizar(a)jboss.com Date: 2010-08-18 06:04:59 -0400 (Wed, 18 Aug 2010) New Revision: 6608 Added: jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/cache/jbpm-jbc-service.xml Removed: jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/cache/jbpm-jbc1-service.xml Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/scripts/antrun-config.xml jbpm3/branches/jbpm-3.2-soa/modules/distribution/scripts/antrun-installer.xml jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/auto-install-template.xml jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/install-definition.xml jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/user-input-lang_eng.xml jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/user-input-lang_spa.xml jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/main/etc/jbpm.cfg.xml jbpm3/branches/jbpm-3.2-soa/pom.xml Log: JBPM-2916 install jbpm-mq-service to deploy directory a.o.t deploy-hasingleton; organize installer packs by functional groups Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/scripts/antrun-config.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/scripts/antrun-config.xml 2010-08-18 09:40:27 UTC (rev 6607) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/scripts/antrun-config.xml 2010-08-18 10:04:59 UTC (rev 6608) @@ -16,8 +16,8 @@ <attribute name="file" /> <attribute name="section" /> <sequential> - <replace file="@{file}" summary="true"> - <replacefilter token="" + <replace file="@{file}"> + <replacefilter token="" value="" value="==== @{section} (end) -->" /> </replace> @@ -28,9 +28,9 @@ <attribute name="file" /> <attribute name="section" /> <sequential> - <replace file="@{file}" summary="true"> + <replace file="@{file}"> <replacefilter token="" /> + value="" /> <replacefilter token="==== @{section} (end) -->" value="" /> </replace> Modified: jbpm3/branches/jbpm-3.2-soa/modules/distribution/scripts/antrun-installer.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/distribution/scripts/antrun-installer.xml 2010-08-18 09:40:27 UTC (rev 6607) +++ jbpm3/branches/jbpm-3.2-soa/modules/distribution/scripts/antrun-installer.xml 2010-08-18 10:04:59 UTC (rev 6608) @@ -12,14 +12,11 @@ <attribute name="file" /> <attribute name="section" /> <sequential> - <replace file="@{file}" summary="true"> - <replacetoken><![CDATA[]]></replacetoken> - <replacevalue><![CDATA[" + value="" value="==== @{section} (end) -->" /> </replace> - <replace file="@{file}" summary="true"> - <replacetoken><![CDATA[]]></replacetoken> - <replacevalue><![CDATA[==== ]]>@{section}<![CDATA[ (end) -->]]></replacevalue> - </replace> </sequential> </macrodef> @@ -27,18 +24,16 @@ <attribute name="file" /> <attribute name="section" /> <sequential> - <replace file="@{file}" summary="true"> - <replacetoken><![CDATA[]]></replacevalue> + <replace file="@{file}"> + <replacefilter token="" /> + <replacefilter token="==== @{section} (end) -->" + value="" /> </replace> - <replace file="@{file}" summary="true"> - <replacetoken><![CDATA[==== ]]>@{section}<![CDATA[ (end) -->]]></replacetoken> - <replacevalue><![CDATA[]]></replacevalue> - </replace> </sequential> </macrodef> - <macrodef name="macro-hibernate-cfg"> + <macrodef name="edit-hibernate-config"> <attribute name="file" /> <sequential> <macro-disable file="@{file}" section="JDBC connection properties" /> @@ -95,7 +90,7 @@ </copy> </target> - <target name="process-hibernate-cfg"> + <target name="gen-hibernate-config" description="generate hibernate configuration"> <property name="hsqldb.cfg.xml" value="${project.build.assembly.dir}/config/hibernate.cfg.hsqldb.xml" /> <macro-disable file="${hsqldb.cfg.xml}" section="JDBC connection properties" /> @@ -103,20 +98,20 @@ <macro-enable file="${hsqldb.cfg.xml}" section="DataSource properties" /> <macro-enable file="${hsqldb.cfg.xml}" section="JTA transaction properties" /> - <macro-hibernate-cfg file="${project.build.assembly.dir}/config/hibernate.cfg.db2.xml"/> - <macro-hibernate-cfg file="${project.build.assembly.dir}/config/hibernate.cfg.mssql.xml"/> - <macro-hibernate-cfg file="${project.build.assembly.dir}/config/hibernate.cfg.mysql.xml"/> - <macro-hibernate-cfg file="${project.build.assembly.dir}/config/hibernate.cfg.oracle.xml"/> - <macro-hibernate-cfg file="${project.build.assembly.dir}/config/hibernate.cfg.postgresql.xml"/> - <macro-hibernate-cfg file="${project.build.assembly.dir}/config/hibernate.cfg.sybase.xml"/> + <edit-hibernate-config file="${project.build.assembly.dir}/config/hibernate.cfg.db2.xml"/> + <edit-hibernate-config file="${project.build.assembly.dir}/config/hibernate.cfg.mssql.xml"/> + <edit-hibernate-config file="${project.build.assembly.dir}/config/hibernate.cfg.mysql.xml"/> + <edit-hibernate-config file="${project.build.assembly.dir}/config/hibernate.cfg.oracle.xml"/> + <edit-hibernate-config file="${project.build.assembly.dir}/config/hibernate.cfg.postgresql.xml"/> + <edit-hibernate-config file="${project.build.assembly.dir}/config/hibernate.cfg.sybase.xml"/> </target>    <target name="process-resources" - depends="process-hibernate-cfg, reorganize-examples" - description="prepares installer resources"> + depends="gen-hibernate-config, reorganize-examples" + description="prepare installer resources"> <copy todir="${resources.output.dir}" overwrite="true"> <fileset dir="${resources.dir}/installer" /> <filterset> Copied: jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/cache/jbpm-jbc-service.xml (from rev 6603, jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/cache/jbpm-jbc1-service.xml) =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/cache/jbpm-jbc-service.xml (rev 0) +++ jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/cache/jbpm-jbc-service.xml 2010-08-18 10:04:59 UTC (rev 6608) @@ -0,0 +1,117 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<server> + <mbean code="org.jboss.cache.TreeCache" name="jboss.jbpm:service=TreeCache"> + <depends>jboss:service=Naming</depends> + <depends>jboss:service=TransactionManager</depends> + +  + <attribute name="TransactionManagerLookupClass"> + org.jboss.cache.JBossTransactionManagerLookup + </attribute> + +  + <attribute name="NodeLockingScheme">OPTIMISTIC</attribute> + +  + <attribute name="IsolationLevel">READ_COMMITTED</attribute> + +  + <attribute name="CacheMode">LOCAL</attribute> + +  + <attribute name="ClusterName">TreeCache-${jboss.partition.name:Cluster}</attribute> + + <attribute name="ClusterConfig"> + <config> + <UDP mcast_addr="230.1.2.3" mcast_port="43333" tos="8" ucast_recv_buf_size="20000000" + ucast_send_buf_size="640000" mcast_recv_buf_size="25000000" mcast_send_buf_size="640000" + loopback="false" discard_incompatible_packets="true" enable_bundling="true" + max_bundle_size="64000" max_bundle_timeout="30" use_incoming_packet_handler="true" + use_outgoing_packet_handler="false" ip_ttl="2" down_thread="false" up_thread="false" /> + <PING timeout="2000" down_thread="false" up_thread="false" num_initial_members="3" /> + <MERGE2 max_interval="100000" down_thread="false" up_thread="false" min_interval="20000" /> + <FD_SOCK down_thread="false" up_thread="false" /> + <FD timeout="10000" max_tries="5" down_thread="false" up_thread="false" shun="true" /> + <VERIFY_SUSPECT timeout="1500" down_thread="false" up_thread="false" /> + <pbcast.NAKACK max_xmit_size="60000" use_mcast_xmit="false" gc_lag="0" + retransmit_timeout="300,600,1200,2400,4800" down_thread="false" up_thread="false" + discard_delivered_msgs="true" /> + <UNICAST timeout="300,600,1200,2400,3600" down_thread="false" up_thread="false" /> + <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000" + down_thread="false" up_thread="false" max_bytes="400000" /> + <pbcast.GMS print_local_addr="true" join_timeout="3000" down_thread="false" + up_thread="false" join_retry_timeout="2000" shun="true" view_bundling="true" /> + <FRAG2 frag_size="60000" down_thread="false" up_thread="false" /> + <pbcast.STATE_TRANSFER down_thread="false" up_thread="false" + use_flush="false" /> + </config> + </attribute> + +  + <attribute name="FetchInMemoryState">false</attribute> + +  + <attribute name="SyncReplTimeout">20000</attribute> + +  + <attribute name="LockAcquisitionTimeout">15000</attribute> + +  + <attribute name="UseRegionBasedMarshalling">true</attribute> +  + <attribute name="InactiveOnStartup">true</attribute> + +  + <attribute name="EvictionPolicyConfig"> + <config> + <attribute name="wakeUpIntervalSeconds">5</attribute> +  + <attribute name="policyClass">org.jboss.cache.eviction.LRUPolicy</attribute> +  + <region name="/_default_"> + <attribute name="maxNodes">5000</attribute> + <attribute name="timeToLiveSeconds">1000</attribute> + </region> +  + <region name="/TS"> + <attribute name="maxNodes">0</attribute> + <attribute name="timeToLiveSeconds">0</attribute> + </region> + </config> + </attribute> + </mbean> +</server> \ No newline at end of file Deleted: jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/cache/jbpm-jbc1-service.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/cache/jbpm-jbc1-service.xml 2010-08-18 09:40:27 UTC (rev 6607) +++ jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/cache/jbpm-jbc1-service.xml 2010-08-18 10:04:59 UTC (rev 6608) @@ -1,117 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<server> - <mbean code="org.jboss.cache.TreeCache" name="jboss.jbpm:service=TreeCache"> - <depends>jboss:service=Naming</depends> - <depends>jboss:service=TransactionManager</depends> - -  - <attribute name="TransactionManagerLookupClass"> - org.jboss.cache.JBossTransactionManagerLookup - </attribute> - -  - <attribute name="NodeLockingScheme">OPTIMISTIC</attribute> - -  - <attribute name="IsolationLevel">READ_COMMITTED</attribute> - -  - <attribute name="CacheMode">LOCAL</attribute> - -  - <attribute name="ClusterName">TreeCache-${jboss.partition.name:Cluster}</attribute> - - <attribute name="ClusterConfig"> - <config> - <UDP mcast_addr="230.1.2.3" mcast_port="43333" tos="8" ucast_recv_buf_size="20000000" - ucast_send_buf_size="640000" mcast_recv_buf_size="25000000" mcast_send_buf_size="640000" - loopback="false" discard_incompatible_packets="true" enable_bundling="true" - max_bundle_size="64000" max_bundle_timeout="30" use_incoming_packet_handler="true" - use_outgoing_packet_handler="false" ip_ttl="2" down_thread="false" up_thread="false" /> - <PING timeout="2000" down_thread="false" up_thread="false" num_initial_members="3" /> - <MERGE2 max_interval="100000" down_thread="false" up_thread="false" min_interval="20000" /> - <FD_SOCK down_thread="false" up_thread="false" /> - <FD timeout="10000" max_tries="5" down_thread="false" up_thread="false" shun="true" /> - <VERIFY_SUSPECT timeout="1500" down_thread="false" up_thread="false" /> - <pbcast.NAKACK max_xmit_size="60000" use_mcast_xmit="false" gc_lag="0" - retransmit_timeout="300,600,1200,2400,4800" down_thread="false" up_thread="false" - discard_delivered_msgs="true" /> - <UNICAST timeout="300,600,1200,2400,3600" down_thread="false" up_thread="false" /> - <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000" - down_thread="false" up_thread="false" max_bytes="400000" /> - <pbcast.GMS print_local_addr="true" join_timeout="3000" down_thread="false" - up_thread="false" join_retry_timeout="2000" shun="true" view_bundling="true" /> - <FRAG2 frag_size="60000" down_thread="false" up_thread="false" /> - <pbcast.STATE_TRANSFER down_thread="false" up_thread="false" - use_flush="false" /> - </config> - </attribute> - -  - <attribute name="FetchInMemoryState">false</attribute> - -  - <attribute name="SyncReplTimeout">20000</attribute> - -  - <attribute name="LockAcquisitionTimeout">15000</attribute> - -  - <attribute name="UseRegionBasedMarshalling">true</attribute> -  - <attribute name="InactiveOnStartup">true</attribute> - -  - <attribute name="EvictionPolicyConfig"> - <config> - <attribute name="wakeUpIntervalSeconds">5</attribute> -  - <attribute name="policyClass">org.jboss.cache.eviction.LRUPolicy</attribute> -  - <region name="/_default_"> - <attribute name="maxNodes">5000</attribute> - <attribute name="timeToLiveSeconds">1000</attribute> - </region> -  - <region name="/TS"> - <attribute name="maxNodes">0</attribute> - <attribute name="timeToLiveSeconds">0</attribute> - </region> - </config> - </attribute> - </mbean> -</server> \ No newline at end of file Modified: jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/auto-install-template.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/auto-install-template.xml 2010-08-18 09:40:27 UTC (rev 6607) +++ jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/auto-install-template.xml 2010-08-18 10:04:59 UTC (rev 6608) @@ -6,14 +6,16 @@ <installpath>@jbpm.home@</installpath> </com.izforge.izpack.panels.TargetPanel> <com.izforge.izpack.panels.TreePacksPanel> - <pack name="jBPM Engine" index="0" selected="true"/> - <pack name="Documentation" index="1" selected="true"/> - <pack name="Eclipse Designer" index="2" selected="true"/> - <pack name="JBoss AS Integration" index="3" selected="true"/> - <pack name="JSF Console" index="4" selected="true"/> - <pack name="Optional Downloads" index="5" selected="false"/> - <pack name="JBoss AS" index="6" selected="false"/> - <pack name="Eclipse" index="7" selected="false"/> + <pack name="jBPM Standalone" index="0" selected="true" /> + <pack name="Process Engine" index="1" selected="true" /> + <pack name="Documentation" index="2" selected="true" /> + <pack name="Eclipse Designer" index="3" selected="true" /> + <pack name="JBoss AS Integration" index="4" selected="true" /> + <pack name="jBPM Service" index="5" selected="true" /> + <pack name="JSF Console" index="6" selected="true" /> + <pack name="Optional Downloads" index="7" selected="false" /> + <pack name="JBoss AS" index="8" selected="false" /> + <pack name="Eclipse" index="9" selected="false" /> </com.izforge.izpack.panels.TreePacksPanel> <com.izforge.izpack.panels.UserInputPanel> <userInput> @@ -23,7 +25,7 @@ </com.izforge.izpack.panels.UserInputPanel> <com.izforge.izpack.panels.UserInputPanel> <userInput> - <entry key="dbSelection" value="@database@"/> + <entry key="dbSelection" value="@database@" /> </userInput> </com.izforge.izpack.panels.UserInputPanel> <com.izforge.izpack.panels.UserInputPanel> Modified: jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/install-definition.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/install-definition.xml 2010-08-18 09:40:27 UTC (rev 6607) +++ jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/install-definition.xml 2010-08-18 10:04:59 UTC (rev 6608) @@ -122,9 +122,13 @@ * jBPM Standalone * ******************************** --> - <pack name="jBPM Engine" required="yes"> - <description>Standalone process engine and configuration files</description> + <pack name="jBPM Standalone" required="no"> + <description>Standalone business process engine</description> + </pack> + <pack name="Process Engine" parent="jBPM Standalone" required="yes"> + <description>Core libraries and configuration files</description> +  <file src="@{basedir}/src/main/etc/release.notes.html" targetdir="$INSTALL_PATH" /> <file src="@{basedir}/src/main/etc/JBossORG-EULA.txt" targetdir="$INSTALL_PATH" /> @@ -132,13 +136,21 @@  <fileset dir="@{assemblyDirectory}/config" targetdir="$INSTALL_PATH/config" /> +  + <fileset dir="@{assemblyDirectory}/lib" targetdir="$INSTALL_PATH/lib"> + <include name="jbpm-jpdl.jar" /> + <include name="jbpm-identity.jar" /> + <include name="jsf-console.war" /> + <include name="gpd-deployer.war" /> + </fileset> +  <file src="@{assemblyDirectory}/lib/jbpm-db.jar" targetdir="$INSTALL_PATH/database" unpack="true" /> </pack> - <pack name="Documentation" required="no"> - <description>User guide and examples</description> + <pack name="Documentation" parent="jBPM Standalone" required="no"> + <description>User guide and example processes</description>  <file src="@{assemblyDirectory}/lib/jbpm-userguide.jdocbook" @@ -151,8 +163,8 @@ targetdir="$INSTALL_PATH/examples" /> </pack> - <pack name="Eclipse Designer" required="no"> - <description>Process designer archive, plus third-party libraries and source code + <pack name="Eclipse Designer" parent="jBPM Standalone" required="no"> + <description>Process designer site archive, plus third-party libraries and source code useful to develop and test jBPM applications</description>  @@ -173,12 +185,7 @@ <include name="dom4j.jar" /> <include name="hibernate.jar" /> <include name="hsqldb.jar" /> - <include name="jbpm-enterprise-bundle.ear" /> - <include name="jbpm-jpdl.jar" /> - <include name="jbpm-identity.jar" /> <include name="junit.jar" /> - <include name="jsf-console.war" /> - <include name="gpd-deployer.war" /> <include name="log4j.jar" /> </fileset> @@ -196,9 +203,13 @@ * JBoss Integration * ******************************** --> - <pack name="JBoss AS Integration" required="no"> - <description>Application server integration modules</description> + <pack name="JBoss AS Integration" required="no" preselected="no"> + <description>Application server integration</description> + </pack> + <pack name="jBPM Service" parent="JBoss AS Integration" required="no" preselected="no"> + <description>Business process management service</description> +  <file src="@{assemblyDirectory}/lib/jbpm-enterprise-config.jar" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" @@ -222,17 +233,12 @@ targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-enterprise.jar" unpack="true" /> -  - <file src="@{assemblyDirectory}/lib/jbpm-userguide.jdocbook" - targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-userguide.war" - unpack="true" /> -  <file src="@{resourcesDirectory}/destination/jbpm-mq-service.xml" - targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy-hasingleton/jbpm" + targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" condition="isJBoss405" /> <file src="@{resourcesDirectory}/destination/jbpm-mq-service.xml" - targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy-hasingleton/jbpm" + targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" condition="isJBoss423" />  @@ -243,11 +249,11 @@ targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" condition="isJBoss510" /> -  - <file src="@{resourcesDirectory}/cache/jbpm-jbc1-service.xml" +  + <file src="@{resourcesDirectory}/cache/jbpm-jbc-service.xml" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" condition="isJBoss405" /> - <file src="@{resourcesDirectory}/cache/jbpm-jbc1-service.xml" + <file src="@{resourcesDirectory}/cache/jbpm-jbc-service.xml" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" condition="isJBoss423" /> @@ -340,7 +346,7 @@ * JSF Console * ******************************** --> - <pack name="JSF Console" parent="JBoss AS Integration" required="no"> + <pack name="JSF Console" parent="JBoss AS Integration" required="no" preselected="no"> <description>Web console based on the Java Server Faces technology</description>  @@ -354,11 +360,11 @@  <pack name="Optional Downloads" required="no" preselected="no"> - <description>Optional components</description> + <description>Download software with which jBPM integrates</description> </pack>  Modified: jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/user-input-lang_eng.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/user-input-lang_eng.xml 2010-08-18 09:40:27 UTC (rev 6607) +++ jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/user-input-lang_eng.xml 2010-08-18 10:04:59 UTC (rev 6608) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <langpack> - <str id="jboss.selection" txt="Choose your target JBoss version" /> - <str id="jboss.home" txt="JBoss home directory" /> - <str id="jboss.configuration" txt="Configuration" /> - <str id="database.selection" txt="Choose your target database" /> + <str id="jboss.selection" txt="JBoss AS version" /> + <str id="jboss.configuration" txt="Server configuration" /> + <str id="jboss.home" txt="JBoss AS home" /> + <str id="database.selection" txt="Database" /> </langpack> \ No newline at end of file Modified: jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/user-input-lang_spa.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/user-input-lang_spa.xml 2010-08-18 09:40:27 UTC (rev 6607) +++ jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/user-input-lang_spa.xml 2010-08-18 10:04:59 UTC (rev 6608) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <langpack> - <str id="jboss.selection" txt="Seleccione su versión de JBoss" /> - <str id="jboss.home" txt="Ruta de JBoss" /> - <str id="jboss.configuration" txt="Configuración" /> - <str id="database.selection" txt="Seleccione su base de datos" /> + <str id="jboss.selection" txt="Versión de JBoss AS" /> + <str id="jboss.configuration" txt="Configuración del servidor" /> + <str id="jboss.home" txt="Ruta de JBoss AS" /> + <str id="database.selection" txt="Base de datos" /> </langpack> \ No newline at end of file Modified: jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/main/etc/jbpm.cfg.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/main/etc/jbpm.cfg.xml 2010-08-18 09:40:27 UTC (rev 6607) +++ jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/main/etc/jbpm.cfg.xml 2010-08-18 10:04:59 UTC (rev 6608) @@ -12,8 +12,9 @@  <string name="jbpm.class.loader" value="context" /> -  +   <properties> - <ant.version>1.7.0</ant.version> - <birt.version>2.2.2</birt.version> - <bsh.version>1.3.0</bsh.version> - <cactus.version>1.8.0</cactus.version> - <commons.beanutils.version>1.7.0</commons.beanutils.version> - <commons.fileupload.version>1.2.1</commons.fileupload.version> - <commons.io.version>1.4</commons.io.version> - <commons.logging.version>1.1.1</commons.logging.version> - <desmoj.version>2.1.1</desmoj.version> - <dom4j.version>1.6.1</dom4j.version> - <drools.version>4.0.7</drools.version> - <hibernate.version>3.2.4.sp1</hibernate.version> - <jackrabbit.version>1.4.5</jackrabbit.version> - <jasper.reports.version>3.5.3</jasper.reports.version> - <javax.el.version>1.2</javax.el.version> - <javax.jcr.version>1.0</javax.jcr.version> - <javax.mail.version>1.4</javax.mail.version> - <javax.servlet.version>2.4</javax.servlet.version> - <jaxen.version>1.1.1</jaxen.version> - <jboss.client.version>4.0.5.GA</jboss.client.version> - <jboss.gravel.version>1.0.0.GA</jboss.gravel.version> - <jboss.j2ee.version>4.0.2</jboss.j2ee.version> - <jbpm.designer.version>3.1.7</jbpm.designer.version> - <jbpm.jsf-console.version>3.2.10-SNAPSHOT</jbpm.jsf-console.version> - <jsf.facelets.version>1.1.15</jsf.facelets.version> - <jta.version>1.1</jta.version> - <junit.version>3.8.1</junit.version> - <log4j.version>1.2.14</log4j.version> - <mvel.version>1.3.1-java1.4</mvel.version> - <retrotranslator.version>1.2.7</retrotranslator.version> - <richfaces.ui.version>3.2.1.GA</richfaces.ui.version> - <wiser.version>1.2</wiser.version> - <xerces.version>2.6.2</xerces.version> -  <db2jcc.version>3.1.57</db2jcc.version> <hsqldb.version>1.8.0.7</hsqldb.version> @@ -93,26 +59,26 @@ <dependency> <groupId>org.jbpm.jbpm3</groupId> <artifactId>jsf-console</artifactId> - <version>${jbpm.jsf-console.version}</version> + <version>${project.version}</version> <type>war</type> </dependency> <dependency> <groupId>org.jbpm.jbpm3</groupId> <artifactId>jsf-console</artifactId> - <version>${jbpm.jsf-console.version}</version> + <version>${project.version}</version> <classifier>soa</classifier> <type>war</type> </dependency> <dependency> <groupId>org.jbpm.jbpm3</groupId> <artifactId>gpd-deployer</artifactId> - <version>${jbpm.jsf-console.version}</version> + <version>${project.version}</version> <type>war</type> </dependency> <dependency> <groupId>org.jbpm.jbpm3</groupId> <artifactId>jbpm-jpdl-designer-site</artifactId> - <version>${jbpm.designer.version}</version> + <version>3.1.7</version> <type>zip</type> </dependency> @@ -120,57 +86,57 @@ <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>${ant.version}</version> + <version>1.7.0</version> </dependency> <dependency> <groupId>bsh</groupId> <artifactId>bsh</artifactId> - <version>${bsh.version}</version> + <version>1.3.0</version> </dependency> <dependency> <groupId>org.apache.cactus</groupId> <artifactId>cactus.core.framework.wrapper.javaEE.14</artifactId> - <version>${cactus.version}</version> + <version>1.8.0</version> </dependency> <dependency> <groupId>org.apache.cactus</groupId> <artifactId>cactus.integration.shared.api</artifactId> - <version>${cactus.version}</version> + <version>1.8.0</version> </dependency> <dependency> <groupId>commons-beanutils</groupId> <artifactId>commons-beanutils</artifactId> - <version>${commons.beanutils.version}</version> + <version>1.7.0</version> </dependency> <dependency> <groupId>commons-fileupload</groupId> <artifactId>commons-fileupload</artifactId> - <version>${commons.fileupload.version}</version> + <version>1.2.1</version> </dependency> <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> - <version>${commons.io.version}</version> + <version>1.4</version> </dependency> <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> - <version>${commons.logging.version}</version> + <version>1.1.1</version> </dependency> <dependency> <groupId>desmoj</groupId> <artifactId>desmoj</artifactId> - <version>${desmoj.version}</version> + <version>2.1.1</version> </dependency> <dependency> <groupId>dom4j</groupId> <artifactId>dom4j</artifactId> - <version>${dom4j.version}</version> + <version>1.6.1</version> </dependency> <dependency> <groupId>org.drools</groupId> <artifactId>drools-compiler</artifactId> - <version>${drools.version}</version> + <version>4.0.7</version> <exclusions> <exclusion> <artifactId>xercesImpl</artifactId> @@ -185,22 +151,22 @@ <dependency> <groupId>org.drools</groupId> <artifactId>drools-core</artifactId> - <version>${drools.version}</version> + <version>4.0.7</version> </dependency> <dependency> <groupId>javax.el</groupId> <artifactId>el-api</artifactId> - <version>${javax.el.version}</version> + <version>1.2</version> </dependency> <dependency> <groupId>org.jboss.gravel</groupId> <artifactId>gravel</artifactId> - <version>${jboss.gravel.version}</version> + <version>1.0.0.GA</version> </dependency> <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate</artifactId> - <version>${hibernate.version}</version> + <version>3.2.4.sp1</version> <exclusions> <exclusion> <groupId>javax.transaction</groupId> @@ -214,85 +180,90 @@ <version>1.0.2-SNAPSHOT</version> </dependency> <dependency> + <groupId>org.codehaus.izpack</groupId> + <artifactId>izpack-standalone-compiler</artifactId> + <version>4.3.2</version> + </dependency> + <dependency> <groupId>org.apache.jackrabbit</groupId> <artifactId>jackrabbit-core</artifactId> - <version>${jackrabbit.version}</version> + <version>1.4.5</version> </dependency> <dependency> <groupId>jasperreports</groupId> <artifactId>jasperreports</artifactId> - <version>${jasper.reports.version}</version> + <version>3.5.3</version> </dependency> <dependency> <groupId>jaxen</groupId> <artifactId>jaxen</artifactId> - <version>${jaxen.version}</version> + <version>1.1.1</version> </dependency> <dependency> <groupId>org.jboss.client</groupId> <artifactId>jbossall-client</artifactId> - <version>${jboss.client.version}</version> + <version>4.0.5.GA</version> </dependency> <dependency> <groupId>jboss</groupId> <artifactId>jboss-j2ee</artifactId> - <version>${jboss.j2ee.version}</version> + <version>4.0.2</version> </dependency> <dependency> <groupId>javax.jcr</groupId> <artifactId>jcr</artifactId> - <version>${javax.jcr.version}</version> + <version>1.0</version> </dependency> <dependency> <groupId>javax.transaction</groupId> <artifactId>jta</artifactId> - <version>${jta.version}</version> + <version>1.1</version> </dependency> <dependency> <groupId>com.sun.facelets</groupId> <artifactId>jsf-facelets</artifactId> - <version>${jsf.facelets.version}</version> + <version>1.1.15</version> </dependency> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>${junit.version}</version> + <version>3.8.1</version> </dependency> <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> - <version>${log4j.version}</version> + <version>1.2.14</version> </dependency> <dependency> <groupId>javax.mail</groupId> <artifactId>mail</artifactId> - <version>${javax.mail.version}</version> + <version>1.4</version> </dependency> <dependency> <groupId>net.sf.retrotranslator</groupId> <artifactId>retrotranslator-runtime</artifactId> - <version>${retrotranslator.version}</version> + <version>1.2.7</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui</artifactId> - <version>${richfaces.ui.version}</version> + <version>3.2.1.GA</version> </dependency> <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> - <version>${javax.servlet.version}</version> + <version>2.4</version> </dependency> <dependency> <groupId>org.subethamail</groupId> <artifactId>subethasmtp-smtp</artifactId> - <version>${wiser.version}</version> + <version>1.2</version> <classifier>java14</classifier> </dependency> <dependency> <groupId>org.subethamail</groupId> <artifactId>subethasmtp-wiser</artifactId> - <version>${wiser.version}</version> + <version>1.2</version> <classifier>java14</classifier> <exclusions> <exclusion> @@ -348,6 +319,7 @@ <artifactId>jconnect</artifactId> <version>${jconnect.version}</version> </dependency> + </dependencies> </dependencyManagement>

13 years, 10 months

1
0
0 / 0

JBoss JBPM SVN: r6607 - in jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal: hibernate and 2 other directories.

by do-not-reply＠jboss.org

Author: rebody Date: 2010-08-18 05:40:27 -0400 (Wed, 18 Aug 2010) New Revision: 6607 Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CheckDbCmd.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/DbSessionImpl.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/id/PropertyImpl.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/session/DbSession.java Log: JBPM-2927 move check table method to DbSession. Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CheckDbCmd.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CheckDbCmd.java 2010-08-18 08:12:55 UTC (rev 6606) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/CheckDbCmd.java 2010-08-18 09:40:27 UTC (rev 6607) @@ -30,6 +30,7 @@ import org.jbpm.pvm.internal.id.PropertyImpl; import org.jbpm.pvm.internal.model.ExecutionImpl; import org.jbpm.pvm.internal.processengine.ProcessEngineImpl; +import org.jbpm.pvm.internal.session.DbSession; /** * @author Tom Baeyens @@ -37,59 +38,48 @@ public class CheckDbCmd implements Command<Object> { private static final long serialVersionUID = 1L; - + private static Log log = Log.getLog(CheckDbCmd.class.getName()); public Object execute(Environment environment) throws Exception { + DbSession dbSession = EnvironmentImpl.getFromCurrent(DbSession.class); Session session = EnvironmentImpl.getFromCurrent(Session.class); - // if table JBPM4_PROPERTIES doesn't exist, - if (!PropertyImpl.propertiesTableExists(session)) { - if (!executionTableExists(session)) { + // if table JBPM4_PROPERTIES doesn't exist, + if (!dbSession.propertiesTableExists()) { + if (!dbSession.executionTableExists()) { // tell users to run create.schema throw new JbpmException("no jBPM DB schema: no JBPM4_EXECUTION table. Run the create.jbpm.schema target first in the install tool."); - + } else { // tell users to run upgrade throw new JbpmException("jBPM DB schema not in sync with library version: no JBPM4_PROPERTIES table. Run the upgrade target first in the install tool."); } - + } else { Long nextDbid = PropertyImpl.getNextDbid(session); - // if there is no next.dbid property specified - if (nextDbid==null) { + // if there is no next.dbid property specified + if (nextDbid == null) { // (this only happens in the test suite) - // initialize the dbid property. + // initialize the dbid property. PropertyImpl.setNextDbid(session, 1); } } // verify if DB version matches with library version, String dbVersion = PropertyImpl.getDbVersion(session); - log.info("jBPM version info: library["+ProcessEngineImpl.JBPM_LIBRARY_VERSION+"], schema["+dbVersion+"]"); + if (log.isInfoEnabled()) { + log.info("jBPM version info: library[" + ProcessEngineImpl.JBPM_LIBRARY_VERSION + "], schema[" + dbVersion + "]"); + } - if ( (dbVersion!=null) + if ( (dbVersion != null) && (!dbVersion.equals(ProcessEngineImpl.JBPM_LIBRARY_VERSION)) ) { // tell users to run upgrade - throw new JbpmException("jBPM DB schema version ("+dbVersion+") differs from jBPM library version ("+ProcessEngineImpl.JBPM_LIBRARY_VERSION+"): run the upgrade tool first."); + throw new JbpmException("jBPM DB schema version (" + dbVersion + ") differs from jBPM library version (" + + ProcessEngineImpl.JBPM_LIBRARY_VERSION + "): run the upgrade tool first."); } return null; } - - public static boolean executionTableExists(Session session) { - try { - session.createQuery("from "+ExecutionImpl.class.getName()) - .setMaxResults(1) - .uniqueResult(); - return true; - - } catch (Exception e) { - return false; - } - } - - - } Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/DbSessionImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/DbSessionImpl.java 2010-08-18 08:12:55 UTC (rev 6606) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/DbSessionImpl.java 2010-08-18 09:40:27 UTC (rev 6607) @@ -42,6 +42,7 @@ import org.jbpm.pvm.internal.history.model.HistoryCommentImpl; import org.jbpm.pvm.internal.history.model.HistoryProcessInstanceImpl; import org.jbpm.pvm.internal.id.DbidGenerator; +import org.jbpm.pvm.internal.id.PropertyImpl; import org.jbpm.pvm.internal.job.JobImpl; import org.jbpm.pvm.internal.job.StartProcessTimer; import org.jbpm.pvm.internal.job.TimerImpl; @@ -396,4 +397,29 @@ .list(); return CollectionUtil.checkList(timers, Timer.class); } + + /** check table. */ + public boolean executionTableExists() { + try { + session.createQuery("from " + ExecutionImpl.class.getName()) + .setMaxResults(1) + .uniqueResult(); + return true; + + } catch (Exception e) { + return false; + } + } + + public boolean propertiesTableExists() { + try { + session.createQuery("from " + PropertyImpl.class.getName()) + .setMaxResults(1) + .uniqueResult(); + return true; + + } catch (Exception e) { + return false; + } + } } Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/id/PropertyImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/id/PropertyImpl.java 2010-08-18 08:12:55 UTC (rev 6606) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/id/PropertyImpl.java 2010-08-18 09:40:27 UTC (rev 6607) @@ -46,24 +46,24 @@ import org.jbpm.pvm.internal.type.Variable; /** jbpm installation properties. - * + * * currently there are 2 use cases for these properties: * 1) include the jbpm schema version into the DB * 2) have a record to maintain the next dbid for the id generator - * + * * @author Tom Baeyens */ public class PropertyImpl { - + private static Log log = Log.getLog(PropertyImpl.class.getName()); - + public static final String DB_VERSION_KEY = "db.version"; public static final String NEXT_DBID_KEY = "next.dbid"; protected int version; protected String key; protected String value; - + protected PropertyImpl() { } @@ -71,10 +71,10 @@ this.key = key; this.value = value; } - + public static Long getNextDbid(Session session) { String dbidPropertyValue = getPropertyValue(session, PropertyImpl.NEXT_DBID_KEY); - if (dbidPropertyValue!=null) { + if (dbidPropertyValue != null) { return Long.valueOf(dbidPropertyValue); } return null; @@ -86,7 +86,7 @@ public static String getDbVersion(Session session) { String dbVersionPropertyValue = getPropertyValue(session, PropertyImpl.DB_VERSION_KEY); - if (dbVersionPropertyValue!=null) { + if (dbVersionPropertyValue != null) { return dbVersionPropertyValue; } return null; @@ -102,26 +102,16 @@ } public static void initializeNextDbid(Session session) { - long nextDbid = getMaxDbid(session)+1; + long nextDbid = getMaxDbid(session) + 1; setNextDbid(session, nextDbid); - log.info("nextDbid is initialized to "+nextDbid); - } - - public static boolean propertiesTableExists(Session session) { - try { - session.createQuery("from "+PropertyImpl.class.getName()) - .setMaxResults(1) - .uniqueResult(); - return true; - - } catch (Exception e) { - return false; + if (log.isInfoEnabled()) { + log.info("nextDbid is initialized to " + nextDbid); } } protected static long getMaxDbid(Session session) { long maxDbid = 0; - + List<String> persistedTypes = new ArrayList<String>(); persistedTypes.add(DeploymentImpl.class.getName()); persistedTypes.add(DeploymentProperty.class.getName()); @@ -139,21 +129,21 @@ persistedTypes.add(TaskImpl.class.getName()); persistedTypes.add(UserImpl.class.getName()); persistedTypes.add(Variable.class.getName()); - + for (String persistedType: persistedTypes) { try { Long typeMaxDbid = (Long) session.createQuery( "select max(o.dbid) " + - "from "+persistedType+" as o" + "from " + persistedType + " as o" ).uniqueResult(); - + if ( (typeMaxDbid!=null) - && (typeMaxDbid.longValue()>maxDbid) + && (typeMaxDbid.longValue()>maxDbid) ) { maxDbid = typeMaxDbid.longValue(); } } catch (Exception e) { - log.info("couldn't get max dbid for "+persistedType, e); + log.info("couldn't get max dbid for " + persistedType, e); e.printStackTrace(); } } @@ -163,7 +153,7 @@ protected static String getPropertyValue(Session session, String propertyKey) { PropertyImpl dbidProperty = getProperty(session, propertyKey); - if (dbidProperty==null) { + if (dbidProperty == null) { return null; } return dbidProperty.getValue(); @@ -171,7 +161,7 @@ protected static void setPropertyValue(Session session, String propertyKey, String propertyValue) { PropertyImpl property = getProperty(session, propertyKey); - if (property==null) { + if (property == null) { property = new PropertyImpl(propertyKey, propertyValue); session.save(property); } else { Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/session/DbSession.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/session/DbSession.java 2010-08-18 08:12:55 UTC (rev 6606) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/session/DbSession.java 2010-08-18 09:40:27 UTC (rev 6607) @@ -112,4 +112,8 @@ /** retrieve all the outstanding timers associated for the given execution */ List<Timer> findTimersByExecution(Execution execution); + + /** check table. */ + boolean executionTableExists(); + boolean propertiesTableExists(); }

13 years, 10 months

1
0
0 / 0

JBoss JBPM SVN: r6606 - in jbpm3/branches/jbpm-soa5.1-mavenise/modules: core/scripts and 2 other directories.

by do-not-reply＠jboss.org

Author: ryanzhang Date: 2010-08-18 04:12:55 -0400 (Wed, 18 Aug 2010) New Revision: 6606 Added: jbpm3/branches/jbpm-soa5.1-mavenise/modules/soa-distribution/post-patch/overlay_jbpm_jpdl_jar.xml Removed: jbpm3/branches/jbpm-soa5.1-mavenise/modules/soa-distribution/post-patch/overlay_jbpm_conf.xml Modified: jbpm3/branches/jbpm-soa5.1-mavenise/modules/core/pom.xml jbpm3/branches/jbpm-soa5.1-mavenise/modules/core/scripts/antrun-jbpm-config.xml jbpm3/branches/jbpm-soa5.1-mavenise/modules/soa-distribution/build.xml jbpm3/branches/jbpm-soa5.1-mavenise/modules/soa-distribution/pom.xml jbpm3/branches/jbpm-soa5.1-mavenise/modules/soa-distribution/post-patch/overlay_database_sql.xml jbpm3/branches/jbpm-soa5.1-mavenise/modules/soa-distribution/post-patch/overlay_hibernate_conf.xml jbpm3/branches/jbpm-soa5.1-mavenise/modules/soa-distribution/post-patch/overlay_jsf_console.xml jbpm3/branches/jbpm-soa5.1-mavenise/modules/soa-distribution/post-patch/remove_uninstaller.xml jbpm3/branches/jbpm-soa5.1-mavenise/modules/soa-distribution/post-patch/remove_unneeded_docs.xml Log: Remove core module soa profile, add the logic into soa-distribution. update some soa patch Modified: jbpm3/branches/jbpm-soa5.1-mavenise/modules/core/pom.xml =================================================================== --- jbpm3/branches/jbpm-soa5.1-mavenise/modules/core/pom.xml 2010-08-18 02:53:16 UTC (rev 6605) +++ jbpm3/branches/jbpm-soa5.1-mavenise/modules/core/pom.xml 2010-08-18 08:12:55 UTC (rev 6606) @@ -185,37 +185,6 @@  <profiles> - -  - <profile> - <id>soa</id> - <build> - <plugins> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <phase>process-resources</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <property name="database" value="${database}" /> - <ant antfile="scripts/antrun-jbpm-config.xml" target="concat" /> - <ant antfile="scripts/antrun-jbpm-config.xml" target="jbpm-cfg-xml-soa" /> - </tasks> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> -  - <target name="jbpm-cfg-xml-soa" > - <echo message="Generate the custom jbpm.cfg.xml for the SOA platform" /> - <macro-disable section="Logging Service" file="${project.build.directory}/classes/org/jbpm/default.jbpm.cfg.xml"/> - </target> - -</project> \ No newline at end of file +</project> Modified: jbpm3/branches/jbpm-soa5.1-mavenise/modules/soa-distribution/build.xml =================================================================== --- jbpm3/branches/jbpm-soa5.1-mavenise/modules/soa-distribution/build.xml 2010-08-18 02:53:16 UTC (rev 6605) +++ jbpm3/branches/jbpm-soa5.1-mavenise/modules/soa-distribution/build.xml 2010-08-18 08:12:55 UTC (rev 6606) @@ -22,16 +22,17 @@ <arg value="${module_base_dir}/../distribution/target/autosetup.xml"/> </java> - <copy todir="${module_base_dir}/target/work/jbpm-jpdl" overwrite="true"> + </target> + + <target name="assemble"> + <copy todir="${module_base_dir}/target/dist/jbpm-jpdl" overwrite="true"> <fileset dir="${jbpm_install_path}"/> </copy> - <copy todir="${module_base_dir}/target/work/jbpm-jpdl/deploy" overwrite="true"> + <copy todir="${module_base_dir}/target/dist/jbpm-jpdl/deploy" overwrite="true"> <fileset dir="${module_base_dir}/target/work/jboss"/> </copy> - </target> - <target name="assemble"> <copy todir="${module_base_dir}/target/dist/jbpm-config" overwrite="true"> <fileset dir="${jbpm_install_path}/lib"> <include name="jbpm-jpdl.jar"/> @@ -43,10 +44,6 @@ </fileset> </copy> - <copy todir="${module_base_dir}/target/dist/jbpm-jpdl" overwrite="true"> - <fileset dir="${module_base_dir}/target/work/jbpm-jpdl"/> - </copy> - <copy todir="${module_base_dir}/target/dist/jbpm-sql" overwrite="true"> <fileset dir="${jbpm_install_path}/database"> <include name="*.sql"/> @@ -60,15 +57,14 @@ tofile="jbpm-jpdl-soa.${build_version}.zip"/> <checksum file="jbpm-jpdl-soa.${build_version}.zip"/> --> -  - <mkdir dir="${module_base_dir}/target/dist/javadocs"/> - <unzip src="${jbpm_install_path}/docs/jbpm-enterprise-javadoc.jar" - dest="${module_base_dir}/target/dist/javadocs/enterprise"/> - <unzip src="${jbpm_install_path}/docs/jbpm-identity-javadoc.jar" dest="${module_base_dir}/target/dist/javadocs/identity"/> - <unzip src="${jbpm_install_path}/docs/jbpm-jpdl-javadoc.jar" dest="${module_base_dir}/target/dist/javadocs/jbpm-jpdl"/> +  + <copy todir="${module_base_dir}/target/dist/javadocs" overwrite="true"> + <fileset dir="${module_base_dir}/target/work/javadocs" includes="**/*" /> + </copy> + <zip destfile="${module_base_dir}/target/${module_build_finalName}.zip" > - <zipfileset dir="${module_base_dir}/target/dist" prefix="jbpm" includes="**/*" /> + <zipfileset dir="${module_base_dir}/target/dist" prefix="jbpm" includes="**/*" excludes="javadocs/**"/> </zip> </target> Modified: jbpm3/branches/jbpm-soa5.1-mavenise/modules/soa-distribution/pom.xml =================================================================== --- jbpm3/branches/jbpm-soa5.1-mavenise/modules/soa-distribution/pom.xml 2010-08-18 02:53:16 UTC (rev 6605) +++ jbpm3/branches/jbpm-soa5.1-mavenise/modules/soa-distribution/pom.xml 2010-08-18 08:12:55 UTC (rev 6606) @@ -71,7 +71,7 @@ </configuration> </execution> <execution> - <id>cp-jsf-console-soa</id> + <id>cp-jsf-console-soa-distribution</id> <phase>process-resources</phase> <goals> <goal>copy</goal> @@ -80,9 +80,8 @@ <artifactItems> <artifactItem> <groupId>org.jbpm.jbpm3</groupId> - <artifactId>jsf-console</artifactId> + <artifactId>jsf-console-soa-distribution</artifactId> <version>3.2.9</version> - <classifier>soa</classifier> <type>war</type> </artifactItem> </artifactItems> @@ -96,14 +95,7 @@ <artifactId>maven-antrun-plugin</artifactId> <version>1.3</version> <dependencies> - <dependency> - <groupId>org.jbpm.jbpm3</groupId> - <artifactId>jsf-console</artifactId> - <version>3.2.9</version> - <classifier>soa</classifier> - <type>war</type> - </dependency> - <dependency> +  <dependency> <groupId>org.codehaus.groovy</groupId> <artifactId>groovy-all</artifactId> Modified: jbpm3/branches/jbpm-soa5.1-mavenise/modules/soa-distribution/post-patch/overlay_database_sql.xml =================================================================== --- jbpm3/branches/jbpm-soa5.1-mavenise/modules/soa-distribution/post-patch/overlay_database_sql.xml 2010-08-18 02:53:16 UTC (rev 6605) +++ jbpm3/branches/jbpm-soa5.1-mavenise/modules/soa-distribution/post-patch/overlay_database_sql.xml 2010-08-18 08:12:55 UTC (rev 6606) @@ -5,9 +5,6 @@ <fileset dir="${module_base_dir}/target/work/jbpm-installed/database"> <include name="**/jbpm.jpdl.*.update322.sql"/> </fileset> - <fileset dir="${module_base_dir}/target/work/jbpm-jpdl/database"> - <include name="**/jbpm.jpdl.*.update322.sql"/> - </fileset> </delete> </target> Modified: jbpm3/branches/jbpm-soa5.1-mavenise/modules/soa-distribution/post-patch/overlay_hibernate_conf.xml =================================================================== --- jbpm3/branches/jbpm-soa5.1-mavenise/modules/soa-distribution/post-patch/overlay_hibernate_conf.xml 2010-08-18 02:53:16 UTC (rev 6605) +++ jbpm3/branches/jbpm-soa5.1-mavenise/modules/soa-distribution/post-patch/overlay_hibernate_conf.xml 2010-08-18 08:12:55 UTC (rev 6606) @@ -31,13 +31,5 @@ <property name="hibernate.current_session_context_class">jta</property>]]></replacevalue> </replace> -  -  - <replace file="${module_base_dir}/target/work/jbpm-jpdl/config/hibernate.cfg.xml"> - <replacetoken><![CDATA[JTA transaction properties (begin) ===]]></replacetoken> - <replacevalue><![CDATA[JTA transaction properties (begin) === - <property name="jta.UserTransaction">UserTransaction</property> - <property name="hibernate.current_session_context_class">jta</property>]]></replacevalue> - </replace> </target> </project> Deleted: jbpm3/branches/jbpm-soa5.1-mavenise/modules/soa-distribution/post-patch/overlay_jbpm_conf.xml =================================================================== --- jbpm3/branches/jbpm-soa5.1-mavenise/modules/soa-distribution/post-patch/overlay_jbpm_conf.xml 2010-08-18 02:53:16 UTC (rev 6605) +++ jbpm3/branches/jbpm-soa5.1-mavenise/modules/soa-distribution/post-patch/overlay_jbpm_conf.xml 2010-08-18 08:12:55 UTC (rev 6606) @@ -1,7 +0,0 @@ -<project name="overlay_hibernate_conf" default="apply.patch"> -  - - <target name="apply.patch" > -  - </target> -</project> Added: jbpm3/branches/jbpm-soa5.1-mavenise/modules/soa-distribution/post-patch/overlay_jbpm_jpdl_jar.xml =================================================================== --- jbpm3/branches/jbpm-soa5.1-mavenise/modules/soa-distribution/post-patch/overlay_jbpm_jpdl_jar.xml (rev 0) +++ jbpm3/branches/jbpm-soa5.1-mavenise/modules/soa-distribution/post-patch/overlay_jbpm_jpdl_jar.xml 2010-08-18 08:12:55 UTC (rev 6606) @@ -0,0 +1,18 @@ +<project name="Generate the customer jbpm.cfg.xml" default="apply.patch"> +  + <property name="module_work_dir" value="${module_base_dir}/target/work" /> + <property name="jbpm_config" value="${module_work_dir}/patch_jbpm_cfg/org/jbpm/default.jbpm.cfg.xml" /> + + + <target name="apply.patch" > + <unjar src="${module_work_dir}/jbpm-installed/lib/jbpm-jpdl.jar" dest="${module_work_dir}/patch_jbpm_cfg/" overwrite="true"/> + + +  + <replace file="${jbpm_config}" token='' value='' value='=== Logging Service (begin) -->' /> + + <delete file="${module_work_dir}/jbpm-installed/lib/jbpm-jpdl.jar" /> + <jar destfile="${module_work_dir}/jbpm-installed/lib/jbpm-jpdl.jar" basedir="${module_work_dir}/patch_jbpm_cfg/" /> + </target> +</project> Modified: jbpm3/branches/jbpm-soa5.1-mavenise/modules/soa-distribution/post-patch/overlay_jsf_console.xml =================================================================== --- jbpm3/branches/jbpm-soa5.1-mavenise/modules/soa-distribution/post-patch/overlay_jsf_console.xml 2010-08-18 02:53:16 UTC (rev 6605) +++ jbpm3/branches/jbpm-soa5.1-mavenise/modules/soa-distribution/post-patch/overlay_jsf_console.xml 2010-08-18 08:12:55 UTC (rev 6606) @@ -1,15 +1,14 @@ -<project name="overlay_jsf_console" default="apply.patch"> +<project name="overlay jsf console with SOA version" default="apply.patch"> + <property name="module_work_dir" value="${module_base_dir}/target/work" /> <target name="apply.patch" > - <delete> - <fileset dir="${module_base_dir}/target/work/jbpm-installed/lib"> - <include name="jsf-console.war"/> - </fileset> - </delete> - <copy tofile="${module_base_dir}/target/work/jbpm-installed/lib/jsf-console.war" overwrite="yes" > - <fileset dir="${module_base_dir}/target/dependency/"> - <include name="jsf-console*.war"/> - </fileset> + <delete file="${module_work_dir}/jbpm-installed/lib/jsf-console.war" /> + <copy tofile="${module_work_dir}/jbpm-installed/lib/jsf-console.war" overwrite="true" > + <fileset dir="${module_base_dir}/target/dependency/" includes="jsf-console*" /> </copy> + + <delete dir="${module_work_dir}/jboss/server/default/deploy/jbpm/jsf-console.war" /> + <unwar src="${module_work_dir}/jbpm-installed/lib/jsf-console.war" dest="${module_work_dir}/jboss/server/default/deploy/jbpm/jsf-console.war" overwrite="true" /> + </target> </project> Modified: jbpm3/branches/jbpm-soa5.1-mavenise/modules/soa-distribution/post-patch/remove_uninstaller.xml =================================================================== --- jbpm3/branches/jbpm-soa5.1-mavenise/modules/soa-distribution/post-patch/remove_uninstaller.xml 2010-08-18 02:53:16 UTC (rev 6605) +++ jbpm3/branches/jbpm-soa5.1-mavenise/modules/soa-distribution/post-patch/remove_uninstaller.xml 2010-08-18 08:12:55 UTC (rev 6606) @@ -1,7 +1,7 @@ <project name="remove_uninstall" default="apply.patch"> <target name="apply.patch" >  - <delete dir="${module_base_dir}/target/work/jbpm-jpdl/Uninstaller"/> - <delete file="${module_base_dir}/target/work/jbpm-jpdl/.installationinformation"/> + <delete dir="${module_base_dir}/target/work/jbpm-installed/Uninstaller"/> + <delete file="${module_base_dir}/target/work/jbpm-installed/.installationinformation"/> </target> </project> Modified: jbpm3/branches/jbpm-soa5.1-mavenise/modules/soa-distribution/post-patch/remove_unneeded_docs.xml =================================================================== --- jbpm3/branches/jbpm-soa5.1-mavenise/modules/soa-distribution/post-patch/remove_unneeded_docs.xml 2010-08-18 02:53:16 UTC (rev 6605) +++ jbpm3/branches/jbpm-soa5.1-mavenise/modules/soa-distribution/post-patch/remove_unneeded_docs.xml 2010-08-18 08:12:55 UTC (rev 6606) @@ -1,7 +1,12 @@ <project name="patchname" default="apply.patch"> - <property name="package_root" value="${module_base_dir}/target/work/jbpm-jpdl" /> + <property name="package_root" value="${module_base_dir}/target/work/jbpm-installed" /> <target name="apply.patch"> + <unzip src="${package_root}/docs/jbpm-enterprise-javadoc.jar" + dest="${module_base_dir}/target/work/javadocs/enterprise"/> + <unzip src="${package_root}/docs/jbpm-identity-javadoc.jar" dest="${module_base_dir}/target/work/javadocs/identity"/> + <unzip src="${package_root}/docs/jbpm-jpdl-javadoc.jar" dest="${module_base_dir}/target/work/javadocs/jbpm-jpdl"/> +  <delete dir="${package_root}/docs"/>

13 years, 10 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

jbpm-commits August 2010