Added: wicket/trunk/wicket-weld/.settings/org.eclipse.jdt.core.prefs
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-weld/.settings/org.eclipse.jdt.core.prefs?rev=1158511&view=auto
==============================================================================
--- wicket/trunk/wicket-weld/.settings/org.eclipse.jdt.core.prefs (added)
+++ wicket/trunk/wicket-weld/.settings/org.eclipse.jdt.core.prefs Wed Aug 17 
04:45:50 2011
@@ -0,0 +1,276 @@
+#Tue Aug 16 16:20:06 PDT 2011
+eclipse.preferences.version=1
+encoding//src/main/java=UTF-8
+encoding//src/main/resources=UTF-8
+encoding//src/test/java=UTF-8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=80
+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=64
+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=0
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=0
+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=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=next_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=next_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=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=next_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=100
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=1
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do
 not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do
 not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do 
not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=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=insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not 
insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do
 not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=do not 
insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do
 not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do
 not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do
 not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do
 not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do
 not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do
 not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not 
insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do 
not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do
 not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do
 not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not 
insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not 
insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do
 not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do
 not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do
 not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do 
not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do
 not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_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=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=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=insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do
 not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do
 not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do
 not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do
 not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do
 not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do
 not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=true
+org.eclipse.jdt.core.formatter.join_wrapped_lines=true
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=100
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=true
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=true
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=2
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=false
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true

Propchange: wicket/trunk/wicket-weld/.settings/org.eclipse.jdt.core.prefs
------------------------------------------------------------------------------
    svn:executable = *

Added: wicket/trunk/wicket-weld/.settings/org.eclipse.jdt.ui.prefs
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-weld/.settings/org.eclipse.jdt.ui.prefs?rev=1158511&view=auto
==============================================================================
--- wicket/trunk/wicket-weld/.settings/org.eclipse.jdt.ui.prefs (added)
+++ wicket/trunk/wicket-weld/.settings/org.eclipse.jdt.ui.prefs Wed Aug 17 
04:45:50 2011
@@ -0,0 +1,4 @@
+#Tue Aug 16 16:20:05 PDT 2011
+eclipse.preferences.version=1
+formatter_profile=_Wicket
+formatter_settings_version=11

Propchange: wicket/trunk/wicket-weld/.settings/org.eclipse.jdt.ui.prefs
------------------------------------------------------------------------------
    svn:executable = *

Added: wicket/trunk/wicket-weld/pom.xml
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-weld/pom.xml?rev=1158511&view=auto
==============================================================================
--- wicket/trunk/wicket-weld/pom.xml (added)
+++ wicket/trunk/wicket-weld/pom.xml Wed Aug 17 04:45:50 2011
@@ -0,0 +1,64 @@
+<?xml version="1.0"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   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.
+-->
+<project
+       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd";
+       xmlns="http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
+       <modelVersion>4.0.0</modelVersion>
+       <parent>
+               <artifactId>wicket-parent</artifactId>
+               <groupId>org.apache.wicket</groupId>
+               <version>1.5-SNAPSHOT</version>
+       </parent>
+       <groupId>org.apache.wicket</groupId>
+       <artifactId>wicket-weld</artifactId>
+       <name>Wicket Weld Integration</name>
+       <properties>
+               
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+       </properties>
+       <dependencies>
+<dependency>
+    <groupId>javax.el</groupId>
+    <artifactId>javax.el-api</artifactId>
+    <version>2.2.1</version>
+</dependency>
+<dependency>
+    <groupId>javax.servlet.jsp</groupId>
+    <artifactId>javax.servlet.jsp-api</artifactId>
+    <version>2.2.1</version>
+</dependency>
+               <dependency>
+                       <groupId>org.jboss.weld.servlet</groupId>
+                       <artifactId>weld-servlet-core</artifactId>
+                       <version>1.1.1.Final</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.jboss.weld</groupId>
+                       <artifactId>weld-core</artifactId>
+                       <version>1.1.1.Final</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.apache.wicket</groupId>
+                       <artifactId>wicket-core</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>junit</groupId>
+                       <artifactId>junit</artifactId>
+                       <scope>test</scope>
+               </dependency>
+       </dependencies>
+</project>

Propchange: wicket/trunk/wicket-weld/pom.xml
------------------------------------------------------------------------------
    svn:executable = *

Added: 
wicket/trunk/wicket-weld/src/main/java/org/apache/wicket/cdi/CdiContainer.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-weld/src/main/java/org/apache/wicket/cdi/CdiContainer.java?rev=1158511&view=auto
==============================================================================
--- 
wicket/trunk/wicket-weld/src/main/java/org/apache/wicket/cdi/CdiContainer.java 
(added)
+++ 
wicket/trunk/wicket-weld/src/main/java/org/apache/wicket/cdi/CdiContainer.java 
Wed Aug 17 04:45:50 2011
@@ -0,0 +1,123 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * 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.wicket.cdi;
+
+import javax.enterprise.context.Conversation;
+import javax.enterprise.inject.spi.BeanManager;
+
+import org.apache.wicket.Application;
+import org.apache.wicket.MetaDataKey;
+import org.apache.wicket.cdi.weld.WeldContainer;
+import org.apache.wicket.request.cycle.RequestCycle;
+import org.apache.wicket.util.lang.Args;
+
+/**
+ * Provides access to CDI features from inside a Wicket request
+ * 
+ * @author igor
+ * 
+ */
+public abstract class CdiContainer
+{
+       private static final MetaDataKey<WeldContainer> CONTEXT_KEY = new 
MetaDataKey<WeldContainer>()
+       {
+               private static final long serialVersionUID = 1L;
+       };
+
+       protected final BeanManager beanManager;
+
+       /**
+        * Constructor
+        * 
+        * @param beanManager
+        *            bean manager
+        */
+       public CdiContainer(BeanManager beanManager)
+       {
+               Args.notNull(beanManager, "beanManager");
+               this.beanManager = beanManager;
+       }
+
+       public <T> void inject(T instance)
+       {
+               Args.notNull(instance, "instance");
+               NonContextual.of(instance.getClass(), 
beanManager).postConstruct(instance);
+       }
+
+       /**
+        * Gets the current active conversation
+        * 
+        * @param cycle
+        * @return current conversation or {@code null} if none
+        */
+       public abstract Conversation getCurrentConversation(RequestCycle cycle);
+
+       /**
+        * Deactivates conversational context
+        * 
+        * @param cycle
+        */
+       public abstract void deactivateConversationalContext(RequestCycle 
cycle);
+
+       /**
+        * Activates the conversational context and starts the conversation 
with the specified cid
+        * 
+        * @param cycle
+        * @param cid
+        */
+       public abstract void activateConversationalContext(RequestCycle cycle, 
String cid);
+
+
+       /**
+        * Binds this container instance to the {@link Application}, making it 
possible to retrieve it
+        * later
+        * 
+        * @param application
+        */
+       protected void bind(Application application)
+       {
+               application.setMetaData(CONTEXT_KEY, this);
+       }
+
+       /**
+        * Retrieves container instance stored in the application
+        * 
+        * @param application
+        * @return container instance or {@code null} if none
+        */
+       public static final CdiContainer get(Application application)
+       {
+               WeldContainer ctx = application.getMetaData(CONTEXT_KEY);
+               if (ctx == null)
+               {
+                       throw new IllegalStateException("No CDI Context bound 
to application");
+               }
+               return ctx;
+       }
+
+       /**
+        * Retrieves container instance stored in the current thread's 
application
+        * 
+        * @return container instance or {@code null} if none
+        */
+       public static final CdiContainer get()
+       {
+               return get(Application.get());
+       }
+
+
+}
\ No newline at end of file

Propchange: 
wicket/trunk/wicket-weld/src/main/java/org/apache/wicket/cdi/CdiContainer.java
------------------------------------------------------------------------------
    svn:executable = *

Added: 
wicket/trunk/wicket-weld/src/main/java/org/apache/wicket/cdi/CdiInjector.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-weld/src/main/java/org/apache/wicket/cdi/CdiInjector.java?rev=1158511&view=auto
==============================================================================
--- 
wicket/trunk/wicket-weld/src/main/java/org/apache/wicket/cdi/CdiInjector.java 
(added)
+++ 
wicket/trunk/wicket-weld/src/main/java/org/apache/wicket/cdi/CdiInjector.java 
Wed Aug 17 04:45:50 2011
@@ -0,0 +1,47 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * 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.wicket.cdi;
+
+import org.apache.wicket.Component;
+import org.apache.wicket.application.IComponentInstantiationListener;
+
+/**
+ * Injects components with CDI dependencies
+ * 
+ * @author igor
+ * 
+ */
+public class CdiInjector implements IComponentInstantiationListener
+{
+       private final CdiContainer container;
+
+       /**
+        * Constructor
+        * 
+        * @param container
+        */
+       public CdiInjector(CdiContainer container)
+       {
+               this.container = container;
+       }
+
+       public void onInstantiation(Component component)
+       {
+               container.inject(component);
+       }
+
+}

Propchange: 
wicket/trunk/wicket-weld/src/main/java/org/apache/wicket/cdi/CdiInjector.java
------------------------------------------------------------------------------
    svn:executable = *

Added: 
wicket/trunk/wicket-weld/src/main/java/org/apache/wicket/cdi/ConversationPropagation.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-weld/src/main/java/org/apache/wicket/cdi/ConversationPropagation.java?rev=1158511&view=auto
==============================================================================
--- 
wicket/trunk/wicket-weld/src/main/java/org/apache/wicket/cdi/ConversationPropagation.java
 (added)
+++ 
wicket/trunk/wicket-weld/src/main/java/org/apache/wicket/cdi/ConversationPropagation.java
 Wed Aug 17 04:45:50 2011
@@ -0,0 +1,39 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * 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.wicket.cdi;
+
+import javax.enterprise.context.ConversationScoped;
+
+/**
+ * Various modes of propagating persistent conversations across requests.
+ * 
+ * @see ConversationScoped
+ * 
+ * @author igor
+ */
+public enum ConversationPropagation {
+       /** No conversational propagation takes place */
+       NONE,
+       /**
+        * Pesistent conversations are propagated between non-bookmarkable 
pages only
+        */
+       NONBOOKMARKABLE,
+       /**
+        * Persistent conversations are propagated between bookmarkable and 
non-bookmarkable pages
+        */
+       ALL;
+}

Propchange: 
wicket/trunk/wicket-weld/src/main/java/org/apache/wicket/cdi/ConversationPropagation.java
------------------------------------------------------------------------------
    svn:executable = *

Added: 
wicket/trunk/wicket-weld/src/main/java/org/apache/wicket/cdi/ConversationPropagator.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-weld/src/main/java/org/apache/wicket/cdi/ConversationPropagator.java?rev=1158511&view=auto
==============================================================================
--- 
wicket/trunk/wicket-weld/src/main/java/org/apache/wicket/cdi/ConversationPropagator.java
 (added)
+++ 
wicket/trunk/wicket-weld/src/main/java/org/apache/wicket/cdi/ConversationPropagator.java
 Wed Aug 17 04:45:50 2011
@@ -0,0 +1,191 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * 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.wicket.cdi;
+
+import javax.enterprise.context.Conversation;
+import javax.enterprise.context.ConversationScoped;
+
+import org.apache.wicket.MetaDataKey;
+import org.apache.wicket.Page;
+import org.apache.wicket.request.IRequestHandler;
+import org.apache.wicket.request.Url;
+import org.apache.wicket.request.cycle.AbstractRequestCycleListener;
+import org.apache.wicket.request.cycle.RequestCycle;
+import org.apache.wicket.request.handler.IPageClassRequestHandler;
+import org.apache.wicket.request.handler.IPageRequestHandler;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+
+/**
+ * A request cycle listener that takes care of propagating persistent 
conversations.
+ * 
+ * @see ConversationScoped
+ * 
+ * @author igor
+ */
+public class ConversationPropagator extends AbstractRequestCycleListener
+{
+
+       private static final MetaDataKey<String> CID_KEY = new 
MetaDataKey<String>()
+       {
+       };
+
+       private static final String CID = "cid";
+
+       private final CdiContainer container;
+
+       /** propagation mode to use */
+       private final ConversationPropagation propagation;
+
+       /**
+        * Constructor
+        * 
+        * @param container
+        * @param propagation
+        */
+       public ConversationPropagator(CdiContainer container, 
ConversationPropagation propagation)
+       {
+               if (propagation == ConversationPropagation.NONE)
+               {
+                       throw new IllegalArgumentException(
+                               "If propagation is NONE do not set up the 
propagator");
+               }
+
+               this.container = container;
+               this.propagation = propagation;
+       }
+
+       public void onRequestHandlerResolved(RequestCycle cycle, 
IRequestHandler handler)
+       {
+               String cid = 
cycle.getRequest().getRequestParameters().getParameterValue("cid").toString();
+               Page page = getPage(handler);
+
+               if (cid == null && page != null)
+               {
+                       cid = page.getMetaData(CID_KEY);
+               }
+
+               container.activateConversationalContext(cycle, cid);
+       }
+
+       @Override
+       public void onRequestHandlerExecuted(RequestCycle cycle, 
IRequestHandler handler)
+       {
+               Conversation conversation = 
container.getCurrentConversation(cycle);
+
+               if (conversation == null)
+               {
+                       return;
+               }
+
+
+               // propagate a conversation across non-bookmarkable page 
instances
+
+               Page page = getPage(handler);
+               if (!conversation.isTransient() && page != null)
+               {
+                       page.setMetaData(CID_KEY, conversation.getId());
+               }
+
+       }
+
+       public void onRequestHandlerScheduled(RequestCycle cycle, 
IRequestHandler handler)
+       {
+               Conversation conversation = 
container.getCurrentConversation(cycle);
+
+               if (conversation == null || conversation.isTransient())
+               {
+                       return;
+               }
+
+               // propagate a converastion across non-bookmarkable page 
instances
+
+               Page page = getPage(handler);
+               if (page != null && !conversation.isTransient())
+               {
+                       page.setMetaData(CID_KEY, conversation.getId());
+               }
+
+               if (propagation == ConversationPropagation.ALL)
+               {
+                       // propagate cid to a scheduled bookmarkable page
+
+                       PageParameters parameters = getPageParameters(handler);
+                       if (parameters != null && propagation == 
ConversationPropagation.ALL)
+                       {
+                               parameters.add(CID, conversation.getId());
+                       }
+               }
+       }
+
+       @Override
+       public void onUrlMapped(RequestCycle cycle, IRequestHandler handler, 
Url url)
+       {
+               Conversation conversation = 
container.getCurrentConversation(cycle);
+
+               if (conversation == null || conversation.isTransient())
+               {
+                       return;
+               }
+
+               if (propagation == ConversationPropagation.ALL)
+               {
+                       // propagate cid to bookmarkable pages via urls
+                       url.setQueryParameter(CID, conversation.getId());
+               }
+       }
+
+       @Override
+       public void onEndRequest(RequestCycle cycle)
+       {
+               container.deactivateConversationalContext(cycle);
+       }
+
+       /**
+        * Resolves a page instance from the request handler iff the page 
instance is already created
+        * 
+        * @param handler
+        * @return page or {@code null} if none
+        */
+       protected Page getPage(IRequestHandler handler)
+       {
+               if (handler instanceof IPageRequestHandler)
+               {
+                       IPageRequestHandler pageHandler = 
(IPageRequestHandler)handler;
+                       if (pageHandler.isPageInstanceCreated())
+                       {
+                               return (Page)pageHandler.getPage();
+                       }
+               }
+               return null;
+       }
+
+       /**
+        * Resolves page parameters from a request handler
+        * 
+        * @param handler
+        * @return page parameters or {@code null} if none
+        */
+       protected PageParameters getPageParameters(IRequestHandler handler)
+       {
+               if (handler instanceof IPageClassRequestHandler)
+               {
+                       IPageClassRequestHandler pageHandler = 
(IPageClassRequestHandler)handler;
+                       return pageHandler.getPageParameters();
+               }
+               return null;
+       }
+}

Propchange: 
wicket/trunk/wicket-weld/src/main/java/org/apache/wicket/cdi/ConversationPropagator.java
------------------------------------------------------------------------------
    svn:executable = *

Added: 
wicket/trunk/wicket-weld/src/main/java/org/apache/wicket/cdi/NonContextual.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-weld/src/main/java/org/apache/wicket/cdi/NonContextual.java?rev=1158511&view=auto
==============================================================================
--- 
wicket/trunk/wicket-weld/src/main/java/org/apache/wicket/cdi/NonContextual.java 
(added)
+++ 
wicket/trunk/wicket-weld/src/main/java/org/apache/wicket/cdi/NonContextual.java 
Wed Aug 17 04:45:50 2011
@@ -0,0 +1,123 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * 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.wicket.cdi;
+
+import java.util.Collections;
+import java.util.Map;
+import java.util.WeakHashMap;
+
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
+import javax.enterprise.context.spi.CreationalContext;
+import javax.enterprise.inject.spi.AnnotatedType;
+import javax.enterprise.inject.spi.BeanManager;
+import javax.enterprise.inject.spi.InjectionTarget;
+
+import org.apache.wicket.util.collections.ClassMetaCache;
+
+/**
+ * Injects non-CDI-managed beans with CDI dependencies
+ * 
+ * @author igor
+ * 
+ * @param <T>
+ */
+public class NonContextual<T>
+{
+       private static final Object lock = new Object();
+       private static volatile Map<BeanManager, 
ClassMetaCache<NonContextual<?>>> cache = Collections.emptyMap();
+
+       final InjectionTarget<T> it;
+       final BeanManager manager;
+
+       /**
+        * Factory method for creating noncontextual instances
+        * 
+        * @param <T>
+        * @param clazz
+        * @param manager
+        * @return
+        */
+       public static <T> NonContextual<T> of(Class<? extends T> clazz, 
BeanManager manager)
+       {
+               ClassMetaCache<NonContextual<?>> meta = getCache(manager);
+
+               @SuppressWarnings("unchecked")
+               NonContextual<T> nc = (NonContextual<T>)meta.get(clazz);
+
+               if (nc == null)
+               {
+                       nc = new NonContextual<T>(manager, clazz);
+                       meta.put(clazz, nc);
+               }
+               return nc;
+       }
+
+       private static ClassMetaCache<NonContextual<?>> getCache(BeanManager 
manager)
+       {
+               ClassMetaCache<NonContextual<?>> meta = cache.get(manager);
+               if (meta == null)
+               {
+                       synchronized (lock)
+                       {
+                               meta = cache.get(manager);
+                               if (meta == null)
+                               {
+                                       meta = new 
ClassMetaCache<NonContextual<?>>();
+
+                                       // copy-on-write the cache
+                                       Map<BeanManager, 
ClassMetaCache<NonContextual<?>>> newCache = new WeakHashMap<BeanManager, 
ClassMetaCache<NonContextual<?>>>(
+                                               cache);
+                                       newCache.put(manager, meta);
+                                       cache = 
Collections.unmodifiableMap(newCache);
+                               }
+                       }
+               }
+               return meta;
+       }
+
+       private NonContextual(BeanManager manager, Class<? extends T> clazz)
+       {
+               this.manager = manager;
+               AnnotatedType<? extends T> type = 
manager.createAnnotatedType(clazz);
+               this.it = 
(InjectionTarget<T>)manager.createInjectionTarget(type);
+       }
+
+       /**
+        * Injects the instance and calls any {@link PostConstruct} methods
+        * 
+        * @param instance
+        * @return
+        */
+       public void postConstruct(T instance)
+       {
+               CreationalContext<T> cc = manager.createCreationalContext(null);
+               it.inject(instance, cc);
+               it.postConstruct(instance);
+       }
+
+       /**
+        * Calls any {@link PreDestroy} methods and destroys any injected 
dependencies that need to be
+        * destroyed.
+        * 
+        * @param instance
+        */
+       public void preDestroy(T instance)
+       {
+               it.preDestroy(instance);
+       }
+}
\ No newline at end of file

Propchange: 
wicket/trunk/wicket-weld/src/main/java/org/apache/wicket/cdi/NonContextual.java
------------------------------------------------------------------------------
    svn:executable = *

Added: 
wicket/trunk/wicket-weld/src/main/java/org/apache/wicket/cdi/weld/WeldConfiguration.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-weld/src/main/java/org/apache/wicket/cdi/weld/WeldConfiguration.java?rev=1158511&view=auto
==============================================================================
--- 
wicket/trunk/wicket-weld/src/main/java/org/apache/wicket/cdi/weld/WeldConfiguration.java
 (added)
+++ 
wicket/trunk/wicket-weld/src/main/java/org/apache/wicket/cdi/weld/WeldConfiguration.java
 Wed Aug 17 04:45:50 2011
@@ -0,0 +1,108 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * 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.wicket.cdi.weld;
+
+import javax.enterprise.inject.spi.BeanManager;
+import javax.servlet.ServletContext;
+
+import org.apache.wicket.Application;
+import org.apache.wicket.cdi.CdiContainer;
+import org.apache.wicket.cdi.CdiInjector;
+import org.apache.wicket.cdi.ConversationPropagation;
+import org.apache.wicket.cdi.ConversationPropagator;
+import org.apache.wicket.protocol.http.WebApplication;
+import org.apache.wicket.util.lang.Args;
+import org.jboss.weld.environment.servlet.Listener;
+
+/**
+ * Configures Weld integration
+ * 
+ * @author igor
+ * 
+ */
+public class WeldConfiguration
+{
+       private BeanManager beanManager;
+       private ConversationPropagation propagation = 
ConversationPropagation.NONBOOKMARKABLE;
+
+       /**
+        * Gets the configured bean manager
+        * 
+        * @return bean manager or {@code null} if none
+        */
+       public BeanManager getBeanManager()
+       {
+               return beanManager;
+       }
+
+       /**
+        * Sets the bean manager
+        * 
+        * @param beanManager
+        * @return
+        */
+       public WeldConfiguration setBeanManager(BeanManager beanManager)
+       {
+               Args.notNull(beanManager, "beanManager");
+               this.beanManager = beanManager;
+               return this;
+       }
+
+       private WeldConfiguration resolveBeanManager(ServletContext sc)
+       {
+               BeanManager bm = 
(BeanManager)sc.getAttribute(Listener.BEAN_MANAGER_ATTRIBUTE_NAME);
+
+               if (bm != null)
+               {
+                       beanManager = bm;
+               }
+               return this;
+       }
+
+       /**
+        * Configures the specified application
+        * 
+        * @param application
+        * @return
+        */
+       public CdiContainer configure(Application application)
+       {
+               if (beanManager == null)
+               {
+                       
resolveBeanManager(((WebApplication)application).getServletContext());
+               }
+               if (beanManager == null)
+               {
+                       throw new IllegalStateException(
+                               "Configuration does not have a BeanManager 
instance configured");
+               }
+
+               WeldContainer container = new WeldContainer(beanManager);
+               container.bind(application);
+
+               application.getComponentInstantiationListeners().add(new 
CdiInjector(container));
+
+               if (propagation != ConversationPropagation.NONE)
+               {
+                       application.getRequestCycleListeners().add(
+                               new ConversationPropagator(container, 
propagation));
+               }
+
+               return container;
+       }
+
+}

Propchange: 
wicket/trunk/wicket-weld/src/main/java/org/apache/wicket/cdi/weld/WeldConfiguration.java
------------------------------------------------------------------------------
    svn:executable = *

Added: 
wicket/trunk/wicket-weld/src/main/java/org/apache/wicket/cdi/weld/WeldContainer.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-weld/src/main/java/org/apache/wicket/cdi/weld/WeldContainer.java?rev=1158511&view=auto
==============================================================================
--- 
wicket/trunk/wicket-weld/src/main/java/org/apache/wicket/cdi/weld/WeldContainer.java
 (added)
+++ 
wicket/trunk/wicket-weld/src/main/java/org/apache/wicket/cdi/weld/WeldContainer.java
 Wed Aug 17 04:45:50 2011
@@ -0,0 +1,97 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * 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.wicket.cdi.weld;
+
+import javax.enterprise.context.Conversation;
+import javax.enterprise.context.spi.Context;
+import javax.enterprise.inject.spi.BeanManager;
+
+import org.apache.wicket.Application;
+import org.apache.wicket.cdi.CdiContainer;
+import org.apache.wicket.request.cycle.RequestCycle;
+import org.jboss.weld.Container;
+import org.jboss.weld.context.ConversationContext;
+import org.jboss.weld.context.http.HttpConversationContext;
+
+/**
+ * Weld specialization of {@link CdiContainer}
+ * 
+ * @author igor
+ * 
+ */
+public class WeldContainer extends CdiContainer
+{
+
+       /**
+        * Constructor
+        * 
+        * @param beanManager
+        */
+       public WeldContainer(BeanManager beanManager)
+       {
+               super(beanManager);
+       }
+
+       protected void bind(Application application)
+       {
+               super.bind(application);
+       }
+
+       @Override
+       public void activateConversationalContext(RequestCycle cycle, String 
cid)
+       {
+               ConversationContext conversationContext = Container.instance()
+                       .deploymentManager()
+                       .instance()
+                       .select(Context.class)
+                       .select(HttpConversationContext.class)
+                       .get();
+               conversationContext.activate(cid);
+       }
+
+       @Override
+       public void deactivateConversationalContext(RequestCycle cycle)
+       {
+               ConversationContext conversationContext = Container.instance()
+                       .deploymentManager()
+                       .instance()
+                       .select(Context.class)
+                       .select(HttpConversationContext.class)
+                       .get();
+               conversationContext.invalidate();
+               conversationContext.deactivate();
+       }
+
+       @Override
+       public Conversation getCurrentConversation(RequestCycle cycle)
+       {
+               ConversationContext conversationContext = Container.instance()
+                       .deploymentManager()
+                       .instance()
+                       .select(Context.class)
+                       .select(HttpConversationContext.class)
+                       .get();
+
+               if (!conversationContext.isActive())
+               {
+                       return null;
+               }
+
+               return conversationContext.getCurrentConversation();
+       }
+
+}

Propchange: 
wicket/trunk/wicket-weld/src/main/java/org/apache/wicket/cdi/weld/WeldContainer.java
------------------------------------------------------------------------------
    svn:executable = *

Added: 
wicket/trunk/wicket-weld/src/test/java/org/apache/wicket/util/license/ApacheLicenceHeaderTest.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-weld/src/test/java/org/apache/wicket/util/license/ApacheLicenceHeaderTest.java?rev=1158511&view=auto
==============================================================================
--- 
wicket/trunk/wicket-weld/src/test/java/org/apache/wicket/util/license/ApacheLicenceHeaderTest.java
 (added)
+++ 
wicket/trunk/wicket-weld/src/test/java/org/apache/wicket/util/license/ApacheLicenceHeaderTest.java
 Wed Aug 17 04:45:50 2011
@@ -0,0 +1,45 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * 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.wicket.util.license;
+
+import java.util.Arrays;
+
+/**
+ * Test that the license headers are in place in this project. The tests are 
run from
+ * {@link ApacheLicenseHeaderTestCase}, but you can add project specific tests 
here if needed.
+ * 
+ * @author Frank Bille Jensen (frankbille)
+ */
+public class ApacheLicenceHeaderTest extends ApacheLicenseHeaderTestCase
+{
+
+       /**
+        * Construct.
+        */
+       public ApacheLicenceHeaderTest()
+       {
+               xmlIgnore.add(".settings");
+
+               /*
+                * Configuration files with no "intelligent" content
+                */
+               
propertiesIgnore.add("src/main/java/commons-logging.properties");
+               propertiesIgnore.add("src/main/java/log4j.properties");
+
+               xmlPrologIgnore = Arrays.asList("src");
+       }
+}

Propchange: 
wicket/trunk/wicket-weld/src/test/java/org/apache/wicket/util/license/ApacheLicenceHeaderTest.java
------------------------------------------------------------------------------
    svn:executable = *


Reply via email to