Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--bundles/org.eclipse.equinox.log.test/.classpath7
-rw-r--r--bundles/org.eclipse.equinox.log.test/.cvsignore1
-rw-r--r--bundles/org.eclipse.equinox.log.test/.project28
-rw-r--r--bundles/org.eclipse.equinox.log.test/.settings/org.eclipse.core.runtime.prefs2
-rw-r--r--bundles/org.eclipse.equinox.log.test/.settings/org.eclipse.jdt.core.prefs351
-rw-r--r--bundles/org.eclipse.equinox.log.test/.settings/org.eclipse.jdt.launching.prefs3
-rw-r--r--bundles/org.eclipse.equinox.log.test/.settings/org.eclipse.jdt.ui.prefs57
-rw-r--r--bundles/org.eclipse.equinox.log.test/META-INF/MANIFEST.MF14
-rw-r--r--bundles/org.eclipse.equinox.log.test/build.properties4
-rw-r--r--bundles/org.eclipse.equinox.log.test/forceQualifierUpdate.txt2
-rw-r--r--bundles/org.eclipse.equinox.log.test/pom.xml24
-rw-r--r--bundles/org.eclipse.equinox.log.test/src/org/eclipse/equinox/log/test/Activator.java66
-rw-r--r--bundles/org.eclipse.equinox.log.test/src/org/eclipse/equinox/log/test/AllExtendedLogServiceTests.java13
-rw-r--r--bundles/org.eclipse.equinox.log.test/src/org/eclipse/equinox/log/test/AllLogServiceTests.java14
-rw-r--r--bundles/org.eclipse.equinox.log.test/src/org/eclipse/equinox/log/test/AllTests.java23
-rw-r--r--bundles/org.eclipse.equinox.log.test/src/org/eclipse/equinox/log/test/ExtendedLogReaderServiceTest.java148
-rw-r--r--bundles/org.eclipse.equinox.log.test/src/org/eclipse/equinox/log/test/ExtendedLogServiceTest.java195
-rw-r--r--bundles/org.eclipse.equinox.log.test/src/org/eclipse/equinox/log/test/LogPermissionCollectionTest.java18
-rw-r--r--bundles/org.eclipse.equinox.log.test/src/org/eclipse/equinox/log/test/LogReaderServiceTest.java152
-rw-r--r--bundles/org.eclipse.equinox.log.test/src/org/eclipse/equinox/log/test/LogServiceTest.java245
-rw-r--r--bundles/org.eclipse.equinox.log.test/src/org/eclipse/equinox/log/test/TestListener.java32
-rw-r--r--pom.xml3
22 files changed, 0 insertions, 1402 deletions
diff --git a/bundles/org.eclipse.equinox.log.test/.classpath b/bundles/org.eclipse.equinox.log.test/.classpath
deleted file mode 100644
index 64c5e31b7..000000000
--- a/bundles/org.eclipse.equinox.log.test/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.equinox.log.test/.cvsignore b/bundles/org.eclipse.equinox.log.test/.cvsignore
deleted file mode 100644
index ba077a403..000000000
--- a/bundles/org.eclipse.equinox.log.test/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/bundles/org.eclipse.equinox.log.test/.project b/bundles/org.eclipse.equinox.log.test/.project
deleted file mode 100644
index b518713f0..000000000
--- a/bundles/org.eclipse.equinox.log.test/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.equinox.log.test</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/bundles/org.eclipse.equinox.log.test/.settings/org.eclipse.core.runtime.prefs b/bundles/org.eclipse.equinox.log.test/.settings/org.eclipse.core.runtime.prefs
deleted file mode 100644
index 5a0ad22d2..000000000
--- a/bundles/org.eclipse.equinox.log.test/.settings/org.eclipse.core.runtime.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-line.separator=\n
diff --git a/bundles/org.eclipse.equinox.log.test/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.equinox.log.test/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index e98c4ac2c..000000000
--- a/bundles/org.eclipse.equinox.log.test/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,351 +0,0 @@
-#Tue May 19 17:56:53 CDT 2009
-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.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-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=1000
-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=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-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=warning
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=error
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=disabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
-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=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-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=warning
-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=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-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=warning
-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=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-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=error
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
-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_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_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_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.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=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=false
-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=false
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=false
-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=80
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=2
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_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=4
-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=do not 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=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_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=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_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=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.jdt.core.formatter.insert_space_before_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_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=800
-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=false
-org.eclipse.jdt.core.formatter.tabulation.char=tab
-org.eclipse.jdt.core.formatter.tabulation.size=4
-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.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/bundles/org.eclipse.equinox.log.test/.settings/org.eclipse.jdt.launching.prefs b/bundles/org.eclipse.equinox.log.test/.settings/org.eclipse.jdt.launching.prefs
deleted file mode 100644
index d5918292b..000000000
--- a/bundles/org.eclipse.equinox.log.test/.settings/org.eclipse.jdt.launching.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Mon Mar 23 17:19:09 EDT 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=warning
diff --git a/bundles/org.eclipse.equinox.log.test/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.equinox.log.test/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 21bd9f3c7..000000000
--- a/bundles/org.eclipse.equinox.log.test/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,57 +0,0 @@
-#Tue Aug 21 11:30:07 CDT 2007
-eclipse.preferences.version=1
-editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_core
-formatter_settings_version=11
-org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=;
-org.eclipse.jdt.ui.ondemandthreshold=3
-org.eclipse.jdt.ui.staticondemandthreshold=3
-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_nls_tags=false
-sp_cleanup.add_missing_override_annotations=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.make_local_variable_final=false
-sp_cleanup.make_parameters_final=false
-sp_cleanup.make_private_fields_final=true
-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/bundles/org.eclipse.equinox.log.test/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.log.test/META-INF/MANIFEST.MF
deleted file mode 100644
index 78ca0d768..000000000
--- a/bundles/org.eclipse.equinox.log.test/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,14 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Test Plug-in
-Bundle-SymbolicName: org.eclipse.equinox.log.test
-Bundle-Version: 1.0.0
-Bundle-Activator: org.eclipse.equinox.log.test.Activator
-Import-Package: junit.framework;version="4.0",
- org.osgi.framework;version="1.3.0",
- org.osgi.service.event;version="1.1.0",
- org.osgi.service.log,
- org.osgi.service.packageadmin;version="1.2.0",
- org.eclipse.equinox.log; version="[1.0, 2.0)"
-Eclipse-LazyStart: true
-Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.equinox.log.test/build.properties b/bundles/org.eclipse.equinox.log.test/build.properties
deleted file mode 100644
index 34d2e4d2d..000000000
--- a/bundles/org.eclipse.equinox.log.test/build.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .
diff --git a/bundles/org.eclipse.equinox.log.test/forceQualifierUpdate.txt b/bundles/org.eclipse.equinox.log.test/forceQualifierUpdate.txt
deleted file mode 100644
index 56f1032a8..000000000
--- a/bundles/org.eclipse.equinox.log.test/forceQualifierUpdate.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-# To force a version qualifier update add the bug here
-Bug 403352 - Update all parent versions to match our build stream
diff --git a/bundles/org.eclipse.equinox.log.test/pom.xml b/bundles/org.eclipse.equinox.log.test/pom.xml
deleted file mode 100644
index 0a4377a66..000000000
--- a/bundles/org.eclipse.equinox.log.test/pom.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2012 Eclipse Foundation.
- All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Distribution License v1.0
- which accompanies this distribution, and is available at
- http://www.eclipse.org/org/documents/edl-v10.php
-
- Contributors:
- Igor Fedorenko - initial implementation
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>rt.equinox.bundles</artifactId>
- <groupId>org.eclipse.equinox.bundles</groupId>
- <version>4.6.0-SNAPSHOT</version>
- <relativePath>../../</relativePath>
- </parent>
- <groupId>org.eclipse.equinox</groupId>
- <artifactId>org.eclipse.equinox.log.test</artifactId>
- <version>1.0.0</version>
- <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/bundles/org.eclipse.equinox.log.test/src/org/eclipse/equinox/log/test/Activator.java b/bundles/org.eclipse.equinox.log.test/src/org/eclipse/equinox/log/test/Activator.java
deleted file mode 100644
index 0873d5a50..000000000
--- a/bundles/org.eclipse.equinox.log.test/src/org/eclipse/equinox/log/test/Activator.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2009 IBM Corporation and others All rights reserved. This
- * program and the accompanying materials are 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: IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.log.test;
-
-import org.osgi.framework.*;
-import org.osgi.service.packageadmin.PackageAdmin;
-
-public class Activator implements BundleActivator {
-
- private static PackageAdmin packageAdmin;
- private static BundleContext bundleContext;
- private ServiceReference packageAdminRef;
-
- public void start(BundleContext context) throws Exception {
- packageAdminRef = context.getServiceReference(PackageAdmin.class.getName());
- setPackageAdmin((PackageAdmin) context.getService(packageAdminRef));
- setBundleContext(context);
- }
-
- public void stop(BundleContext context) throws Exception {
- setBundleContext(null);
- setPackageAdmin(null);
- context.ungetService(packageAdminRef);
- }
-
- private static synchronized void setBundleContext(BundleContext context) {
- bundleContext = context;
- }
-
- private static synchronized void setPackageAdmin(PackageAdmin service) {
- packageAdmin = service;
- }
-
- static synchronized BundleContext getBundleContext() {
- return bundleContext;
- }
-
- static synchronized Bundle getBundle(String symbolicName) {
- if (packageAdmin == null)
- return null;
-
- Bundle[] bundles = packageAdmin.getBundles(symbolicName, null);
- if (bundles == null)
- return null;
- //Return the first bundle that is not installed or uninstalled
- for (int i = 0; i < bundles.length; i++) {
- if ((bundles[i].getState() & (Bundle.INSTALLED | Bundle.UNINSTALLED)) == 0) {
- return bundles[i];
- }
- }
- return null;
- }
-
- static synchronized void refreshPackages() {
- if (packageAdmin == null)
- throw new IllegalStateException("PackageAdmin not registered"); //$NON-NLS-1$
-
- packageAdmin.refreshPackages(null);
- }
-}
diff --git a/bundles/org.eclipse.equinox.log.test/src/org/eclipse/equinox/log/test/AllExtendedLogServiceTests.java b/bundles/org.eclipse.equinox.log.test/src/org/eclipse/equinox/log/test/AllExtendedLogServiceTests.java
deleted file mode 100644
index 7ea5c0701..000000000
--- a/bundles/org.eclipse.equinox.log.test/src/org/eclipse/equinox/log/test/AllExtendedLogServiceTests.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.eclipse.equinox.log.test;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-public class AllExtendedLogServiceTests {
- public static Test suite() {
- TestSuite suite = new TestSuite("Test extended log service"); //$NON-NLS-1$
- suite.addTestSuite(ExtendedLogServiceTest.class);
- suite.addTestSuite(ExtendedLogReaderServiceTest.class);
- return suite;
- }
-}
diff --git a/bundles/org.eclipse.equinox.log.test/src/org/eclipse/equinox/log/test/AllLogServiceTests.java b/bundles/org.eclipse.equinox.log.test/src/org/eclipse/equinox/log/test/AllLogServiceTests.java
deleted file mode 100644
index 6c4ddb0ca..000000000
--- a/bundles/org.eclipse.equinox.log.test/src/org/eclipse/equinox/log/test/AllLogServiceTests.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.eclipse.equinox.log.test;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-public class AllLogServiceTests {
- public static Test suite() {
- TestSuite suite = new TestSuite("Test log service"); //$NON-NLS-1$
- suite.addTestSuite(LogServiceTest.class);
- suite.addTestSuite(LogReaderServiceTest.class);
- suite.addTestSuite(LogPermissionCollectionTest.class);
- return suite;
- }
-}
diff --git a/bundles/org.eclipse.equinox.log.test/src/org/eclipse/equinox/log/test/AllTests.java b/bundles/org.eclipse.equinox.log.test/src/org/eclipse/equinox/log/test/AllTests.java
deleted file mode 100644
index 328e7766e..000000000
--- a/bundles/org.eclipse.equinox.log.test/src/org/eclipse/equinox/log/test/AllTests.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others All rights reserved. This
- * program and the accompanying materials are 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: IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.log.test;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-public class AllTests {
-
- public static Test suite() {
- TestSuite suite = new TestSuite("Test for org.eclipse.equinox.log.test"); //$NON-NLS-1$
- suite.addTest(AllLogServiceTests.suite());
- suite.addTest(AllExtendedLogServiceTests.suite());
- return suite;
- }
-
-}
diff --git a/bundles/org.eclipse.equinox.log.test/src/org/eclipse/equinox/log/test/ExtendedLogReaderServiceTest.java b/bundles/org.eclipse.equinox.log.test/src/org/eclipse/equinox/log/test/ExtendedLogReaderServiceTest.java
deleted file mode 100644
index 8c758edfe..000000000
--- a/bundles/org.eclipse.equinox.log.test/src/org/eclipse/equinox/log/test/ExtendedLogReaderServiceTest.java
+++ /dev/null
@@ -1,148 +0,0 @@
-package org.eclipse.equinox.log.test;
-
-import junit.framework.TestCase;
-import org.eclipse.equinox.log.*;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.ServiceReference;
-import org.osgi.service.log.*;
-
-public class ExtendedLogReaderServiceTest extends TestCase {
-
- private ExtendedLogService log;
- private ServiceReference logReference;
- private ExtendedLogReaderService reader;
- private ServiceReference readerReference;
- private boolean called;
-
- public ExtendedLogReaderServiceTest(String name) {
- super(name);
- }
-
- protected void setUp() throws Exception {
- Activator.getBundle("org.eclipse.equinox.log").start();
- logReference = Activator.getBundleContext().getServiceReference(ExtendedLogService.class.getName());
- readerReference = Activator.getBundleContext().getServiceReference(ExtendedLogReaderService.class.getName());
-
- log = (ExtendedLogService) Activator.getBundleContext().getService(logReference);
- reader = (ExtendedLogReaderService) Activator.getBundleContext().getService(readerReference);
- }
-
- protected void tearDown() throws Exception {
- Activator.getBundleContext().ungetService(logReference);
- Activator.getBundleContext().ungetService(readerReference);
- Activator.getBundle("org.eclipse.equinox.log").stop();
- }
-
- public void testaddFilteredListener() throws Exception {
- TestListener listener = new TestListener();
- reader.addLogListener(listener, new LogFilter() {
- public boolean isLoggable(Bundle b, String loggerName, int logLevel) {
- return true;
- }
- });
- synchronized (listener) {
- log.log(LogService.LOG_INFO, "info");
- listener.wait();
- }
- assertTrue(listener.getEntry().getLevel() == LogService.LOG_INFO);
- }
-
- public void testaddNullFilterr() throws Exception {
- TestListener listener = new TestListener();
-
- try {
- reader.addLogListener(listener, null);
- } catch (IllegalArgumentException e) {
- return;
- }
- fail();
- }
-
- public void testaddFilteredListenerTwice() throws Exception {
- TestListener listener = new TestListener();
- reader.addLogListener(listener, new LogFilter() {
- public boolean isLoggable(Bundle b, String loggerName, int logLevel) {
- return false;
- }
- });
-
- if (log.isLoggable(LogService.LOG_INFO))
- fail();
-
- reader.addLogListener(listener, new LogFilter() {
- public boolean isLoggable(Bundle b, String loggerName, int logLevel) {
- return true;
- }
- });
- synchronized (listener) {
- log.log(LogService.LOG_INFO, "info");
- listener.wait();
- }
- assertTrue(listener.getEntry().getLevel() == LogService.LOG_INFO);
- }
-
- public void testaddNullListener() throws Exception {
- try {
- reader.addLogListener(null);
- } catch (IllegalArgumentException t) {
- return;
- }
- fail();
- }
-
- public void testBadFilter() throws Exception {
- TestListener listener = new TestListener();
- reader.addLogListener(listener, new LogFilter() {
- public boolean isLoggable(Bundle b, String loggerName, int logLevel) {
- throw new RuntimeException("Expected error for testBadFilter.");
- }
- });
-
- if (log.isLoggable(LogService.LOG_INFO))
- fail();
- }
-
- public void testSynchronousLogListener() throws Exception {
- final Thread loggerThread = Thread.currentThread();
- called = false;
- LogListener listener = new SynchronousLogListener() {
- public void logged(LogEntry entry) {
- assertTrue(Thread.currentThread() == loggerThread);
- called = true;
- }
- };
- reader.addLogListener(listener);
- log.log(LogService.LOG_INFO, "info");
- assertTrue(called);
- }
-
- public void testExtendedLogEntry() throws Exception {
- TestListener listener = new TestListener();
- reader.addLogListener(listener);
- long timeBeforeLog = System.currentTimeMillis();
- String threadName = Thread.currentThread().getName();
- long threadId = Thread.currentThread().getId();
- synchronized (listener) {
- log.getLogger("test").log(logReference, LogService.LOG_INFO, "info", new Throwable("test"));
- listener.wait();
- }
- long sequenceNumberBefore = listener.getEntryX().getSequenceNumber();
-
- synchronized (listener) {
- log.getLogger("test").log(logReference, LogService.LOG_INFO, "info", new Throwable("test"));
- listener.wait();
- }
- assertTrue(listener.getEntryX().getBundle() == Activator.getBundleContext().getBundle());
- assertTrue(listener.getEntryX().getMessage().equals("info"));
- assertTrue(listener.getEntryX().getException().getMessage().equals("test"));
- assertTrue(listener.getEntryX().getServiceReference() == logReference);
- assertTrue(listener.getEntryX().getTime() >= timeBeforeLog);
- assertTrue(listener.getEntryX().getLevel() == LogService.LOG_INFO);
-
- assertTrue(listener.getEntryX().getLoggerName().equals("test"));
- assertTrue(listener.getEntryX().getThreadName().equals(threadName));
- assertTrue(listener.getEntryX().getThreadId() == threadId);
- assertTrue(listener.getEntryX().getContext() == logReference);
- assertTrue(listener.getEntryX().getSequenceNumber() > sequenceNumberBefore);
- }
-}
diff --git a/bundles/org.eclipse.equinox.log.test/src/org/eclipse/equinox/log/test/ExtendedLogServiceTest.java b/bundles/org.eclipse.equinox.log.test/src/org/eclipse/equinox/log/test/ExtendedLogServiceTest.java
deleted file mode 100644
index 484ad7f9d..000000000
--- a/bundles/org.eclipse.equinox.log.test/src/org/eclipse/equinox/log/test/ExtendedLogServiceTest.java
+++ /dev/null
@@ -1,195 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2009 IBM Corporation and others All rights reserved. This
- * program and the accompanying materials are 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: IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.log.test;
-
-import junit.framework.TestCase;
-
-import org.eclipse.equinox.log.ExtendedLogReaderService;
-import org.eclipse.equinox.log.ExtendedLogService;
-import org.eclipse.equinox.log.LogFilter;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.ServiceReference;
-import org.osgi.service.log.LogService;
-
-public class ExtendedLogServiceTest extends TestCase {
-
- private Bundle bundle;
- private Bundle logBundle;
- private ExtendedLogService log;
- private ServiceReference logReference;
- private ExtendedLogReaderService reader;
- private ServiceReference readerReference;
- private TestListener listener;
-
- public ExtendedLogServiceTest(String name) {
- super(name);
- }
-
- protected void setUp() throws Exception {
- bundle = Activator.getBundleContext().getBundle();
- logBundle = Activator.getBundle("org.eclipse.equinox.log");
- logBundle.start();
- logReference = Activator.getBundleContext().getServiceReference(ExtendedLogService.class.getName());
- readerReference = Activator.getBundleContext().getServiceReference(ExtendedLogReaderService.class.getName());
-
- log = (ExtendedLogService) Activator.getBundleContext().getService(logReference);
- reader = (ExtendedLogReaderService) Activator.getBundleContext().getService(readerReference);
-
- listener = new TestListener();
- reader.addLogListener(listener);
- }
-
- protected void tearDown() throws Exception {
- reader.removeLogListener(listener);
- Activator.getBundleContext().ungetService(logReference);
- Activator.getBundleContext().ungetService(readerReference);
- logBundle.stop();
- }
-
- public void testLogContext() throws Exception {
- synchronized (listener) {
- log.log(this, LogService.LOG_INFO, null);
- listener.wait();
- }
- assertTrue(listener.getEntryX().getContext() == this);
- }
-
- public void testNullLogContext() throws Exception {
- synchronized (listener) {
- log.log(null, LogService.LOG_INFO, null);
- listener.wait();
- }
- assertTrue(listener.getEntryX().getContext() == null);
- }
-
- public void testLogContextWithNullThrowable() throws Exception {
- synchronized (listener) {
- log.log(this, LogService.LOG_INFO, null, null);
- listener.wait();
- }
- assertTrue(listener.getEntryX().getContext() == this);
- }
-
- public void testIsLoggableTrue() throws Exception {
- if (!log.isLoggable(LogService.LOG_INFO))
- fail();
- }
-
- public void testNotIsLoggableWithNoListener() throws Exception {
- reader.removeLogListener(listener);
- if (log.isLoggable(LogService.LOG_INFO))
- fail();
- }
-
- public void testNotIsLoggableWithListener() throws Exception {
- reader.addLogListener(listener, new LogFilter() {
-
- public boolean isLoggable(Bundle b, String loggerName, int logLevel) {
- return false;
- }
- });
- if (log.isLoggable(LogService.LOG_INFO))
- fail();
- }
-
- public void testNamedLoggerLogNull() throws Exception {
- synchronized (listener) {
- log.getLogger("test").log(null, 0, null, null);
- listener.wait();
- }
- assertTrue(listener.getEntryX().getLoggerName() == "test");
- assertTrue(listener.getEntry().getLevel() == 0);
- assertTrue(listener.getEntry().getMessage() == null);
- assertTrue(listener.getEntry().getException() == null);
- assertTrue(listener.getEntry().getServiceReference() == null);
- }
-
- public void testNullLoggerLogNull() throws Exception {
- synchronized (listener) {
- log.getLogger(null).log(null, 0, null, null);
- listener.wait();
- }
- assertTrue(listener.getEntryX().getLoggerName() == null);
- assertTrue(listener.getEntry().getLevel() == 0);
- assertTrue(listener.getEntry().getMessage() == null);
- assertTrue(listener.getEntry().getException() == null);
- assertTrue(listener.getEntry().getServiceReference() == null);
- }
-
- public void testNamedLoggerLogFull() throws Exception {
- String message = "test";
- Throwable t = new Throwable("test");
- synchronized (listener) {
- log.getLogger("test").log(logReference, LogService.LOG_INFO, message, t);
- listener.wait();
- }
- assertTrue(listener.getEntryX().getLoggerName() == "test");
- assertTrue(listener.getEntry().getBundle() == bundle);
- assertTrue(listener.getEntry().getLevel() == LogService.LOG_INFO);
- assertTrue(listener.getEntry().getMessage().equals(message));
- assertTrue(listener.getEntry().getException().getMessage().equals(t.getMessage()));
- assertTrue(listener.getEntry().getServiceReference() == logReference);
- }
-
- public void testNamedLoggerLogFullWithNullBundle() throws Exception {
- String message = "test";
- Throwable t = new Throwable("test");
- synchronized (listener) {
- log.getLogger(null, "test").log(logReference, LogService.LOG_INFO, message, t);
- listener.wait();
- }
- assertTrue(listener.getEntryX().getLoggerName() == "test");
- assertTrue(listener.getEntry().getBundle() == bundle);
- assertTrue(listener.getEntry().getLevel() == LogService.LOG_INFO);
- assertTrue(listener.getEntry().getMessage().equals(message));
- assertTrue(listener.getEntry().getException().getMessage().equals(t.getMessage()));
- assertTrue(listener.getEntry().getServiceReference() == logReference);
- }
-
- public void testNamedLoggerLogFullWithBundle() throws Exception {
- String message = "test";
- Throwable t = new Throwable("test");
- synchronized (listener) {
- log.getLogger(bundle, "test").log(logReference, LogService.LOG_INFO, message, t);
- listener.wait();
- }
- assertTrue(listener.getEntryX().getLoggerName() == "test");
- assertTrue(listener.getEntry().getBundle() == bundle);
- assertTrue(listener.getEntry().getLevel() == LogService.LOG_INFO);
- assertTrue(listener.getEntry().getMessage().equals(message));
- assertTrue(listener.getEntry().getException().getMessage().equals(t.getMessage()));
- assertTrue(listener.getEntry().getServiceReference() == logReference);
- }
-
- public void testLoggerIsLoggableTrue() throws Exception {
- reader.addLogListener(listener, new LogFilter() {
-
- public boolean isLoggable(Bundle b, String loggerName, int logLevel) {
- if (loggerName.equals("test"))
- return true;
- return false;
- }
- });
- if (!log.getLogger("test").isLoggable(LogService.LOG_INFO))
- fail();
- }
-
- public void testLoggerNotIsLoggableWithListener() throws Exception {
- reader.addLogListener(listener, new LogFilter() {
-
- public boolean isLoggable(Bundle b, String loggerName, int logLevel) {
- if (loggerName.equals("test"))
- return false;
- return true;
- }
- });
- if (log.getLogger("test").isLoggable(LogService.LOG_INFO))
- fail();
- }
-}
diff --git a/bundles/org.eclipse.equinox.log.test/src/org/eclipse/equinox/log/test/LogPermissionCollectionTest.java b/bundles/org.eclipse.equinox.log.test/src/org/eclipse/equinox/log/test/LogPermissionCollectionTest.java
deleted file mode 100644
index 8ba15bde0..000000000
--- a/bundles/org.eclipse.equinox.log.test/src/org/eclipse/equinox/log/test/LogPermissionCollectionTest.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.eclipse.equinox.log.test;
-
-import junit.framework.TestCase;
-import org.eclipse.equinox.log.LogPermission;
-import org.eclipse.equinox.log.LogPermissionCollection;
-
-public class LogPermissionCollectionTest extends TestCase {
-
- public void testImplies() {
-
- LogPermission permission = new LogPermission("*", "*"); //$NON-NLS-1$//$NON-NLS-2$
- LogPermissionCollection permissionCollection = new LogPermissionCollection();
- assertFalse(permissionCollection.implies(permission));
- permissionCollection.add(permission);
- assertTrue(permissionCollection.implies(permission));
- }
-
-}
diff --git a/bundles/org.eclipse.equinox.log.test/src/org/eclipse/equinox/log/test/LogReaderServiceTest.java b/bundles/org.eclipse.equinox.log.test/src/org/eclipse/equinox/log/test/LogReaderServiceTest.java
deleted file mode 100644
index c637c6c7e..000000000
--- a/bundles/org.eclipse.equinox.log.test/src/org/eclipse/equinox/log/test/LogReaderServiceTest.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2009 IBM Corporation and others All rights reserved. This
- * program and the accompanying materials are 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: IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.log.test;
-
-import java.util.Hashtable;
-import junit.framework.TestCase;
-import org.osgi.framework.*;
-import org.osgi.service.log.*;
-
-public class LogReaderServiceTest extends TestCase {
-
- private LogService log;
- private ServiceReference logReference;
- private LogReaderService reader;
- private ServiceReference readerReference;
-
- public LogReaderServiceTest(String name) {
- super(name);
- }
-
- protected void setUp() throws Exception {
- Activator.getBundle("org.eclipse.equinox.log").start(); //$NON-NLS-1$
- logReference = Activator.getBundleContext().getServiceReference(LogService.class.getName());
- readerReference = Activator.getBundleContext().getServiceReference(LogReaderService.class.getName());
-
- log = (LogService) Activator.getBundleContext().getService(logReference);
- reader = (LogReaderService) Activator.getBundleContext().getService(readerReference);
- }
-
- protected void tearDown() throws Exception {
- Activator.getBundleContext().ungetService(logReference);
- Activator.getBundleContext().ungetService(readerReference);
- Activator.getBundle("org.eclipse.equinox.log").stop(); //$NON-NLS-1$
- }
-
- public void testaddListener() throws Exception {
- TestListener listener = new TestListener();
- reader.addLogListener(listener);
- synchronized (listener) {
- log.log(LogService.LOG_INFO, "info"); //$NON-NLS-1$
- listener.wait();
- }
- assertTrue(listener.getEntry().getLevel() == LogService.LOG_INFO);
- }
-
- public void testaddListenerTwice() throws Exception {
- TestListener listener = new TestListener();
- reader.addLogListener(listener);
- reader.addLogListener(listener);
- synchronized (listener) {
- log.log(LogService.LOG_INFO, "info"); //$NON-NLS-1$
- listener.wait();
- }
- assertTrue(listener.getEntry().getLevel() == LogService.LOG_INFO);
- }
-
- public void testaddNullListener() throws Exception {
- try {
- reader.addLogListener(null);
- } catch (IllegalArgumentException t) {
- return;
- }
- fail();
- }
-
- public void testBadListener() throws Exception {
- LogListener listener = new LogListener() {
- public synchronized void logged(LogEntry entry) {
- notifyAll();
- throw new RuntimeException("Expected error for testBadListener."); //$NON-NLS-1$
- }
- };
- reader.addLogListener(listener);
-
- synchronized (listener) {
- log.log(LogService.LOG_INFO, "info"); //$NON-NLS-1$
- listener.wait();
- }
- }
-
- public void testLogEntry() throws Exception {
- TestListener listener = new TestListener();
- reader.addLogListener(listener);
- long timeBeforeLog = System.currentTimeMillis();
- synchronized (listener) {
- log.log(logReference, LogService.LOG_INFO, "info", new Throwable("test")); //$NON-NLS-1$ //$NON-NLS-2$
- listener.wait();
- }
- assertTrue(listener.getEntry().getBundle() == Activator.getBundleContext().getBundle());
- assertTrue(listener.getEntry().getMessage().equals("info")); //$NON-NLS-1$
- assertTrue(listener.getEntry().getException().getMessage().equals("test")); //$NON-NLS-1$
- assertTrue(listener.getEntry().getServiceReference() == logReference);
- assertTrue(listener.getEntry().getTime() >= timeBeforeLog);
- assertTrue(listener.getEntry().getLevel() == LogService.LOG_INFO);
- }
-
- public void testLogBundleEventInfo() throws Exception {
-
- // this is just a bundle that is harmless to start/stop
- Bundle servicesBundle = Activator.getBundle("org.eclipse.osgi.services"); //$NON-NLS-1$
- if (servicesBundle == null)
- return; // ignore
-
- servicesBundle.stop();
-
- TestListener listener = new TestListener();
- reader.addLogListener(listener);
- synchronized (listener) {
- servicesBundle.start();
- listener.wait();
- }
- assertTrue(listener.getEntry().getLevel() == LogService.LOG_INFO);
- }
-
- public void testLogServiceEventInfo() throws Exception {
- TestListener listener = new TestListener();
- reader.addLogListener(listener);
- synchronized (listener) {
- Activator.getBundleContext().registerService(Object.class.getName(), new Object(), null);
- listener.wait();
- }
- assertTrue(listener.getEntry().getLevel() == LogService.LOG_INFO);
- }
-
- public void testLogServiceEventDebug() throws Exception {
- ServiceRegistration registration = Activator.getBundleContext().registerService(Object.class.getName(), new Object(), null);
-
- TestListener listener = new TestListener();
- reader.addLogListener(listener);
- synchronized (listener) {
- registration.setProperties(new Hashtable());
- listener.wait();
- }
- assertTrue(listener.getEntry().getLevel() == LogService.LOG_DEBUG);
- }
-
- public void testLogFrameworkEvent() throws Exception {
- TestListener listener = new TestListener();
- reader.addLogListener(listener);
- synchronized (listener) {
- Activator.refreshPackages();
- listener.wait();
- }
- assertTrue(listener.getEntry().getLevel() == LogService.LOG_INFO);
- }
-}
diff --git a/bundles/org.eclipse.equinox.log.test/src/org/eclipse/equinox/log/test/LogServiceTest.java b/bundles/org.eclipse.equinox.log.test/src/org/eclipse/equinox/log/test/LogServiceTest.java
deleted file mode 100644
index 5c7371d9e..000000000
--- a/bundles/org.eclipse.equinox.log.test/src/org/eclipse/equinox/log/test/LogServiceTest.java
+++ /dev/null
@@ -1,245 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2009 IBM Corporation and others All rights reserved. This
- * program and the accompanying materials are 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: IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.log.test;
-
-import junit.framework.TestCase;
-import org.osgi.framework.ServiceReference;
-import org.osgi.service.log.LogReaderService;
-import org.osgi.service.log.LogService;
-
-public class LogServiceTest extends TestCase {
-
- private LogService log;
- private ServiceReference logReference;
- private LogReaderService reader;
- private ServiceReference readerReference;
- private TestListener listener;
-
- public LogServiceTest(String name) {
- super(name);
- }
-
- protected void setUp() throws Exception {
- Activator.getBundle("org.eclipse.equinox.log").start(); //$NON-NLS-1$
- logReference = Activator.getBundleContext().getServiceReference(LogService.class.getName());
- readerReference = Activator.getBundleContext().getServiceReference(LogReaderService.class.getName());
-
- log = (LogService) Activator.getBundleContext().getService(logReference);
- reader = (LogReaderService) Activator.getBundleContext().getService(readerReference);
-
- listener = new TestListener();
- reader.addLogListener(listener);
- }
-
- protected void tearDown() throws Exception {
- reader.removeLogListener(listener);
- Activator.getBundleContext().ungetService(logReference);
- Activator.getBundleContext().ungetService(readerReference);
- Activator.getBundle("org.eclipse.equinox.log").stop(); //$NON-NLS-1$
- }
-
- public void testLogDebug() throws Exception {
- synchronized (listener) {
- log.log(LogService.LOG_DEBUG, "debug"); //$NON-NLS-1$
- listener.wait();
- }
- assertTrue(listener.getEntry().getLevel() == LogService.LOG_DEBUG);
- }
-
- public void testLogError() throws Exception {
- synchronized (listener) {
- log.log(LogService.LOG_ERROR, "error"); //$NON-NLS-1$
- listener.wait();
- }
- assertTrue(listener.getEntry().getLevel() == LogService.LOG_ERROR);
- }
-
- public void testLogInfo() throws Exception {
- synchronized (listener) {
- log.log(LogService.LOG_INFO, "info"); //$NON-NLS-1$
- listener.wait();
- }
- assertTrue(listener.getEntry().getLevel() == LogService.LOG_INFO);
- }
-
- public void testLogWarning() throws Exception {
- synchronized (listener) {
- log.log(LogService.LOG_WARNING, "warning"); //$NON-NLS-1$
- listener.wait();
- }
- assertTrue(listener.getEntry().getLevel() == LogService.LOG_WARNING);
- }
-
- public void testLogZeroLevel() throws Exception {
- synchronized (listener) {
- log.log(0, "zero"); //$NON-NLS-1$
- listener.wait();
- }
- assertTrue(listener.getEntry().getLevel() == 0);
- }
-
- public void testLogNegativeLevel() throws Exception {
- synchronized (listener) {
- log.log(-1, "negative"); //$NON-NLS-1$
- listener.wait();
- }
- assertTrue(listener.getEntry().getLevel() == -1);
- }
-
- public void testLogMessage() throws Exception {
- synchronized (listener) {
- log.log(LogService.LOG_INFO, "message"); //$NON-NLS-1$
- listener.wait();
- }
- assertTrue(listener.getEntry().getMessage().equals("message")); //$NON-NLS-1$
- }
-
- public void testLogNullMessage() throws Exception {
- synchronized (listener) {
- log.log(LogService.LOG_INFO, null);
- listener.wait();
- }
- assertTrue(listener.getEntry().getMessage() == null);
- }
-
- public void testLogThrowable() throws Exception {
- Throwable t = new Throwable("throwable"); //$NON-NLS-1$
- synchronized (listener) {
- log.log(LogService.LOG_INFO, null, t);
- listener.wait();
- }
- assertTrue(listener.getEntry().getException().getMessage().equals(t.getMessage()));
- }
-
- public void testLogNullThrowable() throws Exception {
- synchronized (listener) {
- log.log(LogService.LOG_INFO, null, null);
- listener.wait();
- }
- assertTrue(listener.getEntry().getException() == null);
- }
-
- public void testLogServiceReference() throws Exception {
- synchronized (listener) {
- log.log(logReference, LogService.LOG_INFO, null);
- listener.wait();
- }
- assertTrue(listener.getEntry().getServiceReference().equals(logReference));
- }
-
- public void testNullLogServiceReference() throws Exception {
- synchronized (listener) {
- log.log(null, LogService.LOG_INFO, null);
- listener.wait();
- }
- assertTrue(listener.getEntry().getServiceReference() == null);
- }
-
- public void testLogServiceReferenceWithNullThrowable() throws Exception {
- synchronized (listener) {
- log.log(logReference, LogService.LOG_INFO, null, null);
- listener.wait();
- }
- assertTrue(listener.getEntry().getServiceReference().equals(logReference));
- }
-
- public void testLogNull1() throws Exception {
- synchronized (listener) {
- log.log(0, null);
- listener.wait();
- }
- assertTrue(listener.getEntry().getLevel() == 0);
- assertTrue(listener.getEntry().getMessage() == null);
- assertTrue(listener.getEntry().getException() == null);
- assertTrue(listener.getEntry().getServiceReference() == null);
- }
-
- public void testLogNull2() throws Exception {
- synchronized (listener) {
- log.log(0, null, null);
- listener.wait();
- }
- assertTrue(listener.getEntry().getLevel() == 0);
- assertTrue(listener.getEntry().getMessage() == null);
- assertTrue(listener.getEntry().getException() == null);
- assertTrue(listener.getEntry().getServiceReference() == null);
- }
-
- public void testLogNull3() throws Exception {
- synchronized (listener) {
- log.log(null, 0, null);
- listener.wait();
- }
- assertTrue(listener.getEntry().getLevel() == 0);
- assertTrue(listener.getEntry().getMessage() == null);
- assertTrue(listener.getEntry().getException() == null);
- assertTrue(listener.getEntry().getServiceReference() == null);
- }
-
- public void testLogNull4() throws Exception {
- synchronized (listener) {
- log.log(null, 0, null, null);
- listener.wait();
- }
- assertTrue(listener.getEntry().getLevel() == 0);
- assertTrue(listener.getEntry().getMessage() == null);
- assertTrue(listener.getEntry().getException() == null);
- assertTrue(listener.getEntry().getServiceReference() == null);
- }
-
- public void testLogFull1() throws Exception {
- String message = "test"; //$NON-NLS-1$
- synchronized (listener) {
- log.log(LogService.LOG_INFO, message);
- listener.wait();
- }
- assertTrue(listener.getEntry().getLevel() == LogService.LOG_INFO);
- assertTrue(listener.getEntry().getMessage().equals(message));
- assertTrue(listener.getEntry().getException() == null);
- assertTrue(listener.getEntry().getServiceReference() == null);
- }
-
- public void testLogFull2() throws Exception {
- String message = "test"; //$NON-NLS-1$
- Throwable t = new Throwable("test"); //$NON-NLS-1$
- synchronized (listener) {
- log.log(LogService.LOG_INFO, message, t);
- listener.wait();
- }
- assertTrue(listener.getEntry().getLevel() == LogService.LOG_INFO);
- assertTrue(listener.getEntry().getMessage().equals(message));
- assertTrue(listener.getEntry().getException().getMessage().equals(t.getMessage()));
- assertTrue(listener.getEntry().getServiceReference() == null);
- }
-
- public void testLogFull3() throws Exception {
- String message = "test"; //$NON-NLS-1$
- synchronized (listener) {
- log.log(logReference, LogService.LOG_INFO, message);
- listener.wait();
- }
- assertTrue(listener.getEntry().getLevel() == LogService.LOG_INFO);
- assertTrue(listener.getEntry().getMessage().equals(message));
- assertTrue(listener.getEntry().getException() == null);
- assertTrue(listener.getEntry().getServiceReference() == logReference);
- }
-
- public void testLogFull4() throws Exception {
- String message = "test"; //$NON-NLS-1$
- Throwable t = new Throwable("test"); //$NON-NLS-1$
- synchronized (listener) {
- log.log(logReference, LogService.LOG_INFO, message, t);
- listener.wait();
- }
- assertTrue(listener.getEntry().getLevel() == LogService.LOG_INFO);
- assertTrue(listener.getEntry().getMessage().equals(message));
- assertTrue(listener.getEntry().getException().getMessage().equals(t.getMessage()));
- assertTrue(listener.getEntry().getServiceReference() == logReference);
- }
-}
diff --git a/bundles/org.eclipse.equinox.log.test/src/org/eclipse/equinox/log/test/TestListener.java b/bundles/org.eclipse.equinox.log.test/src/org/eclipse/equinox/log/test/TestListener.java
deleted file mode 100644
index 8e3ec71b6..000000000
--- a/bundles/org.eclipse.equinox.log.test/src/org/eclipse/equinox/log/test/TestListener.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2009 IBM Corporation All rights reserved. This program
- * and the accompanying materials are 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
- *******************************************************************************/
-package org.eclipse.equinox.log.test;
-
-import org.eclipse.equinox.log.ExtendedLogEntry;
-import org.osgi.framework.Bundle;
-import org.osgi.service.log.LogEntry;
-import org.osgi.service.log.LogListener;
-
-class TestListener implements LogListener {
- LogEntry entry;
- final Bundle logImpl = Activator.getBundle("org.eclipse.equinox.log");
-
- public synchronized void logged(LogEntry entry) {
- if (entry.getBundle() == logImpl)
- return; // discard logs from the logImpl
- this.entry = entry;
- notifyAll();
- }
-
- public synchronized LogEntry getEntry() {
- return entry;
- }
-
- public synchronized ExtendedLogEntry getEntryX() {
- return (ExtendedLogEntry) entry;
- }
-} \ No newline at end of file
diff --git a/pom.xml b/pom.xml
index d3c58a57a..75e12344b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -115,9 +115,6 @@
<module>bundles/org.eclipse.equinox.jsp.jasper</module>
<module>bundles/org.eclipse.equinox.jsp.jasper.registry</module>
<module>bundles/org.eclipse.equinox.log</module>
-<!-- https://bugs.eclipse.org/bugs/show_bug.cgi?id=418663
- <module>bundles/org.eclipse.equinox.log.test</module>
--->
<module>bundles/org.eclipse.equinox.metatype</module>
<module>bundles/org.eclipse.equinox.region</module>
<module>bundles/org.eclipse.equinox.servletbridge</module>

Back to the top