[slf4j-dev] svn commit: r658 - in slf4j/trunk: . jcl104-over-slf4j jcl104-over-slf4j/src/main/java/org/apache/commons/logging/impl log4j-over-slf4j log4j-over-slf4j/src/main/java/org/apache/log4j slf4j-api slf4j-archetype slf4j-jcl slf4j-jcl/src/main/java/org/slf4j/impl slf4j-jdk14 slf4j-jdk14/src/main/java/org/slf4j/impl slf4j-log4j12 slf4j-log4j12/src/main/java/org/slf4j/impl slf4j-nop slf4j-simple slf4j-simple/src/main/java/org/slf4j/impl slf4j-site slf4j-site/src/site/xdocs slf4j-skin
ceki at slf4j.org
ceki at slf4j.org
Sat Nov 4 19:35:33 CET 2006
Author: ceki
Date: Sat Nov 4 19:35:32 2006
New Revision: 658
Added:
slf4j/trunk/codeStyle.xml
Modified:
slf4j/trunk/jcl104-over-slf4j/pom.xml
slf4j/trunk/jcl104-over-slf4j/src/main/java/org/apache/commons/logging/impl/SLF4FLogFactory.java
slf4j/trunk/log4j-over-slf4j/pom.xml
slf4j/trunk/log4j-over-slf4j/src/main/java/org/apache/log4j/Log4jLoggerFactory.java
slf4j/trunk/pom.xml
slf4j/trunk/slf4j-api/pom.xml
slf4j/trunk/slf4j-archetype/pom.xml
slf4j/trunk/slf4j-jcl/pom.xml
slf4j/trunk/slf4j-jcl/src/main/java/org/slf4j/impl/JCLLoggerFactory.java
slf4j/trunk/slf4j-jdk14/pom.xml
slf4j/trunk/slf4j-jdk14/src/main/java/org/slf4j/impl/JDK14LoggerFactory.java
slf4j/trunk/slf4j-log4j12/pom.xml
slf4j/trunk/slf4j-log4j12/src/main/java/org/slf4j/impl/Log4jLoggerFactory.java
slf4j/trunk/slf4j-nop/pom.xml
slf4j/trunk/slf4j-simple/pom.xml
slf4j/trunk/slf4j-simple/src/main/java/org/slf4j/impl/SimpleLoggerFactory.java
slf4j/trunk/slf4j-site/pom.xml
slf4j/trunk/slf4j-site/src/site/xdocs/news.xml
slf4j/trunk/slf4j-skin/pom.xml
slf4j/trunk/updateBundle.sh
Log:
- Fixed synchronisation related bug number 27.
See also http://bugzilla.slf4j.org/show_bug.cgi?id=27
- added eclipse codeStyle.xml
- The various SLF4J inherit their version number through a poperty,
namely "aversion", defined in the parent pom. This little trick seems
to work well and saves alot of time.
Added: slf4j/trunk/codeStyle.xml
==============================================================================
--- (empty file)
+++ slf4j/trunk/codeStyle.xml Sat Nov 4 19:35:32 2006
@@ -0,0 +1,251 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<profiles version="10">
+<profile name="slf4jCodeStyle" version="10">
+<setting id="org.eclipse.jdt.core.formatter.align_type_members_on_columns" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_assignment" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_binary_expression" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_if" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression" value="80"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_multiple_fields" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_imports" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_package" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_field" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_member_type" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_method" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_package" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_array_initializer" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block_in_case" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_constant" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_method_declaration" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_switch" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_type_declaration" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_comments" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_header" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_html" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_source_code" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.indent_parameter_description" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.indent_root_tags" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="80"/>
+<setting id="org.eclipse.jdt.core.formatter.compact_else_if" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="2"/>
+<setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="2"/>
+<setting id="org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_empty_lines" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_block" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_body" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.indentation.size" value="8"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_binary_operator" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_ellipsis" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_unary_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_binary_operator" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_ellipsis" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_unary_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.lineSplit" value="80"/>
+<setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="space"/>
+<setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="2"/>
+<setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="false"/>
+</profile>
+</profiles>
Modified: slf4j/trunk/jcl104-over-slf4j/pom.xml
==============================================================================
--- slf4j/trunk/jcl104-over-slf4j/pom.xml (original)
+++ slf4j/trunk/jcl104-over-slf4j/pom.xml Sat Nov 4 19:35:32 2006
@@ -3,14 +3,14 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.1.0-beta0</version>
+ <version>1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.slf4j</groupId>
<artifactId>jcl104-over-slf4j</artifactId>
- <version>${parent.version}</version>
+ <version>${aversion}</version>
<packaging>jar</packaging>
<name>JCL Implemented Over SLF4J</name>
@@ -26,9 +26,6 @@
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
-
-
</dependencies>
-
</project>
\ No newline at end of file
Modified: slf4j/trunk/jcl104-over-slf4j/src/main/java/org/apache/commons/logging/impl/SLF4FLogFactory.java
==============================================================================
--- slf4j/trunk/jcl104-over-slf4j/src/main/java/org/apache/commons/logging/impl/SLF4FLogFactory.java (original)
+++ slf4j/trunk/jcl104-over-slf4j/src/main/java/org/apache/commons/logging/impl/SLF4FLogFactory.java Sat Nov 4 19:35:32 2006
@@ -31,15 +31,15 @@
/**
* <p>
* Concrete subclass of {@link LogFactory} which always delegates to the
- * {@link LoggerFactory org.slf4j.LoggerFactory} class.
+ * {@link LoggerFactory org.slf4j.LoggerFactory} class.
*
* <p>
- * This factory generates instances of {@link SLF4JLog}. It will remember
- * previously created instances for the same name, and will
- * return them on repeated requests to the
- * <code>getInstance()</code> method.
+ * This factory generates instances of {@link SLF4JLog}. It will remember
+ * previously created instances for the same name, and will return them on
+ * repeated requests to the <code>getInstance()</code> method.
*
- * <p>This implementation ignores any configured attributes.
+ * <p>
+ * This implementation ignores any configured attributes.
* </p>
*
* @author Rod Waldhoff
@@ -146,12 +146,15 @@
* if a suitable <code>Log</code> instance cannot be returned
*/
public Log getInstance(String name) throws LogConfigurationException {
-
- Log instance = (Log) loggerMap.get(name);
- if (instance == null) {
- Logger logger = LoggerFactory.getLogger(name);
- instance = new SLF4JLog(logger);
- loggerMap.put(name, instance);
+ Log instance = null;
+ // protect against concurrent access of loggerMap
+ synchronized (this) {
+ instance = (Log) loggerMap.get(name);
+ if (instance == null) {
+ Logger logger = LoggerFactory.getLogger(name);
+ instance = new SLF4JLog(logger);
+ loggerMap.put(name, instance);
+ }
}
return (instance);
@@ -166,15 +169,19 @@
*/
public void release() {
// This method is never called by jcl-over-slf4j classes. However,
- // in certain deployment scenarios, in particular if jcl104-over-slf4j.jar is
+ // in certain deployment scenarios, in particular if jcl104-over-slf4j.jar
+ // is
// in the the web-app class loader and the official commons-logging.jar is
- // deployed in some parent class loader (e.g. commons/lib), then it is possible
- // for the parent class loader to mask the classes shipping in
+ // deployed in some parent class loader (e.g. commons/lib), then it is
+ // possible
+ // for the parent class loader to mask the classes shipping in
// jcl104-over-slf4j.jar.
- System.out.println("WARN: The method "+SLF4FLogFactory.class+"#release() was invoked.");
- System.out.println("WARN: Please see http://www.slf4j.org/codes.html for an explanation.");
- System.out.flush();
- }
+ System.out.println("WARN: The method " + SLF4FLogFactory.class
+ + "#release() was invoked.");
+ System.out
+ .println("WARN: Please see http://www.slf4j.org/codes.html for an explanation.");
+ System.out.flush();
+ }
/**
* Remove any configuration attribute associated with the specified name. If
Modified: slf4j/trunk/log4j-over-slf4j/pom.xml
==============================================================================
--- slf4j/trunk/log4j-over-slf4j/pom.xml (original)
+++ slf4j/trunk/log4j-over-slf4j/pom.xml Sat Nov 4 19:35:32 2006
@@ -3,14 +3,14 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.1.0-beta0</version>
+ <version>1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
- <version>${parent.version}</version>
+ <version>${aversion}</version>
<packaging>jar</packaging>
<name>Log4j Implemented Over SLF4J</name>
Modified: slf4j/trunk/log4j-over-slf4j/src/main/java/org/apache/log4j/Log4jLoggerFactory.java
==============================================================================
--- slf4j/trunk/log4j-over-slf4j/src/main/java/org/apache/log4j/Log4jLoggerFactory.java (original)
+++ slf4j/trunk/log4j-over-slf4j/src/main/java/org/apache/log4j/Log4jLoggerFactory.java Sat Nov 4 19:35:32 2006
@@ -12,7 +12,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
+ */
package org.apache.log4j;
@@ -29,16 +29,16 @@
*/
public class Log4jLoggerFactory {
- private static Hashtable log4jLoggers = new Hashtable();
+ private static Hashtable log4jLoggers = new Hashtable();
- public static Logger getLogger(String name) {
- if (log4jLoggers.containsKey(name)) {
- return (org.apache.log4j.Logger) log4jLoggers.get(name);
- } else {
- Logger log4jLogger = new Logger(name);
- log4jLoggers.put(name, log4jLogger);
- return log4jLogger;
- }
- }
+ public static synchronized Logger getLogger(String name) {
+ if (log4jLoggers.containsKey(name)) {
+ return (org.apache.log4j.Logger) log4jLoggers.get(name);
+ } else {
+ Logger log4jLogger = new Logger(name);
+ log4jLoggers.put(name, log4jLogger);
+ return log4jLogger;
+ }
+ }
}
Modified: slf4j/trunk/pom.xml
==============================================================================
--- slf4j/trunk/pom.xml (original)
+++ slf4j/trunk/pom.xml Sat Nov 4 19:35:32 2006
@@ -5,14 +5,17 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.1.0-beta0</version>
+ <version>1.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>SLF4J</name>
-
<url>http://www.slf4j.org</url>
+ <properties>
+ <aversion>1.1.0-RC0</aversion>
+ </properties>
+
<organization>
<name>QOS.ch</name>
<url>http://www.qos.ch</url>
@@ -41,6 +44,8 @@
<scope>test</scope>
</dependency>
</dependencies>
+
+
<dependencyManagement>
<dependencies/>
@@ -118,6 +123,15 @@
</build>
+ <profiles>
+ <profile>
+ <id>skipTests</id>
+ <properties>
+ <maven.test.skip>true</maven.test.skip>
+ </properties>
+ </profile>
+ </profiles>
+
<reporting>
<plugins>
@@ -135,14 +149,14 @@
</plugin>
<plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.1</version>
- <configuration>
- <descriptors>
- <descriptor>
- src/main/assembly/source.xml
- </descriptor>
- </descriptors>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.1</version>
+ <configuration>
+ <descriptors>
+ <descriptor>
+ src/main/assembly/source.xml
+ </descriptor>
+ </descriptors>
<finalName>slf4j-${project.version}</finalName>
<appendAssemblyId>false</appendAssemblyId>
<outputDirectory>target/site/dist/</outputDirectory>
Modified: slf4j/trunk/slf4j-api/pom.xml
==============================================================================
--- slf4j/trunk/slf4j-api/pom.xml (original)
+++ slf4j/trunk/slf4j-api/pom.xml Sat Nov 4 19:35:32 2006
@@ -6,14 +6,14 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.1.0-beta0</version>
+ <version>1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>${parent.version}</version>
+ <version>${aversion}</version>
<packaging>jar</packaging>
<name>SLF4J API Module</name>
@@ -26,7 +26,6 @@
</dependencies>
-
<build>
<plugins>
<plugin>
Modified: slf4j/trunk/slf4j-archetype/pom.xml
==============================================================================
--- slf4j/trunk/slf4j-archetype/pom.xml (original)
+++ slf4j/trunk/slf4j-archetype/pom.xml Sat Nov 4 19:35:32 2006
@@ -2,7 +2,7 @@
<parent>
<artifactId>slf4j-parent</artifactId>
<groupId>org.slf4j</groupId>
- <version>1.1.0-beta0</version>
+ <version>1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -10,7 +10,7 @@
<artifactId>slf4j-archetype</artifactId>
<name>Archetype - slf4j-archetype</name>
<packaging>jar</packaging>
- <version>${parent.version}</version>
+ <version>${aversion}</version>
<url>http://www.slf4j.org</url>
Modified: slf4j/trunk/slf4j-jcl/pom.xml
==============================================================================
--- slf4j/trunk/slf4j-jcl/pom.xml (original)
+++ slf4j/trunk/slf4j-jcl/pom.xml Sat Nov 4 19:35:32 2006
@@ -3,14 +3,14 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.1.0-beta0</version>
+ <version>1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jcl</artifactId>
- <version>${parent.version}</version>
+ <version>${aversion}</version>
<packaging>jar</packaging>
<name>SLF4J JCL Binding</name>
Modified: slf4j/trunk/slf4j-jcl/src/main/java/org/slf4j/impl/JCLLoggerFactory.java
==============================================================================
--- slf4j/trunk/slf4j-jcl/src/main/java/org/slf4j/impl/JCLLoggerFactory.java (original)
+++ slf4j/trunk/slf4j-jcl/src/main/java/org/slf4j/impl/JCLLoggerFactory.java Sat Nov 4 19:35:32 2006
@@ -41,9 +41,9 @@
import org.slf4j.Logger;
/**
- * JCLLoggerFactory is an implementation of {@link ILoggerFactory}
- * returning the appropriately named {@link JCLLoggerAdapter} instance.
- *
+ * JCLLoggerFactory is an implementation of {@link ILoggerFactory} returning the
+ * appropriately named {@link JCLLoggerAdapter} instance.
+ *
* @author Ceki Gülcü
*/
public class JCLLoggerFactory implements ILoggerFactory {
@@ -55,15 +55,21 @@
loggerMap = new HashMap();
}
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
+ *
* @see org.slf4j.ILoggerFactory#getLogger(java.lang.String)
*/
public Logger getLogger(String name) {
- Logger logger = (Logger) loggerMap.get(name);
- if (logger == null) {
- org.apache.commons.logging.Log jclLogger = LogFactory.getLog(name);
- logger = new JCLLoggerAdapter(jclLogger, name);
- loggerMap.put(name, logger);
+ Logger logger = null;
+ // protect against concurrent access of loggerMap
+ synchronized (this) {
+ logger = (Logger) loggerMap.get(name);
+ if (logger == null) {
+ org.apache.commons.logging.Log jclLogger = LogFactory.getLog(name);
+ logger = new JCLLoggerAdapter(jclLogger, name);
+ loggerMap.put(name, logger);
+ }
}
return logger;
}
Modified: slf4j/trunk/slf4j-jdk14/pom.xml
==============================================================================
--- slf4j/trunk/slf4j-jdk14/pom.xml (original)
+++ slf4j/trunk/slf4j-jdk14/pom.xml Sat Nov 4 19:35:32 2006
@@ -6,14 +6,15 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.1.0-beta0</version>
+ <version>1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
- <version>${parent.version}</version>
+ <version>${aversion}</version>
+
<packaging>jar</packaging>
<name>SLF4J JDK14 Binding</name>
Modified: slf4j/trunk/slf4j-jdk14/src/main/java/org/slf4j/impl/JDK14LoggerFactory.java
==============================================================================
--- slf4j/trunk/slf4j-jdk14/src/main/java/org/slf4j/impl/JDK14LoggerFactory.java (original)
+++ slf4j/trunk/slf4j-jdk14/src/main/java/org/slf4j/impl/JDK14LoggerFactory.java Sat Nov 4 19:35:32 2006
@@ -40,9 +40,9 @@
import java.util.Map;
/**
- * JDK14LoggerFactory is an implementation of {@link ILoggerFactory}
- * returning the appropriately named {@link JDK14LoggerAdapter} instance.
- *
+ * JDK14LoggerFactory is an implementation of {@link ILoggerFactory} returning
+ * the appropriately named {@link JDK14LoggerAdapter} instance.
+ *
* @author Ceki Gülcü
*/
public class JDK14LoggerFactory implements ILoggerFactory {
@@ -54,15 +54,22 @@
loggerMap = new HashMap();
}
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
+ *
* @see org.slf4j.ILoggerFactory#getLogger(java.lang.String)
*/
- public Logger getLogger(String name) {
- Logger ulogger = (Logger) loggerMap.get(name);
- if (ulogger == null) {
- java.util.logging.Logger logger = java.util.logging.Logger.getLogger(name);
- ulogger = new JDK14LoggerAdapter(logger);
- loggerMap.put(name, ulogger);
+ public synchronized Logger getLogger(String name) {
+ Logger ulogger = null;
+ // protect against concurrent access of loggerMap
+ synchronized (this) {
+ ulogger = (Logger) loggerMap.get(name);
+ if (ulogger == null) {
+ java.util.logging.Logger logger = java.util.logging.Logger
+ .getLogger(name);
+ ulogger = new JDK14LoggerAdapter(logger);
+ loggerMap.put(name, ulogger);
+ }
}
return ulogger;
}
Modified: slf4j/trunk/slf4j-log4j12/pom.xml
==============================================================================
--- slf4j/trunk/slf4j-log4j12/pom.xml (original)
+++ slf4j/trunk/slf4j-log4j12/pom.xml Sat Nov 4 19:35:32 2006
@@ -6,14 +6,14 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.1.0-beta0</version>
+ <version>1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>${parent.version}</version>
+ <version>${aversion}</version>
<packaging>jar</packaging>
<name>SLF4J LOG4J-12 Binding</name>
Modified: slf4j/trunk/slf4j-log4j12/src/main/java/org/slf4j/impl/Log4jLoggerFactory.java
==============================================================================
--- slf4j/trunk/slf4j-log4j12/src/main/java/org/slf4j/impl/Log4jLoggerFactory.java (original)
+++ slf4j/trunk/slf4j-log4j12/src/main/java/org/slf4j/impl/Log4jLoggerFactory.java Sat Nov 4 19:35:32 2006
@@ -41,9 +41,9 @@
import org.slf4j.Logger;
/**
- * Log4jLoggerFactory is an implementation of {@link ILoggerFactory}
- * returning the appropriate named {@link Log4jLoggerAdapter} instance.
- *
+ * Log4jLoggerFactory is an implementation of {@link ILoggerFactory} returning
+ * the appropriate named {@link Log4jLoggerAdapter} instance.
+ *
* @author Ceki Gülcü
*/
public class Log4jLoggerFactory implements ILoggerFactory {
@@ -55,15 +55,21 @@
loggerMap = new HashMap();
}
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
+ *
* @see org.slf4j.ILoggerFactory#getLogger(java.lang.String)
*/
public Logger getLogger(String name) {
- Logger slf4jLogger = (Logger) loggerMap.get(name);
- if (slf4jLogger == null) {
- org.apache.log4j.Logger logger = LogManager.getLogger(name);
- slf4jLogger = new Log4jLoggerAdapter(logger);
- loggerMap.put(name, slf4jLogger);
+ Logger slf4jLogger = null;
+ // protect against concurrent access of loggerMap
+ synchronized (this) {
+ slf4jLogger = (Logger) loggerMap.get(name);
+ if (slf4jLogger == null) {
+ org.apache.log4j.Logger logger = LogManager.getLogger(name);
+ slf4jLogger = new Log4jLoggerAdapter(logger);
+ loggerMap.put(name, slf4jLogger);
+ }
}
return slf4jLogger;
}
Modified: slf4j/trunk/slf4j-nop/pom.xml
==============================================================================
--- slf4j/trunk/slf4j-nop/pom.xml (original)
+++ slf4j/trunk/slf4j-nop/pom.xml Sat Nov 4 19:35:32 2006
@@ -6,14 +6,14 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.1.0-beta0</version>
+ <version>1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-nop</artifactId>
- <version>${parent.version}</version>
+ <version>${aversion}</version>
<packaging>jar</packaging>
<name>SLF4J NOP Binding</name>
Modified: slf4j/trunk/slf4j-simple/pom.xml
==============================================================================
--- slf4j/trunk/slf4j-simple/pom.xml (original)
+++ slf4j/trunk/slf4j-simple/pom.xml Sat Nov 4 19:35:32 2006
@@ -3,14 +3,14 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.1.0-beta0</version>
+ <version>1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
- <version>${parent.version}</version>
+ <version>${aversion}</version>
<packaging>jar</packaging>
<name>SLF4J Simple Binding</name>
Modified: slf4j/trunk/slf4j-simple/src/main/java/org/slf4j/impl/SimpleLoggerFactory.java
==============================================================================
--- slf4j/trunk/slf4j-simple/src/main/java/org/slf4j/impl/SimpleLoggerFactory.java (original)
+++ slf4j/trunk/slf4j-simple/src/main/java/org/slf4j/impl/SimpleLoggerFactory.java Sat Nov 4 19:35:32 2006
@@ -39,7 +39,6 @@
import org.slf4j.Logger;
import org.slf4j.ILoggerFactory;
-
/**
* An implementation of {@link ILoggerFactory} which always returns
* {@link SimpleLogger} instances.
@@ -48,31 +47,33 @@
*/
public class SimpleLoggerFactory implements ILoggerFactory {
-
/**
- * A default instance of SimpleLoggerFactory. This default instance may be used
- * to retrieve a simple logger as a last-resort fallback logger. This instance
- * is designed to be used by a very specific group of users, namely for those
- * developing fully-fledged logging systems (e.g. log4j or logback). It is not
- * intended for end-users of the SLF4J API.
+ * A default instance of SimpleLoggerFactory. This default instance may be
+ * used to retrieve a simple logger as a last-resort fallback logger. This
+ * instance is designed to be used by a very specific group of users, namely
+ * for those developing fully-fledged logging systems (e.g. log4j or logback).
+ * It is not intended for end-users of the SLF4J API.
*/
public final static SimpleLoggerFactory INSTANCE = new SimpleLoggerFactory();
-
- Map map;
-
+
+ Map loggerMap;
+
public SimpleLoggerFactory() {
- map = new HashMap();
+ loggerMap = new HashMap();
}
-
/**
- * Return an appropriate {@link SimpleLogger} instance by name.
+ * Return an appropriate {@link SimpleLogger} instance by name.
*/
public Logger getLogger(String name) {
- Logger slogger = (Logger) map.get(name);
- if(slogger == null) {
- slogger = new SimpleLogger(name);
- map.put(name, slogger);
+ Logger slogger = null;
+ // protect against concurrent access of the loggerMap
+ synchronized (this) {
+ slogger = (Logger) loggerMap.get(name);
+ if (slogger == null) {
+ slogger = new SimpleLogger(name);
+ loggerMap.put(name, slogger);
+ }
}
return slogger;
}
Modified: slf4j/trunk/slf4j-site/pom.xml
==============================================================================
--- slf4j/trunk/slf4j-site/pom.xml (original)
+++ slf4j/trunk/slf4j-site/pom.xml Sat Nov 4 19:35:32 2006
@@ -5,14 +5,14 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.1.0-beta0</version>
+ <version>1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-site</artifactId>
- <version>${parent.version}</version>
+ <version>${aversion}</version>
<packaging>pom</packaging>
<name>SLF4J Site</name>
Modified: slf4j/trunk/slf4j-site/src/site/xdocs/news.xml
==============================================================================
--- slf4j/trunk/slf4j-site/src/site/xdocs/news.xml (original)
+++ slf4j/trunk/slf4j-site/src/site/xdocs/news.xml Sat Nov 4 19:35:32 2006
@@ -17,9 +17,31 @@
<hr noshade="noshade" size="1"/>
- <h3>September 7th, 2006 - Release of SLF4J 1.1.0-RC1</h3>
+ <h3>November 4th, 2006 - Release of SLF4J 1.1.0-RC0</h3>
- <p>Release 1.1.0-RC1 is a relatively important release with a
+ <p>Given that release 1.1.0-beta0 consisted mainly of
+ packaging-related changes which seem to work well, this release is
+ marked as RC0.</p>
+
+ <p>Fixed the JDK 1.5 dependency for the SLF4J build, as reported by
+ Boris Unkel in <a
+ href="http://bugzilla.slf4j.org/show_bug.cgi?id=28">bug number
+ 28</a>. SLF4J now explicitly declares a dependency on JDK 1.4 in
+ its pom.xml file.
+ </p>
+
+ <p>Fixed an incorrect reference to the logback project in slf4j-api
+ pom file. This bug was reported by Boris Unkel in <a
+ href="http://bugzilla.slf4j.org/show_bug.cgi?id=29">bug number
+ 29</a>.
+ </p>
+
+
+ <hr noshade="noshade" size="1"/>
+
+ <h3>September 7th, 2006 - Release of SLF4J 1.1.0-beta0</h3>
+
+ <p>Release 1.1.0-beta0 is a relatively important release with a
refactoring of the way class files are organized in jar files. In
previous releases, each binding was self-contained in a single jar
file. In this release, each and every binding depends on
Modified: slf4j/trunk/slf4j-skin/pom.xml
==============================================================================
--- slf4j/trunk/slf4j-skin/pom.xml (original)
+++ slf4j/trunk/slf4j-skin/pom.xml Sat Nov 4 19:35:32 2006
@@ -5,14 +5,14 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.1.0-beta0</version>
+ <version>1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-skin</artifactId>
- <version>${parent.version}</version>
+ <version>${aversion}</version>
<packaging>jar</packaging>
<name>SLF4J Website Skin</name>
Modified: slf4j/trunk/updateBundle.sh
==============================================================================
--- slf4j/trunk/updateBundle.sh (original)
+++ slf4j/trunk/updateBundle.sh Sat Nov 4 19:35:32 2006
@@ -1,5 +1,5 @@
-VERSION=1.1.0-beta0
+VERSION=1.1.0-RC0
echo $VERSION
MVN=/java/maven-2.0.4/bin/mvn
More information about the slf4j-dev
mailing list