You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by gs...@apache.org on 2007/10/16 00:49:27 UTC
svn commit: r584957 - in /wicket/trunk/jdk-1.4/wicket-spring: .settings/
src/main/java/org/apache/wicket/spring/
src/main/java/org/apache/wicket/spring/test/
src/test/java/org/apache/wicket/spring/
src/test/java/org/apache/wicket/util/license/
Author: gseitz
Date: Mon Oct 15 15:49:25 2007
New Revision: 584957
URL: http://svn.apache.org/viewvc?rev=584957&view=rev
Log:
WICKET-1078
Modified:
wicket/trunk/jdk-1.4/wicket-spring/.settings/org.eclipse.jdt.core.prefs
wicket/trunk/jdk-1.4/wicket-spring/.settings/org.eclipse.jdt.ui.prefs
wicket/trunk/jdk-1.4/wicket-spring/src/main/java/org/apache/wicket/spring/ISpringContextLocator.java
wicket/trunk/jdk-1.4/wicket-spring/src/main/java/org/apache/wicket/spring/SpringBeanLocator.java
wicket/trunk/jdk-1.4/wicket-spring/src/main/java/org/apache/wicket/spring/SpringWebApplication.java
wicket/trunk/jdk-1.4/wicket-spring/src/main/java/org/apache/wicket/spring/SpringWebApplicationFactory.java
wicket/trunk/jdk-1.4/wicket-spring/src/main/java/org/apache/wicket/spring/test/ApplicationContextMock.java
wicket/trunk/jdk-1.4/wicket-spring/src/test/java/org/apache/wicket/spring/SpringBeanLocatorTest.java
wicket/trunk/jdk-1.4/wicket-spring/src/test/java/org/apache/wicket/util/license/ApacheLicenceHeaderTest.java
Modified: wicket/trunk/jdk-1.4/wicket-spring/.settings/org.eclipse.jdt.core.prefs
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-spring/.settings/org.eclipse.jdt.core.prefs?rev=584957&r1=584956&r2=584957&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket-spring/.settings/org.eclipse.jdt.core.prefs (original)
+++ wicket/trunk/jdk-1.4/wicket-spring/.settings/org.eclipse.jdt.core.prefs Mon Oct 15 15:49:25 2007
@@ -72,26 +72,26 @@
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=32
-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_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=20
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=48
org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=64
org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_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=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_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
@@ -101,17 +101,19 @@
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=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=false
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=true
+org.eclipse.jdt.core.formatter.comment.format_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
@@ -120,7 +122,7 @@
org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.comment.line_length=80
+org.eclipse.jdt.core.formatter.comment.line_length=100
org.eclipse.jdt.core.formatter.compact_else_if=true
org.eclipse.jdt.core.formatter.continuation_indentation=2
org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
@@ -159,7 +161,7 @@
org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_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
@@ -188,7 +190,7 @@
org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_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
@@ -217,7 +219,7 @@
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_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
@@ -234,11 +236,11 @@
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=do not 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=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=insert
org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_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
@@ -298,7 +300,7 @@
org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_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
@@ -306,18 +308,16 @@
org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=true
+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=90
-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.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=1
+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_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.incompleteClasspath=error
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=false
Modified: wicket/trunk/jdk-1.4/wicket-spring/.settings/org.eclipse.jdt.ui.prefs
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-spring/.settings/org.eclipse.jdt.ui.prefs?rev=584957&r1=584956&r2=584957&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket-spring/.settings/org.eclipse.jdt.ui.prefs (original)
+++ wicket/trunk/jdk-1.4/wicket-spring/.settings/org.eclipse.jdt.ui.prefs Mon Oct 15 15:49:25 2007
@@ -11,5 +11,54 @@
comment_separate_root_tags=true
eclipse.preferences.version=1
formatter_settings_version=11
+editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
internal.default.compliance=default
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates/>
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="false" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * Gets ${bare_field_name}.\r\n * @return ${bare_field_name}\r\n */</template><template autoinsert\="false" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * Sets ${bare_field_name}.\r\n * @param ${param} ${bare_field_name}\r\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * Construct.\r\n
* ${tags}\r\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment"/><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}
\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="false" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">/*\r\n * Licensed to the Apache Software Foundation (ASF) under one or more\r\n * contributor license agreements. See the NOTICE file distributed with\r\n * this work for additional information regarding copyright ownership.\r\n * The ASF licenses this file to You under the Apache License, Version 2.0\r\n * (the "License"); you may not use this file except in compliance with\r\n * the License. You may obtain a copy of the License at\r\n *\r\n * http\://www.apache.org/licenses/LICENSE-2.0\r\
n *\r\n * Unless required by applicable law or agreed to in writing, software\r\n * distributed under the License is distributed on an "AS IS" BASIS,\r\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r\n * See the License for the specific language governing permissions and\r\n * limitations under the License.\r\n */\r\n${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">throw new RuntimeException(${exception_var});</template><template autoinsert\="false" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">${body_statement}</template><template autoinsert\="false" context\="c
onstructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false"
description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template></templates>
+sp_cleanup.add_default_serial_version_id=true
+sp_cleanup.add_generated_serial_version_id=false
+sp_cleanup.add_missing_annotations=true
+sp_cleanup.add_missing_deprecated_annotations=true
+sp_cleanup.add_missing_nls_tags=false
+sp_cleanup.add_missing_override_annotations=true
+sp_cleanup.add_serial_version_id=false
+sp_cleanup.always_use_blocks=true
+sp_cleanup.always_use_parentheses_in_expressions=false
+sp_cleanup.always_use_this_for_non_static_field_access=false
+sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_to_enhanced_for_loop=false
+sp_cleanup.format_source_code=true
+sp_cleanup.make_local_variable_final=false
+sp_cleanup.make_parameters_final=false
+sp_cleanup.make_private_fields_final=true
+sp_cleanup.make_variable_declarations_final=true
+sp_cleanup.never_use_blocks=false
+sp_cleanup.never_use_parentheses_in_expressions=true
+sp_cleanup.on_save_use_additional_actions=true
+sp_cleanup.organize_imports=true
+sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
+sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
+sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_trailing_whitespaces=true
+sp_cleanup.remove_trailing_whitespaces_all=true
+sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
+sp_cleanup.remove_unnecessary_casts=true
+sp_cleanup.remove_unnecessary_nls_tags=true
+sp_cleanup.remove_unused_imports=true
+sp_cleanup.remove_unused_local_variables=false
+sp_cleanup.remove_unused_private_fields=true
+sp_cleanup.remove_unused_private_members=false
+sp_cleanup.remove_unused_private_methods=true
+sp_cleanup.remove_unused_private_types=true
+sp_cleanup.sort_members=false
+sp_cleanup.sort_members_all=false
+sp_cleanup.use_blocks=false
+sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_parentheses_in_expressions=false
+sp_cleanup.use_this_for_non_static_field_access=true
+sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+sp_cleanup.use_this_for_non_static_method_access=true
+sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+
Modified: wicket/trunk/jdk-1.4/wicket-spring/src/main/java/org/apache/wicket/spring/ISpringContextLocator.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-spring/src/main/java/org/apache/wicket/spring/ISpringContextLocator.java?rev=584957&r1=584956&r2=584957&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket-spring/src/main/java/org/apache/wicket/spring/ISpringContextLocator.java (original)
+++ wicket/trunk/jdk-1.4/wicket-spring/src/main/java/org/apache/wicket/spring/ISpringContextLocator.java Mon Oct 15 15:49:25 2007
@@ -21,11 +21,11 @@
/**
- * Interface representing object that can locate a spring context. The
- * implementation should take up little room when serialized.
+ * Interface representing object that can locate a spring context. The implementation should take up
+ * little room when serialized.
*
- * SpringObjectLocator uses this interface to locate the spring context so that
- * it in turn can locate a bean.
+ * SpringObjectLocator uses this interface to locate the spring context so that it in turn can
+ * locate a bean.
*
* Ideal implementations use a static lookup to locate the context.
*
@@ -37,7 +37,7 @@
* public ApplicationContext getSpringContext()
* {
* //MyApplication is the subclass of WebApplication used by the application
- * return ((MyApplication) Application.get()).getContext();
+ * return ((MyApplication)Application.get()).getContext();
* }
* }
* </pre>
Modified: wicket/trunk/jdk-1.4/wicket-spring/src/main/java/org/apache/wicket/spring/SpringBeanLocator.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-spring/src/main/java/org/apache/wicket/spring/SpringBeanLocator.java?rev=584957&r1=584956&r2=584957&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket-spring/src/main/java/org/apache/wicket/spring/SpringBeanLocator.java (original)
+++ wicket/trunk/jdk-1.4/wicket-spring/src/main/java/org/apache/wicket/spring/SpringBeanLocator.java Mon Oct 15 15:49:25 2007
@@ -27,9 +27,9 @@
import org.springframework.context.ApplicationContext;
/**
- * Implementation of {@link IProxyTargetLocator} that can locate beans within a
- * spring application context. Beans are looked up by the combination of name
- * and type, if name is omitted only type is used.
+ * Implementation of {@link IProxyTargetLocator} that can locate beans within a spring application
+ * context. Beans are looked up by the combination of name and type, if name is omitted only type is
+ * used.
*
* @author Igor Vaynberg (ivaynberg)
* @author Istvan Devai
@@ -70,8 +70,7 @@
* @param locator
* spring context locator
*/
- public SpringBeanLocator(String beanName, Class beanType,
- ISpringContextLocator locator)
+ public SpringBeanLocator(String beanName, Class beanType, ISpringContextLocator locator)
{
if (locator == null)
{
@@ -90,8 +89,8 @@
}
/**
- * Returns the name of the Bean as registered to Spring. Throws IllegalState
- * exception if none or more then one beans are found.
+ * Returns the name of the Bean as registered to Spring. Throws IllegalState exception if none
+ * or more then one beans are found.
*
* @param ctx
* spring application context
@@ -105,8 +104,7 @@
String[] names = BeanFactoryUtils.beanNamesForTypeIncludingAncestors(ctx, clazz);
if (names.length == 0)
{
- throw new IllegalStateException("bean of type ["
- + clazz.getName() + "] not found");
+ throw new IllegalStateException("bean of type [" + clazz.getName() + "] not found");
}
if (names.length > 1)
{
@@ -125,15 +123,14 @@
}
/**
- * @return returns whether the bean (the locator is supposed to istantiate)
- * is a singleton or not
+ * @return returns whether the bean (the locator is supposed to istantiate) is a singleton or
+ * not
*/
public boolean isSingletonBean()
{
if (singletonCache == null)
{
- singletonCache = Boolean.valueOf(getSpringContext()
- .isSingleton(getBeanName()));
+ singletonCache = Boolean.valueOf(getSpringContext().isSingleton(getBeanName()));
}
return singletonCache.booleanValue();
}
@@ -143,16 +140,15 @@
*/
public Class getBeanType()
{
- Class clazz = beanTypeCache == null ? null : (Class) beanTypeCache.get();
+ Class clazz = beanTypeCache == null ? null : (Class)beanTypeCache.get();
if (clazz == null)
{
beanTypeCache = new WeakReference(clazz = Classes.resolveClass(beanTypeName));
if (clazz == null)
{
- throw new RuntimeException("SpringBeanLocator could not find class ["
- + beanTypeName + "] needed to locate the ["
- + ((beanName != null) ? (beanName) : ("bean name not specified"))
- + "] bean");
+ throw new RuntimeException("SpringBeanLocator could not find class [" +
+ beanTypeName + "] needed to locate the [" +
+ ((beanName != null) ? (beanName) : ("bean name not specified")) + "] bean");
}
}
return clazz;
@@ -181,8 +177,7 @@
if (context == null)
{
- throw new IllegalStateException(
- "spring application context locator returned null");
+ throw new IllegalStateException("spring application context locator returned null");
}
return context;
}
@@ -209,8 +204,8 @@
}
/**
- * Looks up a bean by its class. Throws IllegalState exception if none or
- * more then one beans are found.
+ * Looks up a bean by its class. Throws IllegalState exception if none or more then one beans
+ * are found.
*
* @param ctx
* spring application context
@@ -226,8 +221,7 @@
}
/**
- * Looks up a bean by its name and class. Throws IllegalState exception if
- * bean not found.
+ * Looks up a bean by its name and class. Throws IllegalState exception if bean not found.
*
* @param ctx
* spring application context
@@ -239,8 +233,7 @@
* @throws IllegalStateException
* @return found bean
*/
- private static Object lookupSpringBean(ApplicationContext ctx, String name,
- Class clazz)
+ private static Object lookupSpringBean(ApplicationContext ctx, String name, Class clazz)
{
try
{
@@ -248,8 +241,8 @@
}
catch (NoSuchBeanDefinitionException e)
{
- throw new IllegalStateException("bean with name ["
- + name + "] and class [" + clazz.getName() + "] not found");
+ throw new IllegalStateException("bean with name [" + name + "] and class [" +
+ clazz.getName() + "] not found");
}
}
@@ -260,9 +253,9 @@
{
if (obj instanceof SpringBeanLocator)
{
- SpringBeanLocator other = (SpringBeanLocator) obj;
- return beanTypeName.equals(other.beanTypeName)
- && Objects.equal(beanName, other.beanName);
+ SpringBeanLocator other = (SpringBeanLocator)obj;
+ return beanTypeName.equals(other.beanTypeName) &&
+ Objects.equal(beanName, other.beanName);
}
return false;
}
Modified: wicket/trunk/jdk-1.4/wicket-spring/src/main/java/org/apache/wicket/spring/SpringWebApplication.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-spring/src/main/java/org/apache/wicket/spring/SpringWebApplication.java?rev=584957&r1=584956&r2=584957&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket-spring/src/main/java/org/apache/wicket/spring/SpringWebApplication.java (original)
+++ wicket/trunk/jdk-1.4/wicket-spring/src/main/java/org/apache/wicket/spring/SpringWebApplication.java Mon Oct 15 15:49:25 2007
@@ -28,14 +28,15 @@
/**
- * Base class for spring aware wicket web application object. This class has
- * helper methods to create lazy init proxies based on spring beans, as well as
- * an implementation of {@link ISpringContextLocator}.
+ * Base class for spring aware wicket web application object. This class has helper methods to
+ * create lazy init proxies based on spring beans, as well as an implementation of
+ * {@link ISpringContextLocator}.
*
* @author Igor Vaynberg (ivaynberg)
*/
-public abstract class SpringWebApplication extends WebApplication implements
- ApplicationContextAware
+public abstract class SpringWebApplication extends WebApplication
+ implements
+ ApplicationContextAware
{
private ApplicationContext applicationContext;
@@ -48,7 +49,7 @@
public ApplicationContext getSpringContext()
{
Application app = Application.get();
- return ((SpringWebApplication) app).internalGetApplicationContext();
+ return ((SpringWebApplication)app).internalGetApplicationContext();
}
};
@@ -73,8 +74,7 @@
// locate the app context from servlet context
ServletContext sc = getServletContext();
- applicationContext = WebApplicationContextUtils
- .getRequiredWebApplicationContext(sc);
+ applicationContext = WebApplicationContextUtils.getRequiredWebApplicationContext(sc);
}
}
@@ -89,12 +89,10 @@
}
/**
- * Retrieves the spring application context associated with this application
- * object
+ * Retrieves the spring application context associated with this application object
*
- * This method is protected and named internalGetApplicationContext so that
- * the subclass can choose whether or not to add a public
- * getApplicationContext() method
+ * This method is protected and named internalGetApplicationContext so that the subclass can
+ * choose whether or not to add a public getApplicationContext() method
*
* @return spring application context
*/
@@ -114,8 +112,7 @@
}
/**
- * Creates a proxy for a spring bean that is safe to put into session and
- * serialize
+ * Creates a proxy for a spring bean that is safe to put into session and serialize
*
* @param clazz
* class of spring bean
@@ -125,13 +122,12 @@
*/
protected Object createSpringBeanProxy(Class clazz, String beanName)
{
- return LazyInitProxyFactory.createProxy(clazz, new SpringBeanLocator(beanName,
- clazz, getSpringContextLocator()));
+ return LazyInitProxyFactory.createProxy(clazz, new SpringBeanLocator(beanName, clazz,
+ getSpringContextLocator()));
}
/**
- * Creates a proxy for a spring bean that is safe to put into session and
- * serialize
+ * Creates a proxy for a spring bean that is safe to put into session and serialize
*
* @param clazz
* class of spring bean
Modified: wicket/trunk/jdk-1.4/wicket-spring/src/main/java/org/apache/wicket/spring/SpringWebApplicationFactory.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-spring/src/main/java/org/apache/wicket/spring/SpringWebApplicationFactory.java?rev=584957&r1=584956&r2=584957&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket-spring/src/main/java/org/apache/wicket/spring/SpringWebApplicationFactory.java (original)
+++ wicket/trunk/jdk-1.4/wicket-spring/src/main/java/org/apache/wicket/spring/SpringWebApplicationFactory.java Mon Oct 15 15:49:25 2007
@@ -28,8 +28,8 @@
/**
- * Implementation of IWebApplicationFactory that pulls the WebApplication object
- * out of spring application context.
+ * Implementation of IWebApplicationFactory that pulls the WebApplication object out of spring
+ * application context.
*
* Configuration example:
*
@@ -45,8 +45,8 @@
* </servlet>
* </pre>
*
- * beanName init parameter can be used if there are multiple WebApplications
- * defined on the spring application context.
+ * beanName init parameter can be used if there are multiple WebApplications defined on the spring
+ * application context.
*
* Example:
*
@@ -79,8 +79,7 @@
public WebApplication createApplication(WicketFilter filter)
{
ServletContext sc = filter.getFilterConfig().getServletContext();
- ApplicationContext ac = WebApplicationContextUtils
- .getRequiredWebApplicationContext(sc);
+ ApplicationContext ac = WebApplicationContextUtils.getRequiredWebApplicationContext(sc);
String beanName = filter.getFilterConfig().getInitParameter("applicationBean");
return createApplication(ac, beanName);
@@ -90,7 +89,7 @@
{
if (beanName != null)
{
- WebApplication application = (WebApplication) ac.getBean(beanName);
+ WebApplication application = (WebApplication)ac.getBean(beanName);
if (application == null)
{
throw new IllegalArgumentException(
@@ -103,15 +102,15 @@
Map beans = ac.getBeansOfType(WebApplication.class, false, false);
if (beans.size() == 0)
{
- throw new IllegalStateException("bean of type ["
- + WebApplication.class.getName() + "] not found");
+ throw new IllegalStateException("bean of type [" + WebApplication.class.getName() +
+ "] not found");
}
if (beans.size() > 1)
{
- throw new IllegalStateException("more then one bean of type ["
- + WebApplication.class.getName() + "] found, must have only one");
+ throw new IllegalStateException("more then one bean of type [" +
+ WebApplication.class.getName() + "] found, must have only one");
}
- return (WebApplication) beans.values().iterator().next();
+ return (WebApplication)beans.values().iterator().next();
}
}
}
Modified: wicket/trunk/jdk-1.4/wicket-spring/src/main/java/org/apache/wicket/spring/test/ApplicationContextMock.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-spring/src/main/java/org/apache/wicket/spring/test/ApplicationContextMock.java?rev=584957&r1=584956&r2=584957&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket-spring/src/main/java/org/apache/wicket/spring/test/ApplicationContextMock.java (original)
+++ wicket/trunk/jdk-1.4/wicket-spring/src/main/java/org/apache/wicket/spring/test/ApplicationContextMock.java Mon Oct 15 15:49:25 2007
@@ -37,12 +37,12 @@
import org.springframework.core.io.Resource;
/**
- * Mock application context object. This mock context allows easy creation of
- * unit tests by allowing the user to put bean instances into the context.
+ * Mock application context object. This mock context allows easy creation of unit tests by allowing
+ * the user to put bean instances into the context.
*
* Only {@link #getBean(String)}, {@link #getBean(String, Class)}, and
- * {@link #getBeansOfType(Class)} are implemented so far. Any other method
- * throws {@link UnsupportedOperationException}.
+ * {@link #getBeansOfType(Class)} are implemented so far. Any other method throws
+ * {@link UnsupportedOperationException}.
*
* @author Igor Vaynberg (ivaynberg)
*
@@ -53,7 +53,7 @@
/**
* puts bean with the given name into the context
- *
+ *
* @param name
* @param bean
*/
@@ -61,16 +61,15 @@
{
if (beans.containsKey(name))
{
- throw new IllegalArgumentException("a bean with name ["
- + name + "] has alredy been added to the context");
+ throw new IllegalArgumentException("a bean with name [" + name +
+ "] has alredy been added to the context");
}
beans.put(name, bean);
}
/**
- * puts bean with into the context. bean object's class name will be used as
- * the bean name.
- *
+ * puts bean with into the context. bean object's class name will be used as the bean name.
+ *
* @param bean
*/
public void putBean(Object bean)
@@ -92,8 +91,7 @@
}
/**
- * @see org.springframework.beans.factory.BeanFactory#getBean(java.lang.String,
- * java.lang.Class)
+ * @see org.springframework.beans.factory.BeanFactory#getBean(java.lang.String, java.lang.Class)
*/
public Object getBean(String name, Class requiredType) throws BeansException
{
@@ -115,7 +113,7 @@
Iterator it = beans.entrySet().iterator();
while (it.hasNext())
{
- final Map.Entry entry = (Entry) it.next();
+ final Map.Entry entry = (Entry)it.next();
if (type.isAssignableFrom(entry.getValue().getClass()))
{
found.put(entry.getKey(), entry.getValue());
@@ -190,16 +188,16 @@
Iterator entries = beans.entrySet().iterator();
while (entries.hasNext())
{
- Entry entry = (Entry) entries.next();
+ Entry entry = (Entry)entries.next();
Object bean = entry.getValue();
if (type.isAssignableFrom(bean.getClass()))
{
- String name = (String) entry.getKey();
+ String name = (String)entry.getKey();
names.add(name);
}
}
- return (String[]) names.toArray(new String[names.size()]);
+ return (String[])names.toArray(new String[names.size()]);
}
/**
@@ -216,8 +214,8 @@
* @see org.springframework.beans.factory.ListableBeanFactory#getBeansOfType(java.lang.Class,
* boolean, boolean)
*/
- public Map getBeansOfType(Class type, boolean includePrototypes,
- boolean includeFactoryBeans) throws BeansException
+ public Map getBeansOfType(Class type, boolean includePrototypes, boolean includeFactoryBeans)
+ throws BeansException
{
throw new UnsupportedOperationException();
}
@@ -266,8 +264,7 @@
* @see org.springframework.context.MessageSource#getMessage(java.lang.String,
* java.lang.Object[], java.lang.String, java.util.Locale)
*/
- public String getMessage(String code, Object[] args, String defaultMessage,
- Locale locale)
+ public String getMessage(String code, Object[] args, String defaultMessage, Locale locale)
{
throw new UnsupportedOperationException();
}
@@ -311,8 +308,7 @@
/**
* @see org.springframework.context.ApplicationContext#getAutowireCapableBeanFactory()
*/
- public AutowireCapableBeanFactory getAutowireCapableBeanFactory()
- throws IllegalStateException
+ public AutowireCapableBeanFactory getAutowireCapableBeanFactory() throws IllegalStateException
{
throw new UnsupportedOperationException();
}
Modified: wicket/trunk/jdk-1.4/wicket-spring/src/test/java/org/apache/wicket/spring/SpringBeanLocatorTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-spring/src/test/java/org/apache/wicket/spring/SpringBeanLocatorTest.java?rev=584957&r1=584956&r2=584957&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket-spring/src/test/java/org/apache/wicket/spring/SpringBeanLocatorTest.java (original)
+++ wicket/trunk/jdk-1.4/wicket-spring/src/test/java/org/apache/wicket/spring/SpringBeanLocatorTest.java Mon Oct 15 15:49:25 2007
@@ -46,7 +46,7 @@
protected void setUp() throws Exception
{
- ctx=new ApplicationContextMock();
+ ctx = new ApplicationContextMock();
ctxLocator = new SpringContextLocatorMock(ctx);
}
@@ -69,11 +69,11 @@
public void testLookupByClassAfterDeserialization()
{
Bean bean = new Bean();
-
+
ctx.putBean("bean", bean);
- SpringBeanLocator locator = (SpringBeanLocator) Objects
- .cloneObject(new SpringBeanLocator(Bean.class, ctxLocator));
+ SpringBeanLocator locator = (SpringBeanLocator)Objects.cloneObject(new SpringBeanLocator(
+ Bean.class, ctxLocator));
assertNotNull(locator.locateProxyTarget());
}
@@ -138,8 +138,8 @@
Bean bean = new Bean();
ctx.putBean("bean", bean);
- SpringBeanLocator locator = (SpringBeanLocator) Objects
- .cloneObject(new SpringBeanLocator("bean", Bean.class, ctxLocator));
+ SpringBeanLocator locator = (SpringBeanLocator)Objects.cloneObject(new SpringBeanLocator(
+ "bean", Bean.class, ctxLocator));
assertNotNull(locator.locateProxyTarget());
}
@@ -209,22 +209,17 @@
*/
public void testEqualsAndHashcode()
{
- SpringBeanLocator a = new SpringBeanLocator("bean", SpringBeanLocator.class,
- ctxLocator);
+ SpringBeanLocator a = new SpringBeanLocator("bean", SpringBeanLocator.class, ctxLocator);
SpringBeanLocator aprime = new SpringBeanLocator("bean", SpringBeanLocator.class,
ctxLocator);
- SpringBeanLocator b = new SpringBeanLocator("bean2", SpringBeanLocator.class,
- ctxLocator);
- SpringBeanLocator c = new SpringBeanLocator("bean", SpringBeanLocatorTest.class,
- ctxLocator);
+ SpringBeanLocator b = new SpringBeanLocator("bean2", SpringBeanLocator.class, ctxLocator);
+ SpringBeanLocator c = new SpringBeanLocator("bean", SpringBeanLocatorTest.class, ctxLocator);
SpringBeanLocator d = new SpringBeanLocator(SpringBeanLocator.class, ctxLocator);
- SpringBeanLocator dprime = new SpringBeanLocator(SpringBeanLocator.class,
- ctxLocator);
+ SpringBeanLocator dprime = new SpringBeanLocator(SpringBeanLocator.class, ctxLocator);
- SpringBeanLocator e = new SpringBeanLocator(SpringBeanLocatorTest.class,
- ctxLocator);
+ SpringBeanLocator e = new SpringBeanLocator(SpringBeanLocatorTest.class, ctxLocator);
assertEquals(a, aprime);
assertEquals(aprime, a);
Modified: wicket/trunk/jdk-1.4/wicket-spring/src/test/java/org/apache/wicket/util/license/ApacheLicenceHeaderTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-spring/src/test/java/org/apache/wicket/util/license/ApacheLicenceHeaderTest.java?rev=584957&r1=584956&r2=584957&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket-spring/src/test/java/org/apache/wicket/util/license/ApacheLicenceHeaderTest.java (original)
+++ wicket/trunk/jdk-1.4/wicket-spring/src/test/java/org/apache/wicket/util/license/ApacheLicenceHeaderTest.java Mon Oct 15 15:49:25 2007
@@ -19,9 +19,8 @@
import org.apache.wicket.util.license.ApacheLicenseHeaderTestCase;
/**
- * 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.
+ * 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)
*/
@@ -32,6 +31,6 @@
*/
public ApacheLicenceHeaderTest()
{
-// addHeaders = true;
+// addHeaders = true;
}
}