From 4df09e69ba221bf7db7dceeac9e5ed666dfb5606 Mon Sep 17 00:00:00 2001 From: Hannes Wellmann Date: Mon, 26 Sep 2022 23:41:56 +0200 Subject: [PATCH] Merge m2e.logback.configuration into .appender and name the resulting fragment 'o.e.m2e.logback'. Make the LogPlugin from m2e.logback.configuration a logback Configurator that is called by the Logback configuration during initialization. Therefore there is no need anymore to perform the configuration in a BundleActivator. --- .../.classpath | 11 - .../.project | 28 -- .../org.eclipse.core.resources.prefs | 2 - .../.settings/org.eclipse.jdt.core.prefs | 416 ------------------ .../.settings/org.eclipse.jdt.ui.prefs | 66 --- .../META-INF/MANIFEST.MF | 16 - .../about.html | 36 -- .../build.properties | 7 - .../m2e/logback/configuration/LogPlugin.java | 187 -------- org.eclipse.m2e.logback.feature/feature.xml | 13 +- .../.classpath | 0 .../.project | 2 +- .../org.eclipse.core.resources.prefs | 0 .../.settings/org.eclipse.jdt.core.prefs | 0 .../.settings/org.eclipse.jdt.ui.prefs | 0 .../META-INF/MANIFEST.MF | 7 +- .../META-INF/p2.inf | 2 - .../ch.qos.logback.classic.spi.Configurator | 1 + .../about.html | 0 .../build.properties | 3 +- .../defaultLogbackConfiguration/logback.xml | 0 .../logback/appender/EclipseLogAppender.java | 35 +- .../appender/MavenConsoleAppender.java | 0 .../configuration/M2ELogbackConfigurator.java | 137 ++++++ org.eclipse.m2e.sdk.feature/feature.xml | 2 +- pom.xml | 3 +- products/m2e-ide/Eclipse-M2E-IDE.launch | 1 - 27 files changed, 162 insertions(+), 813 deletions(-) delete mode 100644 org.eclipse.m2e.logback.configuration/.classpath delete mode 100644 org.eclipse.m2e.logback.configuration/.project delete mode 100644 org.eclipse.m2e.logback.configuration/.settings/org.eclipse.core.resources.prefs delete mode 100644 org.eclipse.m2e.logback.configuration/.settings/org.eclipse.jdt.core.prefs delete mode 100644 org.eclipse.m2e.logback.configuration/.settings/org.eclipse.jdt.ui.prefs delete mode 100644 org.eclipse.m2e.logback.configuration/META-INF/MANIFEST.MF delete mode 100644 org.eclipse.m2e.logback.configuration/about.html delete mode 100644 org.eclipse.m2e.logback.configuration/build.properties delete mode 100644 org.eclipse.m2e.logback.configuration/src/org/eclipse/m2e/logback/configuration/LogPlugin.java rename {org.eclipse.m2e.logback.appender => org.eclipse.m2e.logback}/.classpath (100%) rename {org.eclipse.m2e.logback.appender => org.eclipse.m2e.logback}/.project (92%) rename {org.eclipse.m2e.logback.appender => org.eclipse.m2e.logback}/.settings/org.eclipse.core.resources.prefs (100%) rename {org.eclipse.m2e.logback.appender => org.eclipse.m2e.logback}/.settings/org.eclipse.jdt.core.prefs (100%) rename {org.eclipse.m2e.logback.appender => org.eclipse.m2e.logback}/.settings/org.eclipse.jdt.ui.prefs (100%) rename {org.eclipse.m2e.logback.appender => org.eclipse.m2e.logback}/META-INF/MANIFEST.MF (60%) rename {org.eclipse.m2e.logback.configuration => org.eclipse.m2e.logback}/META-INF/p2.inf (64%) create mode 100644 org.eclipse.m2e.logback/META-INF/services/ch.qos.logback.classic.spi.Configurator rename {org.eclipse.m2e.logback.appender => org.eclipse.m2e.logback}/about.html (100%) rename {org.eclipse.m2e.logback.appender => org.eclipse.m2e.logback}/build.properties (86%) rename {org.eclipse.m2e.logback.configuration => org.eclipse.m2e.logback}/defaultLogbackConfiguration/logback.xml (100%) rename {org.eclipse.m2e.logback.appender => org.eclipse.m2e.logback}/src/org/eclipse/m2e/logback/appender/EclipseLogAppender.java (63%) rename {org.eclipse.m2e.logback.appender => org.eclipse.m2e.logback}/src/org/eclipse/m2e/logback/appender/MavenConsoleAppender.java (100%) create mode 100644 org.eclipse.m2e.logback/src/org/eclipse/m2e/logback/configuration/M2ELogbackConfigurator.java diff --git a/org.eclipse.m2e.logback.configuration/.classpath b/org.eclipse.m2e.logback.configuration/.classpath deleted file mode 100644 index 3628e33687..0000000000 --- a/org.eclipse.m2e.logback.configuration/.classpath +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/org.eclipse.m2e.logback.configuration/.project b/org.eclipse.m2e.logback.configuration/.project deleted file mode 100644 index 4e01cf4689..0000000000 --- a/org.eclipse.m2e.logback.configuration/.project +++ /dev/null @@ -1,28 +0,0 @@ - - - org.eclipse.m2e.logback.configuration - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - - diff --git a/org.eclipse.m2e.logback.configuration/.settings/org.eclipse.core.resources.prefs b/org.eclipse.m2e.logback.configuration/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c0203..0000000000 --- a/org.eclipse.m2e.logback.configuration/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/org.eclipse.m2e.logback.configuration/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.m2e.logback.configuration/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index ffbf9b784f..0000000000 --- a/org.eclipse.m2e.logback.configuration/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,416 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.builder.cleanOutputFolder=clean -org.eclipse.jdt.core.builder.duplicateResourceTask=warning -org.eclipse.jdt.core.builder.invalidClasspath=abort -org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore -org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch -org.eclipse.jdt.core.circularClasspath=error -org.eclipse.jdt.core.classpath.exclusionPatterns=enabled -org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled -org.eclipse.jdt.core.codeComplete.argumentPrefixes= -org.eclipse.jdt.core.codeComplete.argumentSuffixes= -org.eclipse.jdt.core.codeComplete.fieldPrefixes= -org.eclipse.jdt.core.codeComplete.fieldSuffixes= -org.eclipse.jdt.core.codeComplete.localPrefixes= -org.eclipse.jdt.core.codeComplete.localSuffixes= -org.eclipse.jdt.core.codeComplete.staticFieldPrefixes= -org.eclipse.jdt.core.codeComplete.staticFieldSuffixes= -org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes= -org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes= -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.doc.comment.support=enabled -org.eclipse.jdt.core.compiler.maxProblemPerUnit=100 -org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.autoboxing=ignore -org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning -org.eclipse.jdt.core.compiler.problem.deadCode=warning -org.eclipse.jdt.core.compiler.problem.deprecation=warning -org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=enabled -org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled -org.eclipse.jdt.core.compiler.problem.discouragedReference=warning -org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore -org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore -org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled -org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore -org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning -org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning -org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled -org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning -org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning -org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning -org.eclipse.jdt.core.compiler.problem.invalidJavadoc=ignore -org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public -org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore -org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning -org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore -org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore -org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore -org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled -org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public -org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore -org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled -org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled -org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning -org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore -org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning -org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning -org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore -org.eclipse.jdt.core.compiler.problem.nullReference=warning -org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning -org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore -org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning -org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning -org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning -org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning -org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore -org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning -org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled -org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning -org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled -org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled -org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning -org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning -org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning -org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore -org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning -org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning -org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning -org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=enabled -org.eclipse.jdt.core.compiler.problem.unusedImport=warning -org.eclipse.jdt.core.compiler.problem.unusedLabel=warning -org.eclipse.jdt.core.compiler.problem.unusedLocal=warning -org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore -org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore -org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=enabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=enabled -org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning -org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning -org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 -org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled -org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH -org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX -org.eclipse.jdt.core.formatter.align_type_members_on_columns=false -org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 -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_bitwise_operator=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_logical_operator=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_multiplicative_operator=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_string_concatenation=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=2 -org.eclipse.jdt.core.formatter.blank_lines_after_package=1 -org.eclipse.jdt.core.formatter.blank_lines_before_field=1 -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=1 -org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 -org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=2 -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=true -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=true -org.eclipse.jdt.core.formatter.comment.format_block_comments=false -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=false -org.eclipse.jdt.core.formatter.comment.format_source_code=true -org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true -org.eclipse.jdt.core.formatter.comment.indent_root_tags=true -org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert -org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert -org.eclipse.jdt.core.formatter.comment.line_length=120 -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=true -org.eclipse.jdt.core.formatter.indentation.size=2 -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=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_additive_operator=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_bitwise_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_logical_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=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=do not 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=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_relational_operator=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_shift_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert -org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=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_bitwise_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=do not 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_logical_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=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=do not 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=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=do not 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=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=do not 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=do not 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_relational_operator=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_shift_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=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=true -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=true -org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=true -org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 -org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1 -org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true -org.eclipse.jdt.core.formatter.tabulation.char=space -org.eclipse.jdt.core.formatter.tabulation.size=2 -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_additive_operator=true -org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true -org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true -org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true -org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true -org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true -org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true -org.eclipse.jdt.core.incompatibleJDKLevel=ignore -org.eclipse.jdt.core.incompleteClasspath=error diff --git a/org.eclipse.m2e.logback.configuration/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.m2e.logback.configuration/.settings/org.eclipse.jdt.ui.prefs deleted file mode 100644 index 595d99755d..0000000000 --- a/org.eclipse.m2e.logback.configuration/.settings/org.eclipse.jdt.ui.prefs +++ /dev/null @@ -1,66 +0,0 @@ -eclipse.preferences.version=1 -editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true -formatter_profile=_m2 plugin -formatter_settings_version=12 -org.eclipse.jdt.ui.exception.name=ex -org.eclipse.jdt.ui.gettersetter.use.is=true -org.eclipse.jdt.ui.ignorelowercasenames=true -org.eclipse.jdt.ui.importorder=java;javax;org;org.w3c;org.xml;org.apache;com;junit;org.eclipse;org.codehaus;org.apache.lucene;org.apache.maven;org.sonatype;org.eclipse.m2e; -org.eclipse.jdt.ui.javadoc=true -org.eclipse.jdt.ui.keywordthis=true -org.eclipse.jdt.ui.ondemandthreshold=99 -org.eclipse.jdt.ui.overrideannotation=false -org.eclipse.jdt.ui.staticondemandthreshold=99 -org.eclipse.jdt.ui.text.custom_code_templates= -sp_cleanup.add_default_serial_version_id=true -sp_cleanup.add_generated_serial_version_id=false -sp_cleanup.add_missing_annotations=true -sp_cleanup.add_missing_deprecated_annotations=true -sp_cleanup.add_missing_methods=false -sp_cleanup.add_missing_nls_tags=false -sp_cleanup.add_missing_override_annotations=true -sp_cleanup.add_missing_override_annotations_interface_methods=true -sp_cleanup.add_serial_version_id=false -sp_cleanup.always_use_blocks=true -sp_cleanup.always_use_parentheses_in_expressions=false -sp_cleanup.always_use_this_for_non_static_field_access=false -sp_cleanup.always_use_this_for_non_static_method_access=false -sp_cleanup.convert_to_enhanced_for_loop=false -sp_cleanup.correct_indentation=false -sp_cleanup.format_source_code=true -sp_cleanup.format_source_code_changes_only=false -sp_cleanup.make_local_variable_final=false -sp_cleanup.make_parameters_final=false -sp_cleanup.make_private_fields_final=true -sp_cleanup.make_type_abstract_if_missing_method=false -sp_cleanup.make_variable_declarations_final=true -sp_cleanup.never_use_blocks=false -sp_cleanup.never_use_parentheses_in_expressions=true -sp_cleanup.on_save_use_additional_actions=false -sp_cleanup.organize_imports=true -sp_cleanup.qualify_static_field_accesses_with_declaring_class=false -sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true -sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true -sp_cleanup.qualify_static_member_accesses_with_declaring_class=false -sp_cleanup.qualify_static_method_accesses_with_declaring_class=false -sp_cleanup.remove_private_constructors=true -sp_cleanup.remove_trailing_whitespaces=false -sp_cleanup.remove_trailing_whitespaces_all=true -sp_cleanup.remove_trailing_whitespaces_ignore_empty=false -sp_cleanup.remove_unnecessary_casts=true -sp_cleanup.remove_unnecessary_nls_tags=false -sp_cleanup.remove_unused_imports=false -sp_cleanup.remove_unused_local_variables=false -sp_cleanup.remove_unused_private_fields=true -sp_cleanup.remove_unused_private_members=false -sp_cleanup.remove_unused_private_methods=true -sp_cleanup.remove_unused_private_types=true -sp_cleanup.sort_members=false -sp_cleanup.sort_members_all=false -sp_cleanup.use_blocks=false -sp_cleanup.use_blocks_only_for_return_and_throw=false -sp_cleanup.use_parentheses_in_expressions=false -sp_cleanup.use_this_for_non_static_field_access=false -sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true -sp_cleanup.use_this_for_non_static_method_access=false -sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true diff --git a/org.eclipse.m2e.logback.configuration/META-INF/MANIFEST.MF b/org.eclipse.m2e.logback.configuration/META-INF/MANIFEST.MF deleted file mode 100644 index d99ffa6221..0000000000 --- a/org.eclipse.m2e.logback.configuration/META-INF/MANIFEST.MF +++ /dev/null @@ -1,16 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: M2E Logback Configuration -Bundle-Vendor: Eclipse.org - m2e -Bundle-SymbolicName: org.eclipse.m2e.logback.configuration;singleton:=true -Bundle-Version: 2.0.0.qualifier -Bundle-Activator: org.eclipse.m2e.logback.configuration.LogPlugin -Require-Bundle: org.eclipse.core.runtime;bundle-version="3.5.0", - ch.qos.logback.classic;bundle-version="1.0.0", - ch.qos.logback.core;bundle-version="1.0.0" -Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-17 -Export-Package: org.eclipse.m2e.logback.configuration;x-internal:=true -Import-Package: org.slf4j;version="[1.6.2,2.0.0)", - org.slf4j.helpers;version="1.6.2" -Automatic-Module-Name: org.eclipse.m2e.logback.configuration diff --git a/org.eclipse.m2e.logback.configuration/about.html b/org.eclipse.m2e.logback.configuration/about.html deleted file mode 100644 index 8eee37d470..0000000000 --- a/org.eclipse.m2e.logback.configuration/about.html +++ /dev/null @@ -1,36 +0,0 @@ - - - - -About - - -

About This Content

- -

November 30, 2017

-

License

- -

- The Eclipse Foundation makes available all content in this plug-in - ("Content"). Unless otherwise indicated below, the Content - is provided to you under the terms and conditions of the Eclipse - Public License Version 2.0 ("EPL"). A copy of the EPL is - available at http://www.eclipse.org/legal/epl-2.0. - For purposes of the EPL, "Program" will mean the Content. -

- -

- If you did not receive this Content directly from the Eclipse - Foundation, the Content is being redistributed by another party - ("Redistributor") and different terms and conditions may - apply to your use of any object code in the Content. Check the - Redistributor's license that was provided with the Content. If no such - license exists, contact the Redistributor. Unless otherwise indicated - below, the terms and conditions of the EPL still apply to any source - code in the Content and such source code may be obtained at http://www.eclipse.org. -

- - - diff --git a/org.eclipse.m2e.logback.configuration/build.properties b/org.eclipse.m2e.logback.configuration/build.properties deleted file mode 100644 index 5455fb9030..0000000000 --- a/org.eclipse.m2e.logback.configuration/build.properties +++ /dev/null @@ -1,7 +0,0 @@ -source.. = src/ -output.. = bin/ -bin.includes = META-INF/,\ - .,\ - defaultLogbackConfiguration/,\ - about.html -src.includes = about.html diff --git a/org.eclipse.m2e.logback.configuration/src/org/eclipse/m2e/logback/configuration/LogPlugin.java b/org.eclipse.m2e.logback.configuration/src/org/eclipse/m2e/logback/configuration/LogPlugin.java deleted file mode 100644 index 60ab122ba0..0000000000 --- a/org.eclipse.m2e.logback.configuration/src/org/eclipse/m2e/logback/configuration/LogPlugin.java +++ /dev/null @@ -1,187 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010, 2021 Sonatype, Inc. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License 2.0 - * which accompanies this distribution, and is available at - * https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * Sonatype, Inc. - initial API and implementation - *******************************************************************************/ - -package org.eclipse.m2e.logback.configuration; - -import static ch.qos.logback.classic.util.ContextInitializer.CONFIG_FILE_PROPERTY; - -import java.io.File; -import java.io.InputStream; -import java.net.URL; -import java.nio.file.Files; -import java.util.Properties; -import java.util.SortedMap; -import java.util.Timer; -import java.util.TimerTask; -import java.util.TreeMap; -import java.util.function.BooleanSupplier; - -import org.osgi.framework.Bundle; -import org.osgi.framework.BundleContext; -import org.slf4j.ILoggerFactory; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.slf4j.helpers.SubstituteLoggerFactory; - -import org.eclipse.core.runtime.Platform; -import org.eclipse.core.runtime.Plugin; -import org.eclipse.core.runtime.Status; - -import ch.qos.logback.classic.LoggerContext; -import ch.qos.logback.classic.joran.JoranConfigurator; -import ch.qos.logback.core.joran.spi.JoranException; -import ch.qos.logback.core.util.StatusPrinter; - - -public class LogPlugin extends Plugin { - private static final String PLUGIN_ID = "org.eclipse.m2e.logback.configuration"; //$NON-NLS-1$ - - private static final String RESOURCES_PLUGIN_ID = "org.eclipse.core.resources"; //$NON-NLS-1$ - - // This has to match the log directory in defaultLogbackConfiguration/logback.xml - public static final String PROPERTY_LOG_DIRECTORY = "org.eclipse.m2e.log.dir"; //$NON-NLS-1$ - - private boolean isConfigured; - - @Override - public void start(BundleContext context) throws Exception { - super.start(context); - - if(System.getProperty(CONFIG_FILE_PROPERTY) != null) { - // The standard logback config file property is set - don't force our configuration - systemOut(CONFIG_FILE_PROPERTY + "=" + System.getProperty(CONFIG_FILE_PROPERTY)); //$NON-NLS-1$ - return; - } - - // Bug 337167: Configuring Logback requires the state-location. If not yet initialized it will be initialized to the default value, - // but this prevents the workspace-chooser dialog to show up in a stand-alone Eclipse-product. Therefore we have to wait until the resources plug-in has started - if(!isStateLocationInitialized()) { - systemOut("Activated before the state location was initialized. Retry after the state location is initialized."); //$NON-NLS-1$ - runConditionally(this::configureLogback, LogPlugin::isStateLocationInitialized, "logback configurator timer"); - } else { - configureLogback(); - } - } - - private synchronized void configureLogback() { - if(isConfigured) { - systemOut("Logback was configured already"); //$NON-NLS-1$ - return; - } - - try { - File stateDir = getStateLocation().toFile(); - File configFile = new File(stateDir, "logback." + getBundle().getVersion() + ".xml"); //$NON-NLS-1$ //$NON-NLS-2$ - systemOut("Logback config file: " + configFile.getAbsolutePath()); //$NON-NLS-1$ - - if(!configFile.isFile()) { - // Copy the default config file to the actual config file - try (InputStream is = getBundle().getEntry("defaultLogbackConfiguration/logback.xml").openStream()) { //$NON-NLS-1$ - configFile.getParentFile().mkdirs(); - Files.copy(is, configFile.toPath()); - } - } - if(System.getProperty(PROPERTY_LOG_DIRECTORY, "").length() <= 0) { //$NON-NLS-1$ - System.setProperty(PROPERTY_LOG_DIRECTORY, stateDir.getAbsolutePath()); - } - - loadConfiguration(configFile.toURI().toURL()); - - isConfigured = true; - } catch(Exception e) { - getLog().log(Status.warning("Exception while setting up logging:" + e.getMessage(), e)); //$NON-NLS-1$ - } - } - - public static void loadConfiguration(URL configFile) throws JoranException { - LoggerContext lc = getLoggerContext(); - if(lc == null) { - return; - } - systemOut("Initializing logback"); //$NON-NLS-1$ - lc.reset(); - - JoranConfigurator configurator = new JoranConfigurator(); - configurator.setContext(lc); - configurator.doConfigure(configFile); - - StatusPrinter.printInCaseOfErrorsOrWarnings(lc); - - logJavaProperties(LoggerFactory.getLogger(LogPlugin.class)); - } - - // --- utility methods --- - - private static boolean isStateLocationInitialized() { - if(!Platform.isRunning()) { - return false; - } - Bundle resourcesBundle = Platform.getBundle(RESOURCES_PLUGIN_ID); - return resourcesBundle != null && resourcesBundle.getState() == Bundle.ACTIVE; - } - - private static void runConditionally(Runnable action, BooleanSupplier condition, String name) { - Timer timer = new Timer(name); - timer.schedule(new TimerTask() { - public void run() { - if(condition.getAsBoolean()) { - timer.cancel(); - action.run(); - } - } - }, 0 /*delay*/, 50 /*period*/); - } - - private static LoggerContext getLoggerContext() { - ILoggerFactory loggerFactory = LoggerFactory.getILoggerFactory(); - - for(int i = 0; loggerFactory instanceof SubstituteLoggerFactory && i < 100; i++ ) { - // slf4j is initialization phase - systemOut("SLF4J logger factory class: " + loggerFactory.getClass().getName()); //$NON-NLS-1$ - try { - Thread.sleep(50); - } catch(InterruptedException e) { - Thread.currentThread().interrupt(); // ignore but re-interrupt - } - loggerFactory = LoggerFactory.getILoggerFactory(); - } - - if(loggerFactory instanceof LoggerContext) { - return (LoggerContext) loggerFactory; - } - String msg = loggerFactory == null ? // Is null possible? - "SLF4J logger factory is null" //$NON-NLS-1$ - : "SLF4J logger factory is not an instance of LoggerContext: " + loggerFactory.getClass().getName(); // $NON-NLS-1$ - systemErr(msg); - return null; - } - - public static void logJavaProperties(Logger log) { - Properties javaProperties = System.getProperties(); - SortedMap sortedProperties = new TreeMap<>(); - for(String key : javaProperties.stringPropertyNames()) { - sortedProperties.put(key, javaProperties.getProperty(key)); - } - log.debug("Java properties (ordered by property name):"); //$NON-NLS-1$ - sortedProperties.forEach((k, v) -> log.debug(" {}={}", k, v)); - } - - private static void systemOut(String message) { - System.out.println(PLUGIN_ID + ": " + message); //$NON-NLS-1$ - } - - private static void systemErr(String message) { - System.err.println(PLUGIN_ID + ": " + message); //$NON-NLS-1$ - } - -} diff --git a/org.eclipse.m2e.logback.feature/feature.xml b/org.eclipse.m2e.logback.feature/feature.xml index 47a1f23076..152c2b8c02 100644 --- a/org.eclipse.m2e.logback.feature/feature.xml +++ b/org.eclipse.m2e.logback.feature/feature.xml @@ -2,9 +2,9 @@ @@ -17,14 +17,7 @@ - - - org.eclipse.m2e.logback.appender + org.eclipse.m2e.logback diff --git a/org.eclipse.m2e.logback.appender/.settings/org.eclipse.core.resources.prefs b/org.eclipse.m2e.logback/.settings/org.eclipse.core.resources.prefs similarity index 100% rename from org.eclipse.m2e.logback.appender/.settings/org.eclipse.core.resources.prefs rename to org.eclipse.m2e.logback/.settings/org.eclipse.core.resources.prefs diff --git a/org.eclipse.m2e.logback.appender/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.m2e.logback/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from org.eclipse.m2e.logback.appender/.settings/org.eclipse.jdt.core.prefs rename to org.eclipse.m2e.logback/.settings/org.eclipse.jdt.core.prefs diff --git a/org.eclipse.m2e.logback.appender/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.m2e.logback/.settings/org.eclipse.jdt.ui.prefs similarity index 100% rename from org.eclipse.m2e.logback.appender/.settings/org.eclipse.jdt.ui.prefs rename to org.eclipse.m2e.logback/.settings/org.eclipse.jdt.ui.prefs diff --git a/org.eclipse.m2e.logback.appender/META-INF/MANIFEST.MF b/org.eclipse.m2e.logback/META-INF/MANIFEST.MF similarity index 60% rename from org.eclipse.m2e.logback.appender/META-INF/MANIFEST.MF rename to org.eclipse.m2e.logback/META-INF/MANIFEST.MF index f6b36a4db9..29a2328f99 100644 --- a/org.eclipse.m2e.logback.appender/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.logback/META-INF/MANIFEST.MF @@ -1,14 +1,13 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-SymbolicName: org.eclipse.m2e.logback.appender;singleton:=true -Bundle-Version: 2.0.0.qualifier +Bundle-SymbolicName: org.eclipse.m2e.logback;singleton:=true +Bundle-Version: 2.1.0.qualifier Bundle-Name: M2E Logback Appender Bundle-Vendor: Eclipse.org - m2e Bundle-RequiredExecutionEnvironment: JavaSE-17 Fragment-Host: ch.qos.logback.classic -Export-Package: org.eclipse.m2e.logback.appender;x-internal:=true Require-Bundle: org.eclipse.core.runtime, org.eclipse.jface, org.eclipse.ui.console, org.eclipse.m2e.core.ui;bundle-version="[2.0.0,3.0.0)" -Automatic-Module-Name: org.eclipse.m2e.logback.appender +Automatic-Module-Name: org.eclipse.m2e.logback diff --git a/org.eclipse.m2e.logback.configuration/META-INF/p2.inf b/org.eclipse.m2e.logback/META-INF/p2.inf similarity index 64% rename from org.eclipse.m2e.logback.configuration/META-INF/p2.inf rename to org.eclipse.m2e.logback/META-INF/p2.inf index 6e76d4874d..0bd06ac9da 100644 --- a/org.eclipse.m2e.logback.configuration/META-INF/p2.inf +++ b/org.eclipse.m2e.logback/META-INF/p2.inf @@ -1,5 +1,3 @@ -instructions.configure = markStarted(started: true); - requires.1.namespace = osgi.bundle requires.1.name = ch.qos.logback.slf4j requires.1.range = 0.9.24 diff --git a/org.eclipse.m2e.logback/META-INF/services/ch.qos.logback.classic.spi.Configurator b/org.eclipse.m2e.logback/META-INF/services/ch.qos.logback.classic.spi.Configurator new file mode 100644 index 0000000000..2d14eb9089 --- /dev/null +++ b/org.eclipse.m2e.logback/META-INF/services/ch.qos.logback.classic.spi.Configurator @@ -0,0 +1 @@ +org.eclipse.m2e.logback.configuration.M2ELogbackConfigurator diff --git a/org.eclipse.m2e.logback.appender/about.html b/org.eclipse.m2e.logback/about.html similarity index 100% rename from org.eclipse.m2e.logback.appender/about.html rename to org.eclipse.m2e.logback/about.html diff --git a/org.eclipse.m2e.logback.appender/build.properties b/org.eclipse.m2e.logback/build.properties similarity index 86% rename from org.eclipse.m2e.logback.appender/build.properties rename to org.eclipse.m2e.logback/build.properties index 3439bb111c..52aff2ee6c 100644 --- a/org.eclipse.m2e.logback.appender/build.properties +++ b/org.eclipse.m2e.logback/build.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2011 Sonatype, Inc. and others. +# Copyright (c) 2011, 2022 Sonatype, Inc. and others. # All rights reserved. This program and the accompanying materials # are made available under the terms of the Eclipse Public License 2.0 # which accompanies this distribution, and is available at @@ -13,5 +13,6 @@ source.. = src/ output.. = bin/ bin.includes = META-INF/,\ .,\ + defaultLogbackConfiguration/,\ about.html src.includes = about.html diff --git a/org.eclipse.m2e.logback.configuration/defaultLogbackConfiguration/logback.xml b/org.eclipse.m2e.logback/defaultLogbackConfiguration/logback.xml similarity index 100% rename from org.eclipse.m2e.logback.configuration/defaultLogbackConfiguration/logback.xml rename to org.eclipse.m2e.logback/defaultLogbackConfiguration/logback.xml diff --git a/org.eclipse.m2e.logback.appender/src/org/eclipse/m2e/logback/appender/EclipseLogAppender.java b/org.eclipse.m2e.logback/src/org/eclipse/m2e/logback/appender/EclipseLogAppender.java similarity index 63% rename from org.eclipse.m2e.logback.appender/src/org/eclipse/m2e/logback/appender/EclipseLogAppender.java rename to org.eclipse.m2e.logback/src/org/eclipse/m2e/logback/appender/EclipseLogAppender.java index f7a7d0a948..42ad6dc97f 100644 --- a/org.eclipse.m2e.logback.appender/src/org/eclipse/m2e/logback/appender/EclipseLogAppender.java +++ b/org.eclipse.m2e.logback/src/org/eclipse/m2e/logback/appender/EclipseLogAppender.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2010, 2021 Sonatype, Inc. + * Copyright (c) 2010, 2022 Sonatype, Inc. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at @@ -31,32 +31,23 @@ public class EclipseLogAppender extends UnsynchronizedAppenderBase IStatus.ERROR; + case Level.WARN_INT -> IStatus.WARNING; + case Level.INFO_INT -> IStatus.INFO; + default -> -1; + }; + if(severity != -1) { + IStatus status = new Status(severity, BUNDLE_ID, logEvent.getFormattedMessage(), getThrowable(logEvent)); + ECLIPSE_LOG.log(status); } - IStatus status = new Status(severity, BUNDLE_ID, logEvent.getFormattedMessage(), getThrowable(logEvent)); - ECLIPSE_LOG.log(status); } private static Throwable getThrowable(ILoggingEvent logEvent) { - if(logEvent.getThrowableProxy() instanceof ThrowableProxy) { - return ((ThrowableProxy) logEvent.getThrowableProxy()).getThrowable(); + if(logEvent.getThrowableProxy() instanceof ThrowableProxy proxy) { + return proxy.getThrowable(); } Object[] args = logEvent.getArgumentArray(); - if(args != null && args.length > 0 && args[args.length - 1] instanceof Throwable) { - return (Throwable) args[args.length - 1]; - } - return null; + return args != null && args.length > 0 && args[args.length - 1] instanceof Throwable throwable ? throwable : null; } } diff --git a/org.eclipse.m2e.logback.appender/src/org/eclipse/m2e/logback/appender/MavenConsoleAppender.java b/org.eclipse.m2e.logback/src/org/eclipse/m2e/logback/appender/MavenConsoleAppender.java similarity index 100% rename from org.eclipse.m2e.logback.appender/src/org/eclipse/m2e/logback/appender/MavenConsoleAppender.java rename to org.eclipse.m2e.logback/src/org/eclipse/m2e/logback/appender/MavenConsoleAppender.java diff --git a/org.eclipse.m2e.logback/src/org/eclipse/m2e/logback/configuration/M2ELogbackConfigurator.java b/org.eclipse.m2e.logback/src/org/eclipse/m2e/logback/configuration/M2ELogbackConfigurator.java new file mode 100644 index 0000000000..cf174b7100 --- /dev/null +++ b/org.eclipse.m2e.logback/src/org/eclipse/m2e/logback/configuration/M2ELogbackConfigurator.java @@ -0,0 +1,137 @@ +/******************************************************************************* + * Copyright (c) 2010, 2022 Sonatype, Inc. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 + * which accompanies this distribution, and is available at + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors: + * Sonatype, Inc. - initial API and implementation + * Hannes Wellmann - Merge m2e.logback.configuration into .appender + *******************************************************************************/ + +package org.eclipse.m2e.logback.configuration; + +import java.io.File; +import java.io.InputStream; +import java.net.URL; +import java.nio.file.Files; +import java.util.Properties; +import java.util.SortedMap; +import java.util.Timer; +import java.util.TimerTask; +import java.util.TreeMap; +import java.util.function.BooleanSupplier; + +import org.osgi.framework.Bundle; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import org.eclipse.core.runtime.ILog; +import org.eclipse.core.runtime.Platform; +import org.eclipse.core.runtime.Status; + +import ch.qos.logback.classic.BasicConfigurator; +import ch.qos.logback.classic.LoggerContext; +import ch.qos.logback.classic.joran.JoranConfigurator; +import ch.qos.logback.classic.spi.Configurator; +import ch.qos.logback.core.joran.spi.JoranException; +import ch.qos.logback.core.util.StatusPrinter; + + +public class M2ELogbackConfigurator extends BasicConfigurator implements Configurator { + + private static final ILog LOG = Platform.getLog(M2ELogbackConfigurator.class); + + private static final String RESOURCES_PLUGIN_ID = "org.eclipse.core.resources"; //$NON-NLS-1$ + + // This has to match the log directory in defaultLogbackConfiguration/logback.xml + private static final String PROPERTY_LOG_DIRECTORY = "org.eclipse.m2e.log.dir"; //$NON-NLS-1$ + + @Override + public void configure(LoggerContext lc) { + // Bug 337167: Configuring Logback requires the state-location. If not yet initialized it will be initialized to the default value, + // but this prevents the workspace-chooser dialog to show up in a stand-alone Eclipse-product. Therefore we have to wait until the resources plug-in has started. + // This happens if a Plug-in that uses SLF4J is started before the workspace has been selected. + if(!isStateLocationInitialized()) { + super.configure(lc); // Preliminary apply default configuration + LOG.info("Activated before the state location was initialized. Retry after the state location is initialized."); //$NON-NLS-1$ + + runConditionally(() -> configureLogback(lc), M2ELogbackConfigurator::isStateLocationInitialized, + "logback configurator timer"); + } else { + configureLogback(lc); + } + } + + private synchronized void configureLogback(LoggerContext lc) { + try { + Bundle bundle = Platform.getBundle("org.eclipse.m2e.logback"); // This is a fragment -> FrameworkUtil.getBundle() returns host + File stateDir = Platform.getStateLocation(bundle).toFile(); + File configFile = new File(stateDir, "logback." + bundle.getVersion() + ".xml"); //$NON-NLS-1$ //$NON-NLS-2$ + LOG.info("Logback config file: " + configFile.getAbsolutePath()); //$NON-NLS-1$ + + if(!configFile.isFile()) { + // Copy the default config file to the actual config file, to allow user adjustments + try (InputStream is = bundle.getEntry("defaultLogbackConfiguration/logback.xml").openStream()) { //$NON-NLS-1$ + configFile.getParentFile().mkdirs(); + Files.copy(is, configFile.toPath()); + } + } + if(System.getProperty(PROPERTY_LOG_DIRECTORY, "").length() <= 0) { //$NON-NLS-1$ + System.setProperty(PROPERTY_LOG_DIRECTORY, stateDir.getAbsolutePath()); + } + loadConfiguration(lc, configFile.toURI().toURL()); + + } catch(Exception e) { + LOG.log(Status.warning("Exception while setting up logging:" + e.getMessage(), e)); //$NON-NLS-1$ + } + } + + private static void loadConfiguration(LoggerContext lc, URL configFile) throws JoranException { + lc.reset(); + + JoranConfigurator configurator = new JoranConfigurator(); + configurator.setContext(lc); + configurator.doConfigure(configFile); + + StatusPrinter.printInCaseOfErrorsOrWarnings(lc); + + logJavaProperties(LoggerFactory.getLogger(M2ELogbackConfigurator.class)); + } + + // --- utility methods --- + + private static boolean isStateLocationInitialized() { + if(!Platform.isRunning()) { + return false; + } + Bundle resourcesBundle = Platform.getBundle(RESOURCES_PLUGIN_ID); + return resourcesBundle != null && resourcesBundle.getState() == Bundle.ACTIVE; + } + + private static void runConditionally(Runnable action, BooleanSupplier condition, String name) { + Timer timer = new Timer(name); + timer.schedule(new TimerTask() { + public void run() { + if(condition.getAsBoolean()) { + timer.cancel(); + action.run(); + } + } + }, 0 /*delay*/, 50 /*period*/); + } + + private static void logJavaProperties(Logger log) { + Properties javaProperties = System.getProperties(); + SortedMap sortedProperties = new TreeMap<>(); + for(String key : javaProperties.stringPropertyNames()) { + sortedProperties.put(key, javaProperties.getProperty(key)); + } + log.debug("Java properties (ordered by property name):"); //$NON-NLS-1$ + sortedProperties.forEach((k, v) -> log.debug(" {}={}", k, v)); + } + +} diff --git a/org.eclipse.m2e.sdk.feature/feature.xml b/org.eclipse.m2e.sdk.feature/feature.xml index 92434d83a1..816bd737fb 100644 --- a/org.eclipse.m2e.sdk.feature/feature.xml +++ b/org.eclipse.m2e.sdk.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/pom.xml b/pom.xml index 598bd4215a..0f61917d94 100644 --- a/pom.xml +++ b/pom.xml @@ -91,8 +91,7 @@ org.eclipse.m2e.tests.common - org.eclipse.m2e.logback.appender - org.eclipse.m2e.logback.configuration + org.eclipse.m2e.logback org.eclipse.m2e.feature diff --git a/products/m2e-ide/Eclipse-M2E-IDE.launch b/products/m2e-ide/Eclipse-M2E-IDE.launch index 40cd613c49..cd47a98777 100644 --- a/products/m2e-ide/Eclipse-M2E-IDE.launch +++ b/products/m2e-ide/Eclipse-M2E-IDE.launch @@ -7,7 +7,6 @@ -