May 2012 - jbosstools-commits - Jboss List Archives

JBoss Tools SVN: r41314 - in trunk/openshift: plugins/org.jboss.tools.openshift.express.ui/.settings and 8 other directories.

by jbosstools-commits＠lists.jboss.org

Author: adietish Date: 2012-05-23 16:00:28 -0400 (Wed, 23 May 2012) New Revision: 41314 Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/AbstractThreadedOperation.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/job/ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/job/AbstractDelegatingMonitorJob.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/job/WaitForApplicationJob.java Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.client/openshift-java-client-2.0.0-SNAPSHOT.jar trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/.settings/org.eclipse.jdt.core.prefs trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/CreateApplicationOperation.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/EmbedCartridgeStrategy.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/console/UserDelegate.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/OpenShiftUIActivator.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/OpenshiftUIMessages.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/CreateServerAdapterAction.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/DeleteApplicationAction.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/DeleteDomainAction.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/messages/OpenShiftExpressUIMessages.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/messages/OpenShiftExpressUIMessages.properties trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizardPageModel.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/IEmbedCartridgesWizardPageModel.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizard.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizardModel.java trunk/openshift/tests/org.jboss.tools.openshift.express.test/src/org/jboss/tools/openshift/express/test/EmbedCartridgeStrategyTest.java Log: [JBIDE-11314] implementing dialog that asks if you want to continue to wait Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.client/openshift-java-client-2.0.0-SNAPSHOT.jar =================================================================== (Binary files differ) Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/.settings/org.eclipse.jdt.core.prefs =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/.settings/org.eclipse.jdt.core.prefs 2012-05-23 19:55:29 UTC (rev 41313) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/.settings/org.eclipse.jdt.core.prefs 2012-05-23 20:00:28 UTC (rev 41314) @@ -1,4 +1,3 @@ -#Wed Sep 14 11:53:06 CEST 2011 eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 @@ -6,3 +5,283 @@ org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.source=1.6 +org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_assignment=0 +org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 +org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 +org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 +org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 +org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 +org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80 +org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16 +org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 +org.eclipse.jdt.core.formatter.blank_lines_after_package=1 +org.eclipse.jdt.core.formatter.blank_lines_before_field=0 +org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0 +org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 +org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 +org.eclipse.jdt.core.formatter.blank_lines_before_method=1 +org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 +org.eclipse.jdt.core.formatter.blank_lines_before_package=0 +org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 +org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 +org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false +org.eclipse.jdt.core.formatter.comment.format_block_comments=true +org.eclipse.jdt.core.formatter.comment.format_header=false +org.eclipse.jdt.core.formatter.comment.format_html=true +org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true +org.eclipse.jdt.core.formatter.comment.format_line_comments=true +org.eclipse.jdt.core.formatter.comment.format_source_code=true +org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true +org.eclipse.jdt.core.formatter.comment.indent_root_tags=true +org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert +org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert +org.eclipse.jdt.core.formatter.comment.line_length=80 +org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true +org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true +org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false +org.eclipse.jdt.core.formatter.compact_else_if=true +org.eclipse.jdt.core.formatter.continuation_indentation=2 +org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 +org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off +org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on +org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false +org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true +org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_empty_lines=false +org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true +org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false +org.eclipse.jdt.core.formatter.indentation.size=4 +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert +org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert +org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.join_lines_in_comments=true +org.eclipse.jdt.core.formatter.join_wrapped_lines=false +org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false +org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false +org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false +org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false +org.eclipse.jdt.core.formatter.lineSplit=120 +org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false +org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false +org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 +org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1 +org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true +org.eclipse.jdt.core.formatter.tabulation.char=tab +org.eclipse.jdt.core.formatter.tabulation.size=4 +org.eclipse.jdt.core.formatter.use_on_off_tags=false +org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false +org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true +org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true +org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/AbstractThreadedOperation.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/AbstractThreadedOperation.java (rev 0) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/AbstractThreadedOperation.java 2012-05-23 20:00:28 UTC (rev 41314) @@ -0,0 +1,54 @@ +/******************************************************************************* + * Copyright (c) 2012 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.openshift.express.internal.core; + +import java.util.concurrent.Callable; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.Future; + +import org.eclipse.core.runtime.IProgressMonitor; +import org.jboss.tools.openshift.express.internal.ui.messages.OpenShiftExpressUIMessages; +import org.jboss.tools.openshift.express.internal.ui.utils.Logger; + +import com.openshift.client.OpenShiftException; + +/** + * @author Andre Dietisheim + */ +public abstract class AbstractThreadedOperation { + + private static final int THREAD_SLEEP = 1 * 1000; + + private ExecutorService executor = Executors.newFixedThreadPool(1); + + protected AbstractThreadedOperation() { + } + + protected <E> E submit(Callable<E> callable, IProgressMonitor monitor) throws OpenShiftException { + try { + Future<E> future = executor.submit(callable); + while (!future.isDone()) { + if (monitor.isCanceled()) { + throw new OpenShiftException(OpenShiftExpressUIMessages.OPERATION_CANCELLED); + } + Thread.sleep(THREAD_SLEEP); + } + return future.get(); + } catch (Exception e) { // InterruptedException and ExecutionException + Throwable cause = e.getCause() != null ? e.getCause() : e; + Logger.error("Failed to create application", cause); + throw new OpenShiftException("Failed to create application: {0}", cause.getMessage()); + } finally { + executor.shutdown(); + } + } +} Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/AbstractThreadedOperation.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/CreateApplicationOperation.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/CreateApplicationOperation.java 2012-05-23 19:55:29 UTC (rev 41313) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/CreateApplicationOperation.java 2012-05-23 20:00:28 UTC (rev 41314) @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011 Red Hat, Inc. + * Copyright (c) 2012 Red Hat, Inc. * Distributed under license by Red Hat, Inc. All rights reserved. * This program is made available under the terms of the * Eclipse Public License v1.0 which accompanies this distribution, @@ -10,10 +10,7 @@ ******************************************************************************/ package org.jboss.tools.openshift.express.internal.core; -import java.util.concurrent.Callable; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.FutureTask; +import java.net.SocketTimeoutException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.osgi.util.NLS; @@ -29,65 +26,34 @@ import com.openshift.client.OpenShiftException; /** + * @author Xavier Coulon * @author Andre Dietisheim */ public class CreateApplicationOperation { - private static final int APP_CREATION_TIMEOUT = 180; private UserDelegate user; public CreateApplicationOperation(UserDelegate user) { this.user = user; } - public IApplication execute(final String name, final ICartridge cartridge, - final ApplicationScale scale, final IGearProfile gearProfile, final IProgressMonitor monitor) + public IApplication execute(final String name, final ICartridge cartridge, final ApplicationScale scale, + final IGearProfile gearProfile, final IProgressMonitor monitor) throws OpenShiftApplicationNotAvailableException, OpenShiftException { if (user == null) { - throw new OpenShiftException("Could not create application, have no valid user credentials"); + throw new OpenShiftException(OpenShiftExpressUIMessages.CANNOT_CREATE_NO_USER); } - ExecutorService executor = Executors.newFixedThreadPool(1); - try { - FutureTask<IApplication> future = new FutureTask<IApplication>( - new Callable<IApplication>() { - @Override - public IApplication call() throws Exception { - monitor.setTaskName("Creating application \"" + name + "\"..."); - Logger.debug("creating application..."); - final IApplication application = - user.createApplication(name, cartridge, scale, gearProfile); - monitor.beginTask( - "Waiting for application to be reachable...", IProgressMonitor.UNKNOWN); - Logger.debug("Waiting for application to be reachable..."); - waitForAccessible(application, monitor); - return application; - } - }); - executor.execute(future); - while (!future.isDone()) { - if (monitor.isCanceled()) { - throw new OpenShiftException("Operation was cancelled by user."); - } - Thread.sleep(1000); - } - final IApplication application = future.get(); - return application; - } catch (Exception e) { // InterruptedException and ExecutionException - Throwable cause = e.getCause() != null ? e.getCause() : e; - Logger.error("Failed to create application", cause); - throw new OpenShiftException("Failed to create application: {0}", cause.getMessage()); - } finally { - executor.shutdown(); - } - } - private void waitForAccessible(IApplication application, IProgressMonitor monitor) - throws OpenShiftApplicationNotAvailableException, OpenShiftException { - // monitor.subTask("waiting for application to become accessible..."); - if (!application.waitForAccessible(APP_CREATION_TIMEOUT * 1000)) { - throw new OpenShiftApplicationNotAvailableException(NLS.bind( - OpenShiftExpressUIMessages.HOSTNAME_NOT_ANSWERING, application.getApplicationUrl())); - } + monitor.setTaskName(NLS.bind(OpenShiftExpressUIMessages.CREATING_APPLICATION, name)); + Logger.debug(NLS.bind(OpenShiftExpressUIMessages.CREATING_APPLICATION, name)); + return createApplication(name, cartridge, scale, gearProfile, monitor); } + private IApplication createApplication(final String name, final ICartridge cartridge, + final ApplicationScale scale, final IGearProfile gearProfile, final IProgressMonitor monitor) + throws OpenShiftException { + monitor.setTaskName(NLS.bind(OpenShiftExpressUIMessages.CREATING_APPLICATION, name)); + Logger.debug(NLS.bind(OpenShiftExpressUIMessages.CREATING_APPLICATION, name)); + return user.createApplication(name, cartridge, scale, gearProfile); + } } Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/EmbedCartridgeStrategy.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/EmbedCartridgeStrategy.java 2012-05-23 19:55:29 UTC (rev 41313) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/EmbedCartridgeStrategy.java 2012-05-23 20:00:28 UTC (rev 41314) @@ -10,7 +10,6 @@ ******************************************************************************/ package org.jboss.tools.openshift.express.internal.core; -import java.net.SocketTimeoutException; import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; @@ -83,7 +82,7 @@ } public EmbeddableCartridgeDiff add(IEmbeddableCartridge cartridge, Set<IEmbeddableCartridge> currentCartridges) - throws OpenShiftException, SocketTimeoutException { + throws OpenShiftException { EmbeddableCartridgeDiff cartridgeDiff = new EmbeddableCartridgeDiff(cartridge); add(cartridge, currentCartridges, cartridgeDiff); return cartridgeDiff; @@ -91,7 +90,7 @@ private void add(IEmbeddableCartridge cartridge, Set<IEmbeddableCartridge> currentCartridges, EmbeddableCartridgeDiff diff) - throws OpenShiftException, SocketTimeoutException { + throws OpenShiftException { EmbeddableCartridgeRelations relation = dependenciesByCartridge.get(cartridge); if (relation == null) { return; @@ -102,8 +101,7 @@ } private void addRequired(Set<IEmbeddableCartridge> currentCartridges, EmbeddableCartridgeDiff diff, - IEmbeddableCartridge requiredCartridge) throws OpenShiftException, - SocketTimeoutException { + IEmbeddableCartridge requiredCartridge) throws OpenShiftException { if (requiredCartridge != null && !currentCartridges.contains(requiredCartridge)) { // recurse @@ -121,7 +119,7 @@ } private void removeConflicting(Set<IEmbeddableCartridge> currentCartridges, EmbeddableCartridgeDiff cartridgeDiff, - EmbeddableCartridgeRelations relation) throws OpenShiftException, SocketTimeoutException { + EmbeddableCartridgeRelations relation) throws OpenShiftException { IEmbeddableCartridge conflictingCartridge = relation.getConflicting(); if (conflictingCartridge != null) { remove(conflictingCartridge, currentCartridges, cartridgeDiff); @@ -132,7 +130,7 @@ } public EmbeddableCartridgeDiff remove(IEmbeddableCartridge cartridge, Set<IEmbeddableCartridge> currentCartridges) - throws OpenShiftException, SocketTimeoutException { + throws OpenShiftException { EmbeddableCartridgeDiff cartridgeDiff = new EmbeddableCartridgeDiff(cartridge); remove(cartridge, currentCartridges, cartridgeDiff); return cartridgeDiff; @@ -140,7 +138,7 @@ private void remove(IEmbeddableCartridge cartridge, Set<IEmbeddableCartridge> currentCartridges, EmbeddableCartridgeDiff cartridgeDiff) - throws OpenShiftException, SocketTimeoutException { + throws OpenShiftException { Set<IEmbeddableCartridge> dependantCartridges = dependantsByCartridge.get(cartridge); if (dependantCartridges == null) { return; Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/console/UserDelegate.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/console/UserDelegate.java 2012-05-23 19:55:29 UTC (rev 41313) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/console/UserDelegate.java 2012-05-23 20:00:28 UTC (rev 41314) @@ -128,7 +128,7 @@ } public IApplication createApplication(final String applicationName, final ICartridge applicationType, final ApplicationScale scale, final IGearProfile gearProfile) - throws OpenShiftException, SocketTimeoutException { + throws OpenShiftException { if(checkForPassword()) { return delegate.getDefaultDomain().createApplication(applicationName, applicationType, scale, gearProfile); } Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/OpenShiftUIActivator.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/OpenShiftUIActivator.java 2012-05-23 19:55:29 UTC (rev 41313) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/OpenShiftUIActivator.java 2012-05-23 20:00:28 UTC (rev 41314) @@ -1,15 +1,8 @@ package org.jboss.tools.openshift.express.internal.ui; -import java.net.URL; - -import org.eclipse.core.runtime.FileLocator; -import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.Status; -import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.osgi.util.NLS; -import org.eclipse.swt.graphics.Image; import org.eclipse.ui.plugin.AbstractUIPlugin; import org.jboss.tools.openshift.express.internal.core.console.UserModel; import org.osgi.framework.BundleContext; @@ -81,6 +74,10 @@ return new Status(IStatus.CANCEL, OpenShiftUIActivator.PLUGIN_ID, message); } + public static IStatus createCancelStatus(String message, Object... arguments) { + return new Status(IStatus.CANCEL, OpenShiftUIActivator.PLUGIN_ID, NLS.bind(message, arguments)); + } + public static IStatus createErrorStatus(String message) { return new Status(IStatus.ERROR, OpenShiftUIActivator.PLUGIN_ID, message); } Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/OpenshiftUIMessages.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/OpenshiftUIMessages.java 2012-05-23 19:55:29 UTC (rev 41313) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/OpenshiftUIMessages.java 2012-05-23 20:00:28 UTC (rev 41314) @@ -14,6 +14,7 @@ public class OpenshiftUIMessages extends NLS { private static final String BUNDLE_NAME = "org.jboss.tools.openshift.express.internal.ui.OpenshiftUIMessages"; //$NON-NLS-1$ + public static final String CREATING_APPLICATION = null; static { NLS.initializeMessages(BUNDLE_NAME, OpenshiftUIMessages.class); } Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/CreateServerAdapterAction.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/CreateServerAdapterAction.java 2012-05-23 19:55:29 UTC (rev 41313) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/CreateServerAdapterAction.java 2012-05-23 20:00:28 UTC (rev 41314) @@ -10,7 +10,6 @@ ******************************************************************************/ package org.jboss.tools.openshift.express.internal.ui.action; -import java.net.SocketTimeoutException; import java.util.List; import org.eclipse.core.runtime.Assert; @@ -70,8 +69,6 @@ WizardDialog dialog = new WizardDialog(Display.getCurrent().getActiveShell(), w); dialog.open(); } - } catch (SocketTimeoutException e) { - OpenShiftUIActivator.log("Could not create OpenShift server", e); } catch (OpenShiftException e) { OpenShiftUIActivator.log("Could not create OpenShift server", e); } Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/DeleteApplicationAction.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/DeleteApplicationAction.java 2012-05-23 19:55:29 UTC (rev 41313) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/DeleteApplicationAction.java 2012-05-23 20:00:28 UTC (rev 41314) @@ -10,7 +10,6 @@ ******************************************************************************/ package org.jboss.tools.openshift.express.internal.ui.action; -import java.net.SocketTimeoutException; import java.util.ArrayList; import java.util.Iterator; import java.util.List; @@ -27,6 +26,7 @@ import org.eclipse.ui.PlatformUI; import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; import org.jboss.tools.openshift.express.internal.ui.messages.OpenShiftExpressUIMessages; +import org.jboss.tools.openshift.express.internal.ui.utils.Logger; import com.openshift.client.IApplication; import com.openshift.client.OpenShiftException; @@ -89,9 +89,9 @@ try { application.destroy(); } catch (OpenShiftException e) { + safeRefresh(application); + Logger.error(NLS.bind("Failed to delete application \"{0}\"", appName), e); return OpenShiftUIActivator.createErrorStatus(NLS.bind("Failed to delete application \"{0}\"", appName), e); - } catch (SocketTimeoutException e) { - return OpenShiftUIActivator.createErrorStatus(NLS.bind("Failed to delete application \"{0}\"", appName), e); } } } finally { @@ -101,12 +101,25 @@ return Status.OK_STATUS; } + }; job.setPriority(Job.SHORT); job.schedule(); // start as soon as possible } } + private void safeRefresh(final IApplication application) { + if (application == null) { + return; + } + + try { + application.refresh(); + } catch (Exception e) { + Logger.error(NLS.bind("Could not refresh application \"{0}\"", application.getName()), e); + } + } + private boolean isApplication(Object selection) { return selection instanceof IApplication; } Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/DeleteDomainAction.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/DeleteDomainAction.java 2012-05-23 19:55:29 UTC (rev 41313) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/DeleteDomainAction.java 2012-05-23 20:00:28 UTC (rev 41314) @@ -99,9 +99,6 @@ return Status.OK_STATUS; } catch (OpenShiftException e) { return new Status(Status.ERROR, OpenShiftUIActivator.PLUGIN_ID, NLS.bind("Failed to delete domain \"{0}\"", domain.getId()), e); - - } catch (SocketTimeoutException e) { - return new Status(Status.ERROR, OpenShiftUIActivator.PLUGIN_ID, NLS.bind("Failed to delete domain \"{0}\"", domain.getId()), e); } } finally { monitor.done(); Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/job/AbstractDelegatingMonitorJob.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/job/AbstractDelegatingMonitorJob.java (rev 0) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/job/AbstractDelegatingMonitorJob.java 2012-05-23 20:00:28 UTC (rev 41314) @@ -0,0 +1,41 @@ +/******************************************************************************* + * Copyright (c) 2012 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.openshift.express.internal.ui.job; + +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.jobs.Job; +import org.jboss.tools.common.ui.DelegatingProgressMonitor; + +/** + * @author Andre Dietisheim + */ +public abstract class AbstractDelegatingMonitorJob extends Job { + + protected DelegatingProgressMonitor delegatingMonitor; + + public AbstractDelegatingMonitorJob(String name) { + super(name); + this.delegatingMonitor = new DelegatingProgressMonitor(); + } + + @Override + protected IStatus run(IProgressMonitor monitor) { + delegatingMonitor.add(monitor); + return doRun(delegatingMonitor); + } + + public DelegatingProgressMonitor getDelegatingProgressMonitor() { + return delegatingMonitor; + } + + protected abstract IStatus doRun(DelegatingProgressMonitor monitor); +} \ No newline at end of file Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/job/AbstractDelegatingMonitorJob.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/job/WaitForApplicationJob.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/job/WaitForApplicationJob.java (rev 0) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/job/WaitForApplicationJob.java 2012-05-23 20:00:28 UTC (rev 41314) @@ -0,0 +1,87 @@ +/******************************************************************************* + * Copyright (c) 2012 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.openshift.express.internal.ui.job; + +import java.util.concurrent.atomic.AtomicBoolean; + +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Status; +import org.eclipse.jface.dialogs.IDialogConstants; +import org.eclipse.jface.dialogs.MessageDialog; +import org.eclipse.osgi.util.NLS; +import org.eclipse.swt.SWT; +import org.eclipse.swt.widgets.Shell; +import org.jboss.tools.common.ui.DelegatingProgressMonitor; +import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; +import org.jboss.tools.openshift.express.internal.ui.messages.OpenShiftExpressUIMessages; +import org.jboss.tools.openshift.express.internal.ui.utils.Logger; + +import com.openshift.client.IApplication; +import com.openshift.client.OpenShiftException; +import com.openshift.client.OpenShiftTimeoutException; + +/** + * @author Andre Dietisheim + */ +public class WaitForApplicationJob extends AbstractDelegatingMonitorJob { + +// private static final int APP_REACHABLE_TIMEOUT = 180 * 1000; + private static final int APP_REACHABLE_TIMEOUT = 1 * 1000; + private IApplication application; + private Shell shell; + + public WaitForApplicationJob(IApplication application, Shell shell) { + super(NLS.bind(OpenShiftExpressUIMessages.WAITING_FOR_REACHABLE, application.getName())); + this.shell = shell; + this.application = application; + } + + @Override + protected IStatus doRun(DelegatingProgressMonitor monitor) { + Logger.debug(OpenShiftExpressUIMessages.WAITING_FOR_REACHABLE); + try { + while (!application.waitForAccessible(APP_REACHABLE_TIMEOUT)) { + if (!openKeepWaitingDialog()) { + return OpenShiftUIActivator.createCancelStatus(NLS.bind( + OpenShiftExpressUIMessages.APPLICATION_NOT_ANSWERING, application.getName())); + } + } + } catch (OpenShiftException e) { + return OpenShiftUIActivator.createErrorStatus(NLS.bind( + "Could not wait for application \"{0}\" to become reachable", application.getName()), e); + } + return Status.OK_STATUS; + } + + protected boolean openKeepWaitingDialog() { + final AtomicBoolean keepWaiting = new AtomicBoolean(false); + shell.getDisplay().syncExec(new Runnable() { + + @Override + public void run() { + MessageDialog dialog = + new MessageDialog(shell + , NLS.bind("Waiting for application {0}", application.getName()) + , shell.getDisplay().getSystemImage(SWT.ICON_QUESTION) + , NLS.bind(OpenShiftExpressUIMessages.APPLICATION_NOT_ANSWERING_CONTINUE_WAITING, + application.getName()) + , MessageDialog.QUESTION + , new String[] { OpenShiftExpressUIMessages.BTN_KEEP_WAITING, + OpenShiftExpressUIMessages.BTN_CLOSE_WIZARD } + , MessageDialog.QUESTION); + // style &= SWT.SHEET; + // dialog.setShellStyle(dialog.getShellStyle() | style); + keepWaiting.set(dialog.open() == IDialogConstants.OK_ID); + } + }); + return keepWaiting.get(); + } +} Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/job/WaitForApplicationJob.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/messages/OpenShiftExpressUIMessages.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/messages/OpenShiftExpressUIMessages.java 2012-05-23 19:55:29 UTC (rev 41313) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/messages/OpenShiftExpressUIMessages.java 2012-05-23 20:00:28 UTC (rev 41314) @@ -6,7 +6,6 @@ private static final String BUNDLE_NAME = OpenShiftExpressUIMessages.class.getName(); - static { NLS.initializeMessages(BUNDLE_NAME, OpenShiftExpressUIMessages.class); } @@ -15,40 +14,31 @@ // Do not instantiate } - public static String HOSTNAME_NOT_ANSWERING; - + public static String CANNOT_CREATE_NO_USER; + public static String OPERATION_CANCELLED; + public static String CREATING_APPLICATION; + public static String WAITING_FOR_REACHABLE; + public static String APPLICATION_NOT_ANSWERING; + public static String APPLICATION_NOT_ANSWERING_CONTINUE_WAITING; + public static String BTN_KEEP_WAITING; + public static String BTN_CLOSE_WIZARD; + public static String TAIL_SERVER_LOG_ACTION; - public static String CREATE_OR_EDIT_DOMAIN_ACTION; - public static String DELETE_DOMAIN_ACTION; - public static String SHOW_IN_ACTION_GROUP; - public static String SHOW_IN_BROWSER_ACTION; - public static String DELETE_APPLICATION_ACTION; - public static String CREATE_APPLICATION_ACTION; - public static String IMPORT_APPLICATION_ACTION; - public static String CREATE_SERVER_ADAPTER_ACTION; - public static String EDIT_CARTRIDGES_ACTION; - public static String MAKE_SNAPSHOT_ACTION; - public static String SHOW_PROPERTIES_VIEW_ACTION; - public static String SHOW_ENVIRONMENT_ACTION; - public static String SHOW_DETAILS_ACTION; - public static String REFRESH_VIEWER_ACTION; - public static String REFRESH_USER_ACTION; - public static String DELETE_CONNECTION_ACTION; public static String USER_NOT_CONNECTED_LABEL; Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/messages/OpenShiftExpressUIMessages.properties =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/messages/OpenShiftExpressUIMessages.properties 2012-05-23 19:55:29 UTC (rev 41313) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/messages/OpenShiftExpressUIMessages.properties 2012-05-23 20:00:28 UTC (rev 41314) @@ -1,4 +1,17 @@ -HOSTNAME_NOT_ANSWERING=We weren''t able to lookup your hostname ({0}) in a reasonable amount of time. This can happen periodically and will just take an extra minute or two to propagate depending on where you are in the world.\nOnce you are able to access your application in a browser, you can then clone your git repository.\nIf you can''t get your application running in the browser, you can also try destroying and recreating the application as well using this Wizard.\n\nIf this doesn''t work for you, let us know in the forums or in IRC and we''ll make sure to get you up and running.\n\nForums\: https\://www.redhat.com/openshift/forums/express\n\nIRC\: \#openshift (on Freenode) +CANNOT_CREATE_NO_USER=Could not create application, have no valid user credentials +CREATING_APPLICATION=Creating application \"{0}\"... +OPERATION_CANCELLED=Operation was cancelled by user. +WAITING_FOR_REACHABLE=Waiting for application \"{0}\" to become reachable... +APPLICATION_NOT_ANSWERING=The application \"{0}\" did not answer in a reasonable amount of time. \ +This can happen periodically and will just take an extra minute or two to propagate depending on where you are in the world.\n\ +Once you are able to access your application in a browser, you can then clone your git repository.\n\ +If you can''t get your application running in the browser, you can also try destroying and recreating the application as well using this Wizard.\n\n\ +If this doesn''t work for you, let us know in the forums or in IRC and we''ll make sure to get you up and running.\n\nForums\: \ +https\://www.redhat.com/openshift/forums/express\n\nIRC\: \#openshift (on Freenode) +APPLICATION_NOT_ANSWERING_CONTINUE_WAITING=Application \"{0}\" did not answer so far.\n\nDo you want to continue to wait for it? +BTN_KEEP_WAITING=Keep waiting +BTN_CLOSE_WIZARD=Close wizard + TAIL_SERVER_LOG_ACTION=Show Remote Logs # Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java 2012-05-23 19:55:29 UTC (rev 41313) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java 2012-05-23 20:00:28 UTC (rev 41314) @@ -311,7 +311,11 @@ this.gearProfilesCombo = new Combo(newAppConfigurationGroup, SWT.BORDER | SWT.READ_ONLY); GridDataFactory.fillDefaults() .align(SWT.FILL, SWT.CENTER).span(1, 1).grab(true, false).applyTo(gearProfilesCombo); - fillGearProfilesCombo(dbc, gearProfilesCombo); + dbc.bindList(WidgetProperties.items().observe(gearProfilesCombo), + BeanProperties.list(ApplicationConfigurationWizardPageModel.PROPERTY_GEAR_PROFILES).observe(pageModel), + new UpdateListStrategy(UpdateListStrategy.POLICY_NEVER), + new UpdateListStrategy().setConverter(new GearProfileToStringConverter())); + final ISWTObservableValue selectedGearProfileComboObservable = WidgetProperties.selection().observe(gearProfilesCombo); final IObservableValue selectedGearProfileModelObservable = BeanProperties.value( @@ -426,13 +430,6 @@ }, newAppConfigurationGroup); } - private void fillGearProfilesCombo(DataBindingContext dbc, Combo gearSizesCombo) { - dbc.bindList(WidgetProperties.items().observe(gearSizesCombo), - BeanProperties.list(ApplicationConfigurationWizardPageModel.PROPERTY_GEAR_PROFILES).observe(pageModel), - new UpdateListStrategy(UpdateListStrategy.POLICY_NEVER), - new UpdateListStrategy().setConverter(new GearProfileToStringConverter())); - } - protected CheckboxTableViewer createTable(Composite tableContainer) { Table table = new Table(tableContainer, SWT.BORDER | SWT.FULL_SELECTION | SWT.V_SCROLL | SWT.H_SCROLL | SWT.CHECK); @@ -541,7 +538,8 @@ int index = ((Integer) fromObject).intValue(); List<ICartridge> cartridges = pageModel.getCartridges(); - if (index < 0 || index > cartridges.size()) { + if (index >= cartridges.size() + || index == -1) { return null; } return cartridges.get(index); Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizardPageModel.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizardPageModel.java 2012-05-23 19:55:29 UTC (rev 41313) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizardPageModel.java 2012-05-23 20:00:28 UTC (rev 41314) @@ -144,6 +144,7 @@ .execute(new ArrayList<IEmbeddableCartridge>(selectedCartridges), null); } + @Override public IApplication createJenkinsApplication(String name, IProgressMonitor monitor) throws OpenShiftException { IApplication application = new CreateApplicationOperation(wizardModel.getUser()).execute( Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/IEmbedCartridgesWizardPageModel.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/IEmbedCartridgesWizardPageModel.java 2012-05-23 19:55:29 UTC (rev 41313) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/IEmbedCartridgesWizardPageModel.java 2012-05-23 20:00:28 UTC (rev 41314) @@ -39,6 +39,6 @@ public IDomain getDomain() throws SocketTimeoutException, OpenShiftException; - public IApplication createJenkinsApplication(String name, IProgressMonitor monitor) throws OpenShiftException; + public IApplication createJenkinsApplication(String name, IProgressMonitor monitor) throws OpenShiftException, SocketTimeoutException; } \ No newline at end of file Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizard.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizard.java 2012-05-23 19:55:29 UTC (rev 41313) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizard.java 2012-05-23 20:00:28 UTC (rev 41314) @@ -43,12 +43,15 @@ import org.jboss.tools.openshift.express.internal.ui.ImportFailedException; import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; import org.jboss.tools.openshift.express.internal.ui.WontOverwriteException; +import org.jboss.tools.openshift.express.internal.ui.job.AbstractDelegatingMonitorJob; +import org.jboss.tools.openshift.express.internal.ui.job.WaitForApplicationJob; import com.openshift.client.IApplication; import com.openshift.client.IEmbeddableCartridge; import com.openshift.client.IEmbeddedCartridge; import com.openshift.client.OpenShiftEndpointException; import com.openshift.client.OpenShiftException; +import com.openshift.client.OpenShiftTimeoutException; /** * @author Andre Dietisheim @@ -56,6 +59,10 @@ */ public abstract class OpenShiftExpressApplicationWizard extends Wizard implements IImportWizard, INewWizard { + private static final int APP_CREATE_TIMEOUT = 2 * 60 * 1000; + private static final int APP_WAIT_TIMEOUT = 2 * 60 * 1000; + private static final int IMPORT_TIMEOUT = 1 * 60 * 1000; + private final boolean skipCredentialsPage; private final OpenShiftExpressApplicationWizardModel wizardModel; @@ -139,8 +146,12 @@ boolean success = getWizardModel().isUseExistingApplication(); if (!success) { if (createApplication()) { - success = addRemoveCartridges( - getWizardModel().getApplication(), getWizardModel().getSelectedEmbeddableCartridges()); + if (success = waitForApplication(wizardModel.getApplication())) { + success = addRemoveCartridges( + getWizardModel().getApplication(), getWizardModel().getSelectedEmbeddableCartridges()); + } else { + getContainer().getShell().close(); + } } } if (success) { @@ -150,11 +161,22 @@ return success; } + private boolean waitForApplication(IApplication application) { + try { + AbstractDelegatingMonitorJob job = new WaitForApplicationJob(application, getShell()); + IStatus status = WizardUtils.runInWizard( + job, job.getDelegatingProgressMonitor(), getContainer(), APP_WAIT_TIMEOUT); + return status.isOK(); + } catch (Exception e) { + return false; + } + } + private boolean importProject() { try { final DelegatingProgressMonitor delegatingMonitor = new DelegatingProgressMonitor(); - IStatus jobResult = WizardUtils.runInWizard(new ImportJob(delegatingMonitor), delegatingMonitor, - getContainer(), 300); + IStatus jobResult = WizardUtils.runInWizard( + new ImportJob(delegatingMonitor), delegatingMonitor, getContainer(), IMPORT_TIMEOUT); return JobUtils.isOk(jobResult); } catch (Exception e) { ErrorDialog.openError(getShell(), "Error", "Could not create local git repository.", OpenShiftUIActivator @@ -166,13 +188,13 @@ private boolean createApplication() { try { final String applicationName = wizardModel.getApplicationName(); - final DelegatingProgressMonitor delegatingMonitor = new DelegatingProgressMonitor(); - IStatus status = WizardUtils.runInWizard( - new Job(NLS.bind("Creating application \"{0}\"...", applicationName)) { + AbstractDelegatingMonitorJob job = + new AbstractDelegatingMonitorJob( + NLS.bind("Creating application \"{0}\"...",applicationName)) { + @Override - protected IStatus run(IProgressMonitor monitor) { + protected IStatus doRun(DelegatingProgressMonitor monitor) { try { - delegatingMonitor.add(monitor); getWizardModel().createApplication(delegatingMonitor); return Status.OK_STATUS; } catch (OpenShiftEndpointException e) { @@ -180,14 +202,19 @@ return OpenShiftUIActivator.createErrorStatus( "Could not create application \"{0}\": {1}", e, applicationName, e.getRestResponseMessages()); + } catch (OpenShiftTimeoutException e) { + // TODO: refresh user + return OpenShiftUIActivator. + createCancelStatus("Could not create application {0}. Connection timeouted", applicationName); } catch (OpenShiftException e) { // TODO: refresh user - return OpenShiftUIActivator.createErrorStatus("Could not create application \"{0}\"", - e, applicationName); + return OpenShiftUIActivator.createErrorStatus( + "Could not create application \"{0}\"", e, applicationName); } } - - }, delegatingMonitor, getContainer(), 300); + }; + IStatus status = WizardUtils.runInWizard( + job, job.getDelegatingProgressMonitor(), getContainer(), APP_CREATE_TIMEOUT); return status.isOK(); } catch (Exception e) { return false; Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizardModel.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizardModel.java 2012-05-23 19:55:29 UTC (rev 41313) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizardModel.java 2012-05-23 20:00:28 UTC (rev 41314) @@ -372,7 +372,7 @@ } } - public void createApplication(IProgressMonitor monitor) throws OpenShiftApplicationNotAvailableException, + public IApplication createApplication(IProgressMonitor monitor) throws OpenShiftApplicationNotAvailableException, OpenShiftException { IApplication application = new CreateApplicationOperation(getUser()).execute( @@ -382,6 +382,7 @@ getApplicationGearProfile(), monitor); setApplication(application); + return application; } @Override Modified: trunk/openshift/tests/org.jboss.tools.openshift.express.test/src/org/jboss/tools/openshift/express/test/EmbedCartridgeStrategyTest.java =================================================================== --- trunk/openshift/tests/org.jboss.tools.openshift.express.test/src/org/jboss/tools/openshift/express/test/EmbedCartridgeStrategyTest.java 2012-05-23 19:55:29 UTC (rev 41313) +++ trunk/openshift/tests/org.jboss.tools.openshift.express.test/src/org/jboss/tools/openshift/express/test/EmbedCartridgeStrategyTest.java 2012-05-23 20:00:28 UTC (rev 41314) @@ -15,7 +15,6 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -import java.net.SocketTimeoutException; import java.util.ArrayList; import java.util.Collections; import java.util.Date; @@ -50,13 +49,13 @@ private DomainFake domainFake; @Before - public void setUp() throws SocketTimeoutException, OpenShiftException { + public void setUp() throws OpenShiftException { this.domainFake = new DomainFake(); this.embedStrategy = new EmbedCartridgeStrategy(domainFake); } @Test - public void shouldNotAddMySql() throws SocketTimeoutException, OpenShiftException{ + public void shouldNotAddMySql() throws OpenShiftException{ // given Set<IEmbeddableCartridge> currentCartridges = new HashSet<IEmbeddableCartridge>(); currentCartridges.add(IEmbeddableCartridge.MYSQL_51); @@ -72,7 +71,7 @@ } @Test - public void shouldAddMySql() throws SocketTimeoutException, OpenShiftException{ + public void shouldAddMySql() throws OpenShiftException{ // given Set<IEmbeddableCartridge> currentCartridges = Collections.<IEmbeddableCartridge>emptySet(); @@ -88,7 +87,7 @@ } @Test - public void shouldAddPhpMyAdminAndMySql() throws SocketTimeoutException, OpenShiftException{ + public void shouldAddPhpMyAdminAndMySql() throws OpenShiftException{ // given Set<IEmbeddableCartridge> currentCartridges = Collections.<IEmbeddableCartridge>emptySet(); @@ -105,7 +104,7 @@ } @Test - public void shouldRemovePhpMyAdmin() throws SocketTimeoutException, OpenShiftException{ + public void shouldRemovePhpMyAdmin() throws OpenShiftException{ // given Set<IEmbeddableCartridge> currentCartridges = new HashSet<IEmbeddableCartridge>(); currentCartridges.add(IEmbeddableCartridge.MYSQL_51); @@ -123,7 +122,7 @@ } @Test - public void shouldRemovePhpMyAdminAndMySql() throws SocketTimeoutException, OpenShiftException{ + public void shouldRemovePhpMyAdminAndMySql() throws OpenShiftException{ // given Set<IEmbeddableCartridge> currentCartridges = new HashSet<IEmbeddableCartridge>(); currentCartridges.add(IEmbeddableCartridge.MYSQL_51); @@ -142,7 +141,7 @@ } @Test - public void shouldRemovePostgresAndAddMySql() throws SocketTimeoutException, OpenShiftException{ + public void shouldRemovePostgresAndAddMySql() throws OpenShiftException{ // given Set<IEmbeddableCartridge> currentCartridges = new HashSet<IEmbeddableCartridge>(); currentCartridges.add(IEmbeddableCartridge.POSTGRESQL_84); @@ -160,7 +159,7 @@ } @Test - public void shouldRemovePostgresAndAddPhpMyAdminAndMySql() throws SocketTimeoutException, OpenShiftException{ + public void shouldRemovePostgresAndAddPhpMyAdminAndMySql() throws OpenShiftException{ // given Set<IEmbeddableCartridge> currentCartridges = new HashSet<IEmbeddableCartridge>(); currentCartridges.add(IEmbeddableCartridge.POSTGRESQL_84); @@ -179,7 +178,7 @@ } @Test - public void shouldAddRockmongoAndMongoDb() throws SocketTimeoutException, OpenShiftException{ + public void shouldAddRockmongoAndMongoDb() throws OpenShiftException{ // given Set<IEmbeddableCartridge> currentCartridges = Collections.<IEmbeddableCartridge>emptySet(); @@ -196,7 +195,7 @@ } @Test - public void shouldRemoveRockmongoAnd10genAndMongoDb() throws SocketTimeoutException, OpenShiftException{ + public void shouldRemoveRockmongoAnd10genAndMongoDb() throws OpenShiftException{ // given Set<IEmbeddableCartridge> currentCartridges = new HashSet<IEmbeddableCartridge>(); currentCartridges.add(IEmbeddableCartridge.MONGODB_20); @@ -217,7 +216,7 @@ } @Test - public void shouldNotAddJenkinsApplication() throws SocketTimeoutException, OpenShiftException{ + public void shouldNotAddJenkinsApplication() throws OpenShiftException{ // given Set<IEmbeddableCartridge> currentCartridges = Collections.<IEmbeddableCartridge>emptySet(); domainFake.createApplication("adietish", ICartridge.JENKINS_14); @@ -236,7 +235,7 @@ } @Test - public void shouldAddJenkinsApplication() throws SocketTimeoutException, OpenShiftException{ + public void shouldAddJenkinsApplication() throws OpenShiftException{ // given Set<IEmbeddableCartridge> currentCartridges = Collections.<IEmbeddableCartridge>emptySet(); @@ -316,53 +315,52 @@ @Override public IEmbeddedCartridge addEmbeddableCartridge(IEmbeddableCartridge cartridge) - throws OpenShiftException,SocketTimeoutException { + throws OpenShiftException { throw new UnsupportedOperationException(); } @Override public List<IEmbeddedCartridge> addEmbeddableCartridges(List<IEmbeddableCartridge> cartridge) - throws OpenShiftException, SocketTimeoutException { + throws OpenShiftException { throw new UnsupportedOperationException(); } @Override - public List<IEmbeddedCartridge> getEmbeddedCartridges() throws OpenShiftException, SocketTimeoutException { + public List<IEmbeddedCartridge> getEmbeddedCartridges() throws OpenShiftException { throw new UnsupportedOperationException(); } @Override public boolean hasEmbeddedCartridge(IEmbeddableCartridge cartridge) - throws OpenShiftException,SocketTimeoutException { + throws OpenShiftException { throw new UnsupportedOperationException(); } @Override - public boolean hasEmbeddedCartridge(String cartridgeName) throws OpenShiftException, SocketTimeoutException { + public boolean hasEmbeddedCartridge(String cartridgeName) throws OpenShiftException { throw new UnsupportedOperationException(); } @Override public IEmbeddedCartridge getEmbeddedCartridge(String cartridgeName) - throws OpenShiftException,SocketTimeoutException { + throws OpenShiftException { throw new UnsupportedOperationException(); } @Override public IEmbeddedCartridge getEmbeddedCartridge(IEmbeddableCartridge cartridge) - throws OpenShiftException,SocketTimeoutException { + throws OpenShiftException { throw new UnsupportedOperationException(); } @Override - public void removeEmbeddedCartridge(IEmbeddableCartridge cartridge) throws OpenShiftException, - SocketTimeoutException { + public void removeEmbeddedCartridge(IEmbeddableCartridge cartridge) throws OpenShiftException { // TODO Auto-generated method stub } @Override - public List<IApplicationGear> getGears() throws OpenShiftException, SocketTimeoutException { + public List<IApplicationGear> getGears() throws OpenShiftException { throw new UnsupportedOperationException(); } @@ -372,27 +370,27 @@ } @Override - public void destroy() throws OpenShiftException, SocketTimeoutException { + public void destroy() throws OpenShiftException { throw new UnsupportedOperationException(); } @Override - public void start() throws OpenShiftException, SocketTimeoutException { + public void start() throws OpenShiftException { throw new UnsupportedOperationException(); } @Override - public void restart() throws OpenShiftException, SocketTimeoutException { + public void restart() throws OpenShiftException { throw new UnsupportedOperationException(); } @Override - public void stop() throws OpenShiftException, SocketTimeoutException { + public void stop() throws OpenShiftException { throw new UnsupportedOperationException(); } @Override - public void stop(boolean force) throws OpenShiftException, SocketTimeoutException { + public void stop(boolean force) throws OpenShiftException { throw new UnsupportedOperationException(); } @@ -407,32 +405,32 @@ } @Override - public void exposePort() throws SocketTimeoutException, OpenShiftException { + public void exposePort() throws OpenShiftException { throw new UnsupportedOperationException(); } @Override - public void concealPort() throws SocketTimeoutException, OpenShiftException { + public void concealPort() throws OpenShiftException { throw new UnsupportedOperationException(); } @Override - public void showPort() throws SocketTimeoutException, OpenShiftException { + public void showPort() throws OpenShiftException { throw new UnsupportedOperationException(); } @Override - public void scaleDown() throws SocketTimeoutException, OpenShiftException { + public void scaleDown() throws OpenShiftException { throw new UnsupportedOperationException(); } @Override - public void scaleUp() throws SocketTimeoutException, OpenShiftException { + public void scaleUp() throws OpenShiftException { throw new UnsupportedOperationException(); } @Override - public void addAlias(String string) throws SocketTimeoutException, OpenShiftException { + public void addAlias(String string) throws OpenShiftException { throw new UnsupportedOperationException(); } @@ -447,12 +445,12 @@ } @Override - public void removeAlias(String alias) throws SocketTimeoutException, OpenShiftException { + public void removeAlias(String alias) throws OpenShiftException { throw new UnsupportedOperationException(); } @Override - public void refresh() throws SocketTimeoutException, OpenShiftException { + public void refresh() throws OpenShiftException { throw new UnsupportedOperationException(); } @@ -519,7 +517,7 @@ } @Override - public void refresh() throws OpenShiftException, SocketTimeoutException { + public void refresh() throws OpenShiftException { throw new UnsupportedOperationException(); } @@ -534,22 +532,22 @@ } @Override - public void rename(String id) throws OpenShiftException, SocketTimeoutException { + public void rename(String id) throws OpenShiftException { throw new UnsupportedOperationException(); } @Override - public IUser getUser() throws SocketTimeoutException, OpenShiftException { + public IUser getUser() throws OpenShiftException { throw new UnsupportedOperationException(); } @Override - public void destroy() throws OpenShiftException, SocketTimeoutException { + public void destroy() throws OpenShiftException { throw new UnsupportedOperationException(); } @Override - public void destroy(boolean force) throws OpenShiftException, SocketTimeoutException { + public void destroy(boolean force) throws OpenShiftException { throw new UnsupportedOperationException(); } @@ -560,19 +558,19 @@ @Override public IApplication createApplication(String name, ICartridge cartridge, ApplicationScale scale, - IGearProfile gearProfile) throws OpenShiftException, SocketTimeoutException { + IGearProfile gearProfile) throws OpenShiftException { throw new UnsupportedOperationException(); } @Override public IApplication createApplication(String name, ICartridge cartridge, ApplicationScale scale) - throws OpenShiftException, SocketTimeoutException { + throws OpenShiftException { throw new UnsupportedOperationException(); } @Override public IApplication createApplication(String name, ICartridge cartridge, IGearProfile gearProfile) - throws OpenShiftException, SocketTimeoutException { + throws OpenShiftException { throw new UnsupportedOperationException(); } @@ -584,22 +582,22 @@ } @Override - public List<IApplication> getApplications() throws OpenShiftException, SocketTimeoutException { + public List<IApplication> getApplications() throws OpenShiftException { return applications; } @Override - public List<String> getAvailableCartridgeNames() throws OpenShiftException, SocketTimeoutException { + public List<String> getAvailableCartridgeNames() throws OpenShiftException { throw new UnsupportedOperationException(); } @Override - public IApplication getApplicationByName(String name) throws OpenShiftException, SocketTimeoutException { + public IApplication getApplicationByName(String name) throws OpenShiftException { throw new UnsupportedOperationException(); } @Override - public boolean hasApplicationByName(String name) throws OpenShiftException, SocketTimeoutException { + public boolean hasApplicationByName(String name) throws OpenShiftException { throw new UnsupportedOperationException(); } @@ -621,7 +619,7 @@ } @Override - public List<IGearProfile> getAvailableGearProfiles() throws SocketTimeoutException, OpenShiftException { + public List<IGearProfile> getAvailableGearProfiles() throws OpenShiftException { throw new UnsupportedOperationException(); }

12 years, 7 months

1
0
0 / 0

JBoss Tools SVN: r41313 - trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action.

by jbosstools-commits＠lists.jboss.org

Author: xcoulon Date: 2012-05-23 15:55:29 -0400 (Wed, 23 May 2012) New Revision: 41313 Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/DeleteApplicationAction.java Log: Fixed - JBIDE-11842 NPE when removing Jenkins app Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/DeleteApplicationAction.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/DeleteApplicationAction.java 2012-05-23 19:48:52 UTC (rev 41312) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/DeleteApplicationAction.java 2012-05-23 19:55:29 UTC (rev 41313) @@ -25,8 +25,8 @@ import org.eclipse.swt.widgets.Display; import org.eclipse.ui.ISharedImages; import org.eclipse.ui.PlatformUI; +import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; import org.jboss.tools.openshift.express.internal.ui.messages.OpenShiftExpressUIMessages; -import org.jboss.tools.openshift.express.internal.ui.utils.Logger; import com.openshift.client.IApplication; import com.openshift.client.OpenShiftException; @@ -89,11 +89,9 @@ try { application.destroy(); } catch (OpenShiftException e) { - MessageDialog.openError(Display.getCurrent().getActiveShell(), NLS.bind("Failed to delete application \"{0}\"", appName), e.getMessage()); - Logger.error(NLS.bind("Failed to delete application \"{0}\"", appName), e); + return OpenShiftUIActivator.createErrorStatus(NLS.bind("Failed to delete application \"{0}\"", appName), e); } catch (SocketTimeoutException e) { - MessageDialog.openError(Display.getCurrent().getActiveShell(), NLS.bind("Failed to delete application \"{0}\"", appName), e.getMessage()); - Logger.error(NLS.bind("Failed to delete application \"{0}\"", appName), e); + return OpenShiftUIActivator.createErrorStatus(NLS.bind("Failed to delete application \"{0}\"", appName), e); } } } finally {

12 years, 7 months

1
0
0 / 0

JBoss Tools SVN: r41312 - in trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples: model and 2 other directories.

by jbosstools-commits＠lists.jboss.org

Author: snjeza Date: 2012-05-23 15:48:52 -0400 (Wed, 23 May 2012) New Revision: 41312 Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/Messages.java trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/ProjectExamplesActivator.java trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/messages.properties trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/ProjectExampleUtil.java trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/preferences/ProjectExamplesPreferencePage.java trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/preferences/ProjectExamplesPreferencesInitializer.java trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/preferences/Sites.java trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesMainPage.java Log: JBIDE-11727 - explore providing an .project_example.xml file in root of quickstarts distributions for easy loading/detection in jboss tools Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/Messages.java =================================================================== --- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/Messages.java 2012-05-23 19:40:13 UTC (rev 41311) +++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/Messages.java 2012-05-23 19:48:52 UTC (rev 41312) @@ -69,7 +69,7 @@ public static String ProjectExamplesPreferencePage_Output_directory; public static String ProjectExamplesPreferencePage_Remove; public static String ProjectExamplesPreferencePage_Show_experimental_sites; - public static String ProjectExamplesPreferencePage_Show_server_sites; + public static String ProjectExamplesPreferencePage_Show_runtime_sites; public static String ProjectExamplesPreferencePage_Show_invalid_sites; public static String ProjectExamplesPreferencePage_Sites; public static String ProjectExamplesPreferencePage_Use_default_workspace_location; @@ -96,7 +96,7 @@ public static String SiteDialog_URL; public static String Sites_Plugin_provided_sites; public static String Sites_User_sites; - public static String Sites_Server_sites; + public static String Sites_Runtime_sites; public static String InvalideSite; public static String WTPRuntimeFix_Invalid_WTP_runtime_fix; static { Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/ProjectExamplesActivator.java =================================================================== --- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/ProjectExamplesActivator.java 2012-05-23 19:40:13 UTC (rev 41311) +++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/ProjectExamplesActivator.java 2012-05-23 19:48:52 UTC (rev 41312) @@ -163,10 +163,10 @@ public static final String ALL_RUNTIMES = Messages.ProjectExamplesActivator_All; public static final String SHOW_EXPERIMENTAL_SITES = "showExperimentalSites"; //$NON-NLS-1$ - public static final String SHOW_SERVER_SITES = "showServerSites"; //$NON-NLS-1$ + public static final String SHOW_RUNTIME_SITES = "showRuntimeSites"; //$NON-NLS-1$ public static final String USER_SITES = "userSites"; //$NON-NLS-1$ public static final boolean SHOW_EXPERIMENTAL_SITES_VALUE = false; - public static final boolean SHOW_SERVER_SITES_VALUE = false; + public static final boolean SHOW_RUNTIME_SITES_VALUE = false; public static final String SHOW_INVALID_SITES = "invalidSites"; //$NON-NLS-1$ public static final boolean SHOW_INVALID_SITES_VALUE = true; public static final String MAVEN_ARCHETYPE = "mavenArchetype"; //$NON-NLS-1$ Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/messages.properties =================================================================== --- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/messages.properties 2012-05-23 19:40:13 UTC (rev 41311) +++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/messages.properties 2012-05-23 19:48:52 UTC (rev 41312) @@ -56,7 +56,7 @@ ProjectExamplesPreferencePage_Output_directory=Output directory ProjectExamplesPreferencePage_Remove=Remove ProjectExamplesPreferencePage_Show_experimental_sites=Show experimental sites -ProjectExamplesPreferencePage_Show_server_sites=Show server sites +ProjectExamplesPreferencePage_Show_runtime_sites=Show runtime sites ProjectExamplesPreferencePage_Show_invalid_sites=Show invalid sites ProjectExamplesPreferencePage_Sites=Sites ProjectExamplesPreferencePage_Use_default_workspace_location=Use default location @@ -84,6 +84,6 @@ SiteDialog_URL=URL: Sites_Plugin_provided_sites=Plugin provided sites Sites_User_sites=User sites -Sites_Server_sites=Server sites +Sites_Runtime_sites=Runtime sites WTPRuntimeFix_Invalid_WTP_runtime_fix=Invalid WTP runtime fix in {0}. InvalideSite=Invalid site: {0},url={1} Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/ProjectExampleUtil.java =================================================================== --- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/ProjectExampleUtil.java 2012-05-23 19:40:13 UTC (rev 41311) +++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/ProjectExampleUtil.java 2012-05-23 19:48:52 UTC (rev 41312) @@ -145,11 +145,11 @@ return pluginSites; } - public static Set<IProjectExampleSite> getServerSites() { + public static Set<IProjectExampleSite> getRuntimeSites() { Set<IProjectExampleSite> sites = new HashSet<IProjectExampleSite>(); IPreferenceStore store = ProjectExamplesActivator.getDefault() .getPreferenceStore(); - if (!store.getBoolean(ProjectExamplesActivator.SHOW_SERVER_SITES)) { + if (!store.getBoolean(ProjectExamplesActivator.SHOW_RUNTIME_SITES)) { return sites; } IServer[] servers = ServerCore.getServers(); @@ -261,7 +261,7 @@ Set<IProjectExampleSite> sites = new HashSet<IProjectExampleSite>(); sites.addAll(getPluginSites()); sites.addAll(getUserSites()); - sites.addAll(getServerSites()); + sites.addAll(getRuntimeSites()); return sites; } Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/preferences/ProjectExamplesPreferencePage.java =================================================================== --- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/preferences/ProjectExamplesPreferencePage.java 2012-05-23 19:40:13 UTC (rev 41311) +++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/preferences/ProjectExamplesPreferencePage.java 2012-05-23 19:48:52 UTC (rev 41312) @@ -56,7 +56,7 @@ public static final String ID = "org.jboss.tools.project.examples.preferences.projectExamplesPreferencePage"; //$NON-NLS-1$ private Button showExperimentalSites; - private Button showServerSites; + private Button showRuntimeSites; private Sites sites; private TreeViewer viewer; private ProjectExampleSite selectedSite; @@ -146,9 +146,9 @@ showExperimentalSites.setText(Messages.ProjectExamplesPreferencePage_Show_experimental_sites); showExperimentalSites.setSelection(store.getBoolean(ProjectExamplesActivator.SHOW_EXPERIMENTAL_SITES)); - showServerSites = new Button(composite,SWT.CHECK); - showServerSites.setText(Messages.ProjectExamplesPreferencePage_Show_server_sites); - showServerSites.setSelection(store.getBoolean(ProjectExamplesActivator.SHOW_SERVER_SITES)); + showRuntimeSites = new Button(composite,SWT.CHECK); + showRuntimeSites.setText(Messages.ProjectExamplesPreferencePage_Show_runtime_sites); + showRuntimeSites.setSelection(store.getBoolean(ProjectExamplesActivator.SHOW_RUNTIME_SITES)); showInvalidSites = new Button(composite,SWT.CHECK); showInvalidSites.setText(Messages.ProjectExamplesPreferencePage_Show_invalid_sites); @@ -286,12 +286,12 @@ showQuickFix.setSelection(ProjectExamplesActivator.SHOW_QUICK_FIX_VALUE); showExperimentalSites.setSelection(ProjectExamplesActivator.SHOW_EXPERIMENTAL_SITES_VALUE); - showServerSites.setSelection(ProjectExamplesActivator.SHOW_SERVER_SITES_VALUE); + showRuntimeSites.setSelection(ProjectExamplesActivator.SHOW_RUNTIME_SITES_VALUE); showInvalidSites.setSelection(ProjectExamplesActivator.SHOW_INVALID_SITES_VALUE); isWorkspace.setSelection(ProjectExamplesActivator.PROJECT_EXAMPLES_DEFAULT_VALUE); outputDirectoryText.setText(""); //$NON-NLS-1$ sites.getUserSites().clear(); - sites.getServerSites().clear(); + sites.getRuntimeSites().clear(); storePreferences(); super.performDefaults(); } @@ -309,7 +309,7 @@ store.setValue(ProjectExamplesActivator.SHOW_QUICK_FIX, showQuickFix.getSelection()); store.setValue(ProjectExamplesActivator.SHOW_EXPERIMENTAL_SITES, showExperimentalSites.getSelection()); - store.setValue(ProjectExamplesActivator.SHOW_SERVER_SITES, showServerSites.getSelection()); + store.setValue(ProjectExamplesActivator.SHOW_RUNTIME_SITES, showRuntimeSites.getSelection()); store.setValue(ProjectExamplesActivator.SHOW_INVALID_SITES, showInvalidSites.getSelection()); store.setValue(ProjectExamplesActivator.PROJECT_EXAMPLES_DEFAULT, isWorkspace.getSelection()); Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/preferences/ProjectExamplesPreferencesInitializer.java =================================================================== --- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/preferences/ProjectExamplesPreferencesInitializer.java 2012-05-23 19:40:13 UTC (rev 41311) +++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/preferences/ProjectExamplesPreferencesInitializer.java 2012-05-23 19:48:52 UTC (rev 41312) @@ -49,8 +49,8 @@ ProjectExamplesActivator.SHOW_QUICK_FIX_VALUE); node.putBoolean( - ProjectExamplesActivator.SHOW_SERVER_SITES, - ProjectExamplesActivator.SHOW_SERVER_SITES_VALUE); + ProjectExamplesActivator.SHOW_RUNTIME_SITES, + ProjectExamplesActivator.SHOW_RUNTIME_SITES_VALUE); } } Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/preferences/Sites.java =================================================================== --- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/preferences/Sites.java 2012-05-23 19:40:13 UTC (rev 41311) +++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/preferences/Sites.java 2012-05-23 19:48:52 UTC (rev 41312) @@ -27,7 +27,7 @@ public class Sites { private SiteCategory[] siteCategories; private SiteCategory userSite; - private SiteCategory serverSite; + private SiteCategory runtimeSite; private Set<IProjectExampleSite> sites; public SiteCategory[] getSiteCategories() { @@ -44,15 +44,15 @@ pluginSite.setSites(pluginSites); siteCategories[1]=pluginSite; - serverSite = new SiteCategory(Messages.Sites_Server_sites); - Set<IProjectExampleSite> serverSites = ProjectExampleUtil.getServerSites(); - serverSite.setSites(serverSites); - siteCategories[2]= serverSite; + runtimeSite = new SiteCategory(Messages.Sites_Runtime_sites); + Set<IProjectExampleSite> runtimeSites = ProjectExampleUtil.getRuntimeSites(); + runtimeSite.setSites(runtimeSites); + siteCategories[2]= runtimeSite; sites = new HashSet<IProjectExampleSite>(); sites.addAll(pluginSites); sites.addAll(userSites); - sites.addAll(serverSites); + sites.addAll(runtimeSites); } return siteCategories; } @@ -75,7 +75,7 @@ return userSite.getSites(); } - public Set<IProjectExampleSite> getServerSites() { - return serverSite.getSites(); + public Set<IProjectExampleSite> getRuntimeSites() { + return runtimeSite.getSites(); } } \ No newline at end of file Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesMainPage.java =================================================================== --- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesMainPage.java 2012-05-23 19:40:13 UTC (rev 41311) +++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesMainPage.java 2012-05-23 19:48:52 UTC (rev 41312) @@ -113,8 +113,8 @@ gd = new GridData(SWT.FILL, SWT.BEGINNING, false, false); gd.horizontalSpan = 2; serverButton.setLayoutData(gd); - serverButton.setText(Messages.ProjectExamplesPreferencePage_Show_server_sites); - serverButton.setSelection(store.getBoolean(ProjectExamplesActivator.SHOW_SERVER_SITES)); + serverButton.setText(Messages.ProjectExamplesPreferencePage_Show_runtime_sites); + serverButton.setSelection(store.getBoolean(ProjectExamplesActivator.SHOW_RUNTIME_SITES)); new Label(siteComposite,SWT.NONE).setText(Messages.NewProjectExamplesWizardPage_Site); siteCombo = new Combo(siteComposite,SWT.READ_ONLY); @@ -266,7 +266,7 @@ @Override public void widgetSelected(SelectionEvent e) { IPreferenceStore store = ProjectExamplesActivator.getDefault().getPreferenceStore(); - store.setValue(ProjectExamplesActivator.SHOW_SERVER_SITES, serverButton.getSelection()); + store.setValue(ProjectExamplesActivator.SHOW_RUNTIME_SITES, serverButton.getSelection()); //Store current combo selections String selectedRuntime = targetRuntimeTypesCombo.getText();

12 years, 7 months

1
0
0 / 0

JBoss Tools SVN: r41311 - trunk/download.jboss.org/jbosstools/updates/requirements/subclipse.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2012-05-23 15:40:13 -0400 (Wed, 23 May 2012) New Revision: 41311 Modified: trunk/download.jboss.org/jbosstools/updates/requirements/subclipse/.gitig... Log: .gitignore file Modified: trunk/download.jboss.org/jbosstools/updates/requirements/subclipse/.gitig... =================================================================== --- trunk/download.jboss.org/jbosstools/updates/requirements/subclipse/.gitig... 2012-05-23 19:38:13 UTC (rev 41310) +++ trunk/download.jboss.org/jbosstools/updates/requirements/subclipse/.gitig... 2012-05-23 19:40:13 UTC (rev 41311) @@ -1 +1 @@ -1.8_1.7/ +1.8.9_1.7.4.v1/

12 years, 7 months

1
0
0 / 0

JBoss Tools SVN: r41310 - trunk/download.jboss.org/jbosstools/updates/requirements/subclipse.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2012-05-23 15:38:13 -0400 (Wed, 23 May 2012) New Revision: 41310 Added: trunk/download.jboss.org/jbosstools/updates/requirements/subclipse/.gitig... trunk/download.jboss.org/jbosstools/updates/requirements/subclipse/build_... trunk/download.jboss.org/jbosstools/updates/requirements/subclipse/build_... Modified: trunk/download.jboss.org/jbosstools/updates/requirements/subclipse/build.xml Log: new subclipse 1.8 / svnkit 1.7 builder for subversive 1.7 servers (JBDS-1998) Added: trunk/download.jboss.org/jbosstools/updates/requirements/subclipse/.gitig... =================================================================== --- trunk/download.jboss.org/jbosstools/updates/requirements/subclipse/.gitig... (rev 0) +++ trunk/download.jboss.org/jbosstools/updates/requirements/subclipse/.gitig... 2012-05-23 19:38:13 UTC (rev 41310) @@ -0,0 +1 @@ +1.8_1.7/ Modified: trunk/download.jboss.org/jbosstools/updates/requirements/subclipse/build.xml =================================================================== --- trunk/download.jboss.org/jbosstools/updates/requirements/subclipse/build.xml 2012-05-23 19:10:16 UTC (rev 41309) +++ trunk/download.jboss.org/jbosstools/updates/requirements/subclipse/build.xml 2012-05-23 19:38:13 UTC (rev 41310) @@ -16,14 +16,14 @@ -f ~/RHDS/updates/requirements/subclipse/build.xml -Ddestination=/tmp/subclipse-repo --> <target name="mirror"> - <property name="URL1" value="http://subclipse.tigris.org/update_1.6.x" /> - <property name="URL2" value="http://eclipse.svnkit.com/1.3.x/" /> + <property name="URL1" value="http://subclipse.tigris.org/update_1.8.x" /> + <property name="URL2" value="http://eclipse.svnkit.com/1.7.x/" /> <property name="destination" value="/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/subclipse/" /> <property name="compress" value="true" /> <p2.mirror> - <repository location="file:${destination}/1.6_1.3/" name="Subclipse 1.6 + SVNKit 1.3 plugins for Eclipse 3.6 - 3.7" /> + <repository location="file:${destination}/1.8_1.7/" name="Subclipse 1.8 + SVNKit 1.7 plugins for Subversion 1.7 and Eclipse 3.7" /> <source> <repository location="${URL1}" /> <repository location="${URL2}" /> @@ -32,6 +32,6 @@ <slicingOptions includeFeatures="true" followStrict="true" /> </p2.mirror> - <p2.publish.featuresAndBundles metadataRepository="file:${destination}/1.6_1.3/" artifactRepository="file:${destination}/1.6_1.3/" publishartifacts="true" source="${destination}/1.6_1.3/" compress="${compress}" /> + <p2.publish.featuresAndBundles metadataRepository="file:${destination}/1.8_1.7/" artifactRepository="file:${destination}/1.8_1.7/" publishartifacts="true" source="${destination}/1.8_1.7/" compress="${compress}" /> </target> </project> Copied: trunk/download.jboss.org/jbosstools/updates/requirements/subclipse/build_... (from rev 41309, trunk/download.jboss.org/jbosstools/updates/requirements/subclipse/build.xml) =================================================================== --- trunk/download.jboss.org/jbosstools/updates/requirements/subclipse/build_... (rev 0) +++ trunk/download.jboss.org/jbosstools/updates/requirements/subclipse/build_... 2012-05-23 19:38:13 UTC (rev 41310) @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project default="mirror"> +  + <target name="mirror"> + <property name="URL1" value="http://subclipse.tigris.org/update_1.6.x" /> + <property name="URL2" value="http://eclipse.svnkit.com/1.3.x/" /> + + <property name="destination" value="/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/subclipse/" /> + <property name="compress" value="true" /> + + <p2.mirror> + <repository location="file:${destination}/1.6_1.3/" name="Subclipse 1.6 + SVNKit 1.3 plugins for Eclipse 3.6 - 3.7" /> + <source> + <repository location="${URL1}" /> + <repository location="${URL2}" /> + </source> + + <slicingOptions includeFeatures="true" followStrict="true" /> + </p2.mirror> + + <p2.publish.featuresAndBundles metadataRepository="file:${destination}/1.6_1.3/" artifactRepository="file:${destination}/1.6_1.3/" publishartifacts="true" source="${destination}/1.6_1.3/" compress="${compress}" /> + </target> +</project> Copied: trunk/download.jboss.org/jbosstools/updates/requirements/subclipse/build_... (from rev 41309, trunk/download.jboss.org/jbosstools/updates/requirements/subclipse/build.xml) =================================================================== --- trunk/download.jboss.org/jbosstools/updates/requirements/subclipse/build_... (rev 0) +++ trunk/download.jboss.org/jbosstools/updates/requirements/subclipse/build_... 2012-05-23 19:38:13 UTC (rev 41310) @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project default="mirror"> +  + <target name="mirror"> + <property name="URL1" value="http://subclipse.tigris.org/update_1.8.x" /> + <property name="URL2" value="http://eclipse.svnkit.com/1.7.x/" /> + + <property name="destination" value="/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/subclipse/" /> + <property name="compress" value="true" /> + + <p2.mirror> + <repository location="file:${destination}/1.8_1.7/" name="Subclipse 1.8 + SVNKit 1.7 plugins for Subversion 1.7 and Eclipse 3.7" /> + <source> + <repository location="${URL1}" /> + <repository location="${URL2}" /> + </source> + + <slicingOptions includeFeatures="true" followStrict="true" /> + </p2.mirror> + + <p2.publish.featuresAndBundles metadataRepository="file:${destination}/1.8_1.7/" artifactRepository="file:${destination}/1.8_1.7/" publishartifacts="true" source="${destination}/1.8_1.7/" compress="${compress}" /> + </target> +</project>

12 years, 7 months

1
0
0 / 0

JBoss Tools SVN: r41309 - trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard.

by jbosstools-commits＠lists.jboss.org

Author: xcoulon Date: 2012-05-23 15:10:16 -0400 (Wed, 23 May 2012) New Revision: 41309 Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java Log: Fixing IndexOoutOfBoundException Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java 2012-05-23 17:55:33 UTC (rev 41308) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java 2012-05-23 19:10:16 UTC (rev 41309) @@ -541,7 +541,7 @@ int index = ((Integer) fromObject).intValue(); List<ICartridge> cartridges = pageModel.getCartridges(); - if (index >= cartridges.size()) { + if (index < 0 || index > cartridges.size()) { return null; } return cartridges.get(index);

12 years, 7 months

1
0
0 / 0

JBoss Tools SVN: r41308 - in trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples: dialog and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: snjeza Date: 2012-05-23 13:55:33 -0400 (Wed, 23 May 2012) New Revision: 41308 Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/ProjectExamplesActivator.java trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/dialog/MarkerDialog.java Log: JBIDE-11929 - Project examples freezes during quickfix dialog Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/ProjectExamplesActivator.java =================================================================== --- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/ProjectExamplesActivator.java 2012-05-23 16:35:03 UTC (rev 41307) +++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/ProjectExamplesActivator.java 2012-05-23 17:55:33 UTC (rev 41308) @@ -45,6 +45,7 @@ import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.IWorkspaceRoot; +import org.eclipse.core.resources.IncrementalProjectBuilder; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IConfigurationElement; @@ -215,6 +216,11 @@ @Override protected IStatus run(IProgressMonitor monitor) { try { + try { + ResourcesPlugin.getWorkspace().build(IncrementalProjectBuilder.INCREMENTAL_BUILD, monitor); + } catch (CoreException e) { + log(e); + } Job.getJobManager().join(PROJECT_EXAMPLES_FAMILY, monitor); Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, monitor); Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/dialog/MarkerDialog.java =================================================================== --- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/dialog/MarkerDialog.java 2012-05-23 16:35:03 UTC (rev 41307) +++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/dialog/MarkerDialog.java 2012-05-23 17:55:33 UTC (rev 41308) @@ -19,13 +19,9 @@ import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.resources.IMarker; -import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResourceChangeEvent; import org.eclipse.core.resources.IResourceChangeListener; -import org.eclipse.core.resources.IncrementalProjectBuilder; import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.core.resources.WorkspaceJob; -import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; @@ -223,41 +219,6 @@ try { quickFixButton.setSelection(false); openQuickFixWizard(selected); - WorkspaceJob job = new WorkspaceJob("Building workspace") { - - @Override - public IStatus runInWorkspace(IProgressMonitor monitor) - throws CoreException { - for (ProjectExample project : projects) { - if (project.getIncludedProjects() == null) { - buildProject(project.getName(), monitor); - } else { - List<String> includedProjects = project.getIncludedProjects(); - for (String projectName:includedProjects) { - buildProject(projectName, monitor); - if (monitor.isCanceled()) { - return Status.CANCEL_STATUS; - } - } - } - } - if (monitor.isCanceled()) { - return Status.CANCEL_STATUS; - } - ProjectExamplesActivator.waitForBuildAndValidation.schedule(); - try { - ProjectExamplesActivator.waitForBuildAndValidation.join(); - } catch (InterruptedException e) { - return Status.CANCEL_STATUS; - } - if (monitor.isCanceled()) { - return Status.CANCEL_STATUS; - } - return Status.OK_STATUS; - } - }; - job.setUser(true); - job.schedule(); } catch (Exception e) { ProjectExamplesActivator.log(e); } finally { @@ -266,14 +227,7 @@ } } } - - private void buildProject(String projectName, IProgressMonitor monitor) throws CoreException { - IProject eclipseProject = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName); - if (eclipseProject != null && eclipseProject.isOpen()) { - eclipseProject.build(IncrementalProjectBuilder.FULL_BUILD, monitor); - } - } - + private void refreshTableViewer() { tableViewer.setInput(projects); ISelection source = tableViewer.getSelection();

12 years, 7 months

1
0
0 / 0

JBoss Tools SVN: r41307 - trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests.

by jbosstools-commits＠lists.jboss.org

Author: ldimaggio Date: 2012-05-23 12:35:03 -0400 (Wed, 23 May 2012) New Revision: 41307 Modified: trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/ESBAllBotTests.java Log: Added new tests for webservice providers - to avoid server logging issue - https://issues.jboss.org/browse/JBQA-6321 Modified: trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/ESBAllBotTests.java =================================================================== --- trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/ESBAllBotTests.java 2012-05-23 15:54:14 UTC (rev 41306) +++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/ESBAllBotTests.java 2012-05-23 16:35:03 UTC (rev 41307) @@ -20,6 +20,8 @@ import org.jboss.tools.esb.ui.bot.tests.examples.SimpleEAPTest; import org.jboss.tools.esb.ui.bot.tests.examples.WebServiceConsumer1; import org.jboss.tools.esb.ui.bot.tests.examples.WebServiceProducer; +import org.jboss.tools.esb.ui.bot.tests.examples.WebServiceProducerHttp; +import org.jboss.tools.esb.ui.bot.tests.examples.WebServiceProducerSocket; import org.jboss.tools.ui.bot.ext.RequirementAwareSuite; import org.junit.runner.RunWith; import org.junit.runners.Suite.SuiteClasses; @@ -38,7 +40,9 @@ SmooksXML2XMLDateManipulation.class, SmooksXML2XMLSimple.class, WebServiceConsumer1.class, - WebServiceProducer.class + WebServiceProducer.class, + WebServiceProducerHttp.class, + WebServiceProducerSocket.class //SimpleEAPTest.class }) @RunWith(RequirementAwareSuite.class)

12 years, 7 months

1
0
0 / 0

JBoss Tools SVN: r41306 - in trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test: src/org/jboss/tools/runtime/as/ui/bot/test and 2 other directories.

by jbosstools-commits＠lists.jboss.org

Author: ljelinko Date: 2012-05-23 11:54:14 -0400 (Wed, 23 May 2012) New Revision: 41306 Modified: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/META-INF/MANIFEST.MF trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/AllTestsSuite.java trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/detector/RuntimeDuplications.java trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/dialog/preferences/SearchingForRuntimesDialog.java Log: Removed dependency on FileUtils from apache. Modified: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/META-INF/MANIFEST.MF =================================================================== --- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/META-INF/MANIFEST.MF 2012-05-23 15:42:42 UTC (rev 41305) +++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/META-INF/MANIFEST.MF 2012-05-23 15:54:14 UTC (rev 41306) @@ -17,6 +17,6 @@ org.jboss.tools.ui.bot.ext;bundle-version="1.0.0", org.hamcrest;bundle-version="1.1.0", org.jboss.tools.runtime.core, - org.jboss.tools.runtime.ui;bundle-version="1.3.0", - org.apache.commons.io;bundle-version="2.0.1" + org.jboss.tools.runtime.ui;bundle-version="1.3.0" +Import-Package: org.jboss.tools.common.util Modified: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/AllTestsSuite.java =================================================================== --- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/AllTestsSuite.java 2012-05-23 15:42:42 UTC (rev 41305) +++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/AllTestsSuite.java 2012-05-23 15:54:14 UTC (rev 41306) @@ -2,34 +2,6 @@ import org.jboss.tools.runtime.as.ui.bot.test.detector.RuntimeDuplications; import org.jboss.tools.runtime.as.ui.bot.test.detector.ServerWithSeam; -import org.jboss.tools.runtime.as.ui.bot.test.detector.seam.seam22.CheckSeam22; -import org.jboss.tools.runtime.as.ui.bot.test.detector.seam.seam22.DetectSeam22; -import org.jboss.tools.runtime.as.ui.bot.test.detector.seam.seam23.CheckSeam23; -import org.jboss.tools.runtime.as.ui.bot.test.detector.seam.seam23.DetectSeam23; -import org.jboss.tools.runtime.as.ui.bot.test.detector.server.eap4.CheckEAP4Seam; -import org.jboss.tools.runtime.as.ui.bot.test.detector.server.eap4.DetectEAP4; -import org.jboss.tools.runtime.as.ui.bot.test.detector.server.eap4.OperateEAP4; -import org.jboss.tools.runtime.as.ui.bot.test.detector.server.eap5.CheckEAP5Seam; -import org.jboss.tools.runtime.as.ui.bot.test.detector.server.eap5.DetectEAP5; -import org.jboss.tools.runtime.as.ui.bot.test.detector.server.eap5.OperateEAP5; -import org.jboss.tools.runtime.as.ui.bot.test.detector.server.eap6.DetectEAP6; -import org.jboss.tools.runtime.as.ui.bot.test.detector.server.eap6.OperateEAP6; -import org.jboss.tools.runtime.as.ui.bot.test.detector.server.epp4.CheckEPP4Seam; -import org.jboss.tools.runtime.as.ui.bot.test.detector.server.epp4.DetectEPP4; -import org.jboss.tools.runtime.as.ui.bot.test.detector.server.epp4.OperateEPP4; -import org.jboss.tools.runtime.as.ui.bot.test.detector.server.epp5.CheckEPP5Seam; -import org.jboss.tools.runtime.as.ui.bot.test.detector.server.epp5.DetectEPP5; -import org.jboss.tools.runtime.as.ui.bot.test.detector.server.epp5.OperateEPP5; -import org.jboss.tools.runtime.as.ui.bot.test.detector.server.ewp5.CheckEWP5Seam; -import org.jboss.tools.runtime.as.ui.bot.test.detector.server.ewp5.DetectEWP5; -import org.jboss.tools.runtime.as.ui.bot.test.detector.server.ewp5.OperateEWP5; -import org.jboss.tools.runtime.as.ui.bot.test.detector.server.jboss7.DetectJBoss7; -import org.jboss.tools.runtime.as.ui.bot.test.detector.server.jboss7.OperateJBoss7; -import org.jboss.tools.runtime.as.ui.bot.test.detector.server.soap5.CheckSOAP5Seam; -import org.jboss.tools.runtime.as.ui.bot.test.detector.server.soap5.DetectSOAP5; -import org.jboss.tools.runtime.as.ui.bot.test.detector.server.soap5.OperateSOAP5; -import org.jboss.tools.runtime.as.ui.bot.test.detector.server.soap5.standalone.DetectSOAPStandalone5; -import org.jboss.tools.runtime.as.ui.bot.test.detector.server.soap5.standalone.OperateSOAPStandalone5; import org.jboss.tools.ui.bot.ext.RequirementAwareSuite; import org.junit.runner.RunWith; import org.junit.runners.Suite; @@ -37,35 +9,35 @@ @RunWith(RequirementAwareSuite.class) @Suite.SuiteClasses({ RuntimeDuplications.class, - ServerWithSeam.class, - DetectJBoss7.class, - OperateJBoss7.class, - DetectEAP6.class, - OperateEAP6.class, - DetectEAP5.class, - CheckEAP5Seam.class, - OperateEAP5.class, - DetectEAP4.class, - CheckEAP4Seam.class, - OperateEAP4.class, - DetectEPP4.class, - CheckEPP4Seam.class, - OperateEPP4.class, - DetectEPP5.class, - CheckEPP5Seam.class, - OperateEPP5.class, - DetectEWP5.class, - CheckEWP5Seam.class, - OperateEWP5.class, - DetectSOAP5.class, - CheckSOAP5Seam.class, - OperateSOAP5.class, - DetectSOAPStandalone5.class, - OperateSOAPStandalone5.class, - DetectSeam22.class, - CheckSeam22.class, - DetectSeam23.class, - CheckSeam23.class + ServerWithSeam.class +// DetectJBoss7.class, +// OperateJBoss7.class, +// DetectEAP6.class, +// OperateEAP6.class, +// DetectEAP5.class, +// CheckEAP5Seam.class, +// OperateEAP5.class, +// DetectEAP4.class, +// CheckEAP4Seam.class, +// OperateEAP4.class, +// DetectEPP4.class, +// CheckEPP4Seam.class, +// OperateEPP4.class, +// DetectEPP5.class, +// CheckEPP5Seam.class, +// OperateEPP5.class, +// DetectEWP5.class, +// CheckEWP5Seam.class, +// OperateEWP5.class, +// DetectSOAP5.class, +// CheckSOAP5Seam.class, +// OperateSOAP5.class, +// DetectSOAPStandalone5.class, +// OperateSOAPStandalone5.class, +// DetectSeam22.class, +// CheckSeam22.class, +// DetectSeam23.class, +// CheckSeam23.class }) public class AllTestsSuite { Modified: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/detector/RuntimeDuplications.java =================================================================== --- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/detector/RuntimeDuplications.java 2012-05-23 15:42:42 UTC (rev 41305) +++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/detector/RuntimeDuplications.java 2012-05-23 15:54:14 UTC (rev 41306) @@ -7,7 +7,7 @@ import java.io.IOException; import java.util.List; -import org.apache.commons.io.FileUtils; +import org.jboss.tools.common.util.FileUtil; import org.jboss.tools.runtime.as.ui.bot.test.RuntimeProperties; import org.jboss.tools.runtime.as.ui.bot.test.detector.server.eap5.DetectEAP5; import org.jboss.tools.runtime.as.ui.bot.test.dialog.preferences.SearchingForRuntimesDialog; @@ -35,31 +35,37 @@ @Before public void prepareServers() throws IOException{ - File tmpDir = FileUtils.getTempDirectory(); + File tmpDir = new File(System.getProperty("java.io.tmpdir")); tmpServerPath = new File(tmpDir, "tmpServerCopy_" + System.currentTimeMillis()); - tmpServerAPath = new File(tmpServerPath, "serverA"); - tmpServerBPath = new File(tmpServerPath, "serverB"); + tmpServerAPath = new File(tmpServerPath, "serverA/jboss-eap-5.1"); + tmpServerBPath = new File(tmpServerPath, "serverB/jboss-eap-5.1"); File server = new File(RuntimeProperties.getInstance().getRuntimePath(DetectEAP5.SERVER_ID)); - FileUtils.copyDirectoryToDirectory(server, tmpServerAPath); - FileUtils.copyDirectoryToDirectory(server, tmpServerBPath); + FileUtil.copyDir(server, tmpServerAPath, true, true, true); + FileUtil.copyDir(server, tmpServerBPath, true, true, true); } @Test public void duplicateRuntimes(){ searchingForRuntimesDialog = addPath(tmpServerPath.getAbsolutePath()); + assertFoundRuntimesNumber(4); - assertFoundRuntimesNumber(4); + searchingForRuntimesDialog = searchFirstPath(); + searchingForRuntimesDialog.ok(); assertSeamRuntimesNumber(2); assertServerRuntimesNumber(2); - searchFirstPath(); + searchingForRuntimesDialog = searchFirstPath(); + assertFoundRuntimesNumber(4); + + searchingForRuntimesDialog = searchFirstPath(); + searchingForRuntimesDialog.hideAlreadyCreatedRuntimes(); assertFoundRuntimesNumber(0); } @After public void deleteServers() throws IOException{ - FileUtils.deleteDirectory(tmpServerPath); + FileUtil.remove(tmpServerPath); removeAllPaths(); removeAllSeamRuntimes(); @@ -68,8 +74,7 @@ private void assertFoundRuntimesNumber(int expected) { List<Runtime> runtimes = searchingForRuntimesDialog.getRuntimes(); + searchingForRuntimesDialog.cancel(); assertThat(runtimes.size(), is(expected)); - searchingForRuntimesDialog.ok(); - runtimeDetectionPreferences.ok(); } } Modified: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/dialog/preferences/SearchingForRuntimesDialog.java =================================================================== --- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/dialog/preferences/SearchingForRuntimesDialog.java 2012-05-23 15:42:42 UTC (rev 41305) +++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/dialog/preferences/SearchingForRuntimesDialog.java 2012-05-23 15:54:14 UTC (rev 41306) @@ -29,6 +29,14 @@ SWTBotFactory.getBot().button("OK").click(); } + public void cancel(){ + SWTBotFactory.getBot().button("Cancel").click(); + } + + public void hideAlreadyCreatedRuntimes() { + SWTBotFactory.getBot().checkBox("Hide already created runtimes").select(); + } + public void deselect(String runtimeName){ for (SWTBotTreeItem treeItem : getRuntimesTreeItems()) { if (treeItem.cell(0).equals(runtimeName)){

12 years, 7 months

1
0
0 / 0

JBoss Tools SVN: r41305 - trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples.

by jbosstools-commits＠lists.jboss.org

Author: ldimaggio Date: 2012-05-23 11:42:42 -0400 (Wed, 23 May 2012) New Revision: 41305 Modified: trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/WebServiceProducer.java trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/WebServiceProducerHttp.java trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/WebServiceProducerSocket.java Log: Moved the WebServiceProducer* tests to new test classes to avoid the server logging issue - https://issues.jboss.org/browse/JBQA-6321 */ Modified: trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/WebServiceProducer.java =================================================================== --- trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/WebServiceProducer.java 2012-05-23 15:28:32 UTC (rev 41304) +++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/WebServiceProducer.java 2012-05-23 15:42:42 UTC (rev 41305) @@ -23,6 +23,8 @@ assertNotNull("Calling Send message failed, nothing appended to server log",text); assertTrue("Calling Send message failed, unexpected server output :"+text,text.contains("Ah Goodbye then!!!!")); + /* Moved these tests to new test classes to avoid the server logging issue - https://issues.jboss.org/browse/JBQA-6321 */ + // text = executeClientGetServerOutput("org.jboss.soa.esb.samples.quickstart.webserviceproducer.test.SendMessage","http 8765"); // assertNotNull("Calling Send message failed, nothing appended (http) to server log",text); // assertTrue("Calling Send message failed, unexpected server output :"+text,text.contains("Ah Goodbye then!!!!")); Modified: trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/WebServiceProducerHttp.java =================================================================== --- trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/WebServiceProducerHttp.java 2012-05-23 15:28:32 UTC (rev 41304) +++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/WebServiceProducerHttp.java 2012-05-23 15:42:42 UTC (rev 41305) @@ -19,6 +19,8 @@ protected void executeExample() { super.executeExample(); + /* Created this test to avoid the server logging issue - https://issues.jboss.org/browse/JBQA-6321 */ + String text = executeClientGetServerOutput("org.jboss.soa.esb.samples.quickstart.webserviceproducer.test.SendMessage","http 8765"); assertNotNull("Calling Send message failed, nothing appended (http) to server log",text); assertTrue("Calling Send message failed, unexpected server output :"+text,text.contains("Ah Goodbye then!!!!")); Modified: trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/WebServiceProducerSocket.java =================================================================== --- trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/WebServiceProducerSocket.java 2012-05-23 15:28:32 UTC (rev 41304) +++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/WebServiceProducerSocket.java 2012-05-23 15:42:42 UTC (rev 41305) @@ -19,6 +19,8 @@ protected void executeExample() { super.executeExample(); + /* Created this test to avoid the server logging issue - https://issues.jboss.org/browse/JBQA-6321 */ + String text = executeClientGetServerOutput("org.jboss.soa.esb.samples.quickstart.webserviceproducer.test.SendMessage","socket 8888"); assertNotNull("Calling Send message failed, nothing appended (socket) to server log",text); assertTrue("Calling Send message failed, unexpected server output :"+text,text.contains("Ah Goodbye then!!!!"));

12 years, 7 months

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits May 2012