tapestry-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hls...@apache.org
Subject svn commit: r367727 - in /jakarta/tapestry/branches/4.0: ./ .settings/ eclipse/ examples/Vlib/src/java/org/apache/tapestry/vlib/pages/ examples/Workbench/src/java/org/apache/tapestry/workbench/tree/examples/fsmodel/ framework/src/descriptor/META-INF/ f...
Date Tue, 10 Jan 2006 18:48:32 GMT
Author: hlship
Date: Tue Jan 10 10:48:09 2006
New Revision: 367727

URL: http://svn.apache.org/viewcvs?rev=367727&view=rev
Log:
TAPESTRY-787: Port late bug fixes from 4.0 branch to trunk

Added:
    jakarta/tapestry/branches/4.0/eclipse/codetemplates.xml
      - copied unchanged from r367073, jakarta/tapestry/trunk/eclipse/codetemplates.xml
    jakarta/tapestry/branches/4.0/eclipse/formatter.xml
      - copied unchanged from r367073, jakarta/tapestry/trunk/eclipse/formatter.xml
    jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/asset/ResourceMatcher.java
      - copied unchanged from r367073, jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/asset/ResourceMatcher.java
    jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/asset/ResourceMatcherImpl.java
      - copied unchanged from r367073, jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/asset/ResourceMatcherImpl.java
    jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/form/validator/ValidationStrings_ja.properties
      - copied unchanged from r367073, jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/validator/ValidationStrings_ja.properties
    jakarta/tapestry/branches/4.0/framework/src/test/org/apache/tapestry/asset/TestUnprotectedAsset.java
      - copied unchanged from r367073, jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/asset/TestUnprotectedAsset.java
    jakarta/tapestry/branches/4.0/framework/src/test/org/apache/tapestry/asset/subresource/
      - copied from r367073, jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/asset/subresource/
    jakarta/tapestry/branches/4.0/framework/src/test/org/apache/tapestry/asset/subresource/sub-resource.txt
      - copied unchanged from r367073, jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/asset/subresource/sub-resource.txt
Modified:
    jakarta/tapestry/branches/4.0/.settings/org.eclipse.jdt.core.prefs
    jakarta/tapestry/branches/4.0/.settings/org.eclipse.jdt.ui.prefs
    jakarta/tapestry/branches/4.0/examples/Vlib/src/java/org/apache/tapestry/vlib/pages/Home.java
    jakarta/tapestry/branches/4.0/examples/Workbench/src/java/org/apache/tapestry/workbench/tree/examples/fsmodel/Drive.java
    jakarta/tapestry/branches/4.0/examples/Workbench/src/java/org/apache/tapestry/workbench/tree/examples/fsmodel/FileObject.java
    jakarta/tapestry/branches/4.0/examples/Workbench/src/java/org/apache/tapestry/workbench/tree/examples/fsmodel/FileSystem.java
    jakarta/tapestry/branches/4.0/examples/Workbench/src/java/org/apache/tapestry/workbench/tree/examples/fsmodel/FolderObject.java
    jakarta/tapestry/branches/4.0/framework/src/descriptor/META-INF/tapestry.asset.xml
    jakarta/tapestry/branches/4.0/framework/src/descriptor/META-INF/tapestry.services.xml
    jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/IPage.java
    jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/asset/AbstractAsset.java
    jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/asset/AssetService.java
    jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/asset/ExternalAsset.java
    jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/engine/encoders/AssetEncoder.java
    jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/event/ReportStatusEvent.java
    jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/record/SessionPropertyPersistenceStrategy.java
    jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/services/impl/EngineServiceOuterProxy.java
    jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/valid/ValidationStrings_de.properties
    jakarta/tapestry/branches/4.0/framework/src/test/org/apache/tapestry/asset/ClasspathAssetFactoryTest.java
    jakarta/tapestry/branches/4.0/framework/src/test/org/apache/tapestry/describe/HTMLDescriptionReceiverTest.java
    jakarta/tapestry/branches/4.0/framework/src/test/org/apache/tapestry/engine/encoders/AssetEncoderTest.java
    jakarta/tapestry/branches/4.0/framework/src/test/org/apache/tapestry/event/ReportStatusEventTest.java
    jakarta/tapestry/branches/4.0/framework/src/test/org/apache/tapestry/form/validator/TestValidatorFactory.java
    jakarta/tapestry/branches/4.0/framework/src/test/org/apache/tapestry/junit/utils/TestDataSqueezer.java
    jakarta/tapestry/branches/4.0/framework/src/test/org/apache/tapestry/listener/TestListenerMapSource.java
    jakarta/tapestry/branches/4.0/framework/src/test/org/apache/tapestry/services/impl/EngineServiceInnerProxyTest.java
    jakarta/tapestry/branches/4.0/portlet/src/test/org/apache/tapestry/portlet/TestRenderService.java
    jakarta/tapestry/branches/4.0/project.properties
    jakarta/tapestry/branches/4.0/src/documentation/content/xdocs/UsersGuide/script.xml
    jakarta/tapestry/branches/4.0/src/documentation/content/xdocs/UsersGuide/validation.xml
    jakarta/tapestry/branches/4.0/src/documentation/content/xdocs/index.xml
    jakarta/tapestry/branches/4.0/status.xml

Modified: jakarta/tapestry/branches/4.0/.settings/org.eclipse.jdt.core.prefs
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/branches/4.0/.settings/org.eclipse.jdt.core.prefs?rev=367727&r1=367726&r2=367727&view=diff
==============================================================================
--- jakarta/tapestry/branches/4.0/.settings/org.eclipse.jdt.core.prefs (original)
+++ jakarta/tapestry/branches/4.0/.settings/org.eclipse.jdt.core.prefs Tue Jan 10 10:48:09 2006
@@ -1,4 +1,4 @@
-#Fri Nov 11 01:03:33 EST 2005
+#Sun Jan 08 12:01:06 PST 2006
 eclipse.preferences.version=1
 org.eclipse.jdt.core.codeComplete.argumentPrefixes=
 org.eclipse.jdt.core.codeComplete.argumentSuffixes=
@@ -18,8 +18,8 @@
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
+org.eclipse.jdt.core.compiler.problem.deprecation=ignore
+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=enabled
 org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
 org.eclipse.jdt.core.compiler.problem.discouragedReference=error
 org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
@@ -60,9 +60,253 @@
 org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=ignore
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=ignore
 org.eclipse.jdt.core.compiler.source=1.5
 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
 org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL
 org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=37
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=37
+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=1
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=0
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=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=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines=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_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=80
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=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=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=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=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_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=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_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=do not 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=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=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=true
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=true
+org.eclipse.jdt.core.formatter.lineSplit=80
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=space
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false

Modified: jakarta/tapestry/branches/4.0/.settings/org.eclipse.jdt.ui.prefs
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/branches/4.0/.settings/org.eclipse.jdt.ui.prefs?rev=367727&r1=367726&r2=367727&view=diff
==============================================================================
--- jakarta/tapestry/branches/4.0/.settings/org.eclipse.jdt.ui.prefs (original)
+++ jakarta/tapestry/branches/4.0/.settings/org.eclipse.jdt.ui.prefs Tue Jan 10 10:48:09 2006
@@ -1,7 +1,13 @@
-#Wed Jun 08 16:11:32 EDT 2005
+#Tue Dec 27 09:35:28 EST 2005
 eclipse.preferences.version=1
+formatter_profile=_tapestry
+formatter_settings_version=9
 internal.default.compliance=default
 org.eclipse.jdt.ui.exception.name=ex
 org.eclipse.jdt.ui.gettersetter.use.is=true
+org.eclipse.jdt.ui.ignorelowercasenames=true
+org.eclipse.jdt.ui.importorder=java;javax;org;com;
 org.eclipse.jdt.ui.keywordthis=false
+org.eclipse.jdt.ui.ondemandthreshold=99
 org.eclipse.jdt.ui.overrideannotation=true
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return Returns the ${bare_field_name}.\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} The ${bare_field_name} to set.\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_contex
 t" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">// Copyright 2004, 2005 The Apache Software Foundation\n//\n// Licensed under the Apache License, Version 2.0 (the "License");\n// you may not use this file except in compliance with the License.\n// You may obtain a copy of the License at\n//\n//     http\://www.apache.org/licenses/LICENSE-2.0\n//\n// Unless required by applicable law or agreed to in writing, software\n// distributed under the License is distributed on an "AS IS" BASIS,\n// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n// See the License for the specific language governing permissions and\n// limitations under the License.</template><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">/**\n * &lt;p&gt;This class &lt;/p&gt;\n * &lt;ul&gt;\n * &lt;li&gt;&lt;/li&gt; \n * &lt;/ul&gt;\n *\n * @author ${user}\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">/** ${field} */</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">/**\n * ${tags}\n */</template><template autoinsert\="true" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * {@inheritDoc}\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">// Copyright 2004, 2005 The Apache Software Foundation\n//\n// Licensed under the Apache License, Version 2.0 (the "License");\n// you may not use this file except in compliance with the License.\n// You may obtain a copy of the License at\n//\n//     http\://www.apache.org/licenses/LICENSE-2.0\n//\n// Unless required by applicable law or agreed to in writing, software\n// distributed under the License is distributed on an "AS IS" BASIS,\n// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n// See the License for the specific language governing permissions and\n// limitations under the License.\n${package_declaration}\n\n${typecomment}\n${type_declaration}</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.cla
 ssbody" name\="classbody">\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">\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">\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">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exceptio
 n_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</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.ec
 lipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>

Modified: jakarta/tapestry/branches/4.0/examples/Vlib/src/java/org/apache/tapestry/vlib/pages/Home.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/branches/4.0/examples/Vlib/src/java/org/apache/tapestry/vlib/pages/Home.java?rev=367727&r1=367726&r2=367727&view=diff
==============================================================================
--- jakarta/tapestry/branches/4.0/examples/Vlib/src/java/org/apache/tapestry/vlib/pages/Home.java (original)
+++ jakarta/tapestry/branches/4.0/examples/Vlib/src/java/org/apache/tapestry/vlib/pages/Home.java Tue Jan 10 10:48:09 2006
@@ -42,7 +42,8 @@
     public abstract BookMatches getBookMatches();
 
     /**
-     * Listener method, invokes {@link BookMatches#performQuery(MasterQueryParameters)}.
+     * Listener method, invokes
+     * {@link BookMatches#performQuery(MasterQueryParameters)}.
      */
 
     public void search()

Modified: jakarta/tapestry/branches/4.0/examples/Workbench/src/java/org/apache/tapestry/workbench/tree/examples/fsmodel/Drive.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/branches/4.0/examples/Workbench/src/java/org/apache/tapestry/workbench/tree/examples/fsmodel/Drive.java?rev=367727&r1=367726&r2=367727&view=diff
==============================================================================
--- jakarta/tapestry/branches/4.0/examples/Workbench/src/java/org/apache/tapestry/workbench/tree/examples/fsmodel/Drive.java (original)
+++ jakarta/tapestry/branches/4.0/examples/Workbench/src/java/org/apache/tapestry/workbench/tree/examples/fsmodel/Drive.java Tue Jan 10 10:48:09 2006
@@ -21,7 +21,10 @@
 
 public class Drive extends FolderObject
 {
-    private String m_strType;
+	/** serialver uid */
+	private static final long serialVersionUID = -4098885307563692077L;
+
+	private String m_strType;
 
     private String m_strLabel;
 

Modified: jakarta/tapestry/branches/4.0/examples/Workbench/src/java/org/apache/tapestry/workbench/tree/examples/fsmodel/FileObject.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/branches/4.0/examples/Workbench/src/java/org/apache/tapestry/workbench/tree/examples/fsmodel/FileObject.java?rev=367727&r1=367726&r2=367727&view=diff
==============================================================================
--- jakarta/tapestry/branches/4.0/examples/Workbench/src/java/org/apache/tapestry/workbench/tree/examples/fsmodel/FileObject.java (original)
+++ jakarta/tapestry/branches/4.0/examples/Workbench/src/java/org/apache/tapestry/workbench/tree/examples/fsmodel/FileObject.java Tue Jan 10 10:48:09 2006
@@ -23,7 +23,12 @@
 
 public class FileObject extends SFObject
 {
-    private long m_lSize;
+    /**
+	 * 
+	 */
+	private static final long serialVersionUID = -4552981105079058185L;
+
+	private long m_lSize;
 
     private final IEngineService _assetService;
 

Modified: jakarta/tapestry/branches/4.0/examples/Workbench/src/java/org/apache/tapestry/workbench/tree/examples/fsmodel/FileSystem.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/branches/4.0/examples/Workbench/src/java/org/apache/tapestry/workbench/tree/examples/fsmodel/FileSystem.java?rev=367727&r1=367726&r2=367727&view=diff
==============================================================================
--- jakarta/tapestry/branches/4.0/examples/Workbench/src/java/org/apache/tapestry/workbench/tree/examples/fsmodel/FileSystem.java (original)
+++ jakarta/tapestry/branches/4.0/examples/Workbench/src/java/org/apache/tapestry/workbench/tree/examples/fsmodel/FileSystem.java Tue Jan 10 10:48:09 2006
@@ -25,7 +25,12 @@
 public class FileSystem implements IFileSystemTreeNode
 {
 
-    private transient AssetsHolder m_objAssetsHolder = null;
+    /**
+	 * 
+	 */
+	private static final long serialVersionUID = -3895257178984217762L;
+
+	private transient AssetsHolder m_objAssetsHolder = null;
 
     /**
      * @associates <{Drive}>

Modified: jakarta/tapestry/branches/4.0/examples/Workbench/src/java/org/apache/tapestry/workbench/tree/examples/fsmodel/FolderObject.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/branches/4.0/examples/Workbench/src/java/org/apache/tapestry/workbench/tree/examples/fsmodel/FolderObject.java?rev=367727&r1=367726&r2=367727&view=diff
==============================================================================
--- jakarta/tapestry/branches/4.0/examples/Workbench/src/java/org/apache/tapestry/workbench/tree/examples/fsmodel/FolderObject.java (original)
+++ jakarta/tapestry/branches/4.0/examples/Workbench/src/java/org/apache/tapestry/workbench/tree/examples/fsmodel/FolderObject.java Tue Jan 10 10:48:09 2006
@@ -26,6 +26,11 @@
 {
 
     /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1889745019885512018L;
+
+	/**
      * @associates <{File}>
      * @supplierCardinality 0..*
      * @link aggregation

Modified: jakarta/tapestry/branches/4.0/framework/src/descriptor/META-INF/tapestry.asset.xml
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/branches/4.0/framework/src/descriptor/META-INF/tapestry.asset.xml?rev=367727&r1=367726&r2=367727&view=diff
==============================================================================
--- jakarta/tapestry/branches/4.0/framework/src/descriptor/META-INF/tapestry.asset.xml (original)
+++ jakarta/tapestry/branches/4.0/framework/src/descriptor/META-INF/tapestry.asset.xml Tue Jan 10 10:48:09 2006
@@ -137,4 +137,46 @@
   <contribution configuration-id="tapestry.Infrastructure">
     <property name="assetFactory" object="service:LookupAssetFactory"/>
   </contribution>
+  
+  <configuration-point id="UnprotectedAssets">
+    
+    Maps asset path regexp patterns to assets that won't be required
+    to have md5sum digests, making them visible and accessible to unauthenticated
+    url requests. Care should be taken contributing here. Most things should remain
+    protected, like .class files, database configuration files, etc.
+    
+    This configuration is mainly intended to help some resources that require being
+    able to dynamically load content on the browser client-side. One such resource
+    is the http://dojotoolkit.org javascript library, which loads javascript/css/other 
+    resources dynamically via XmlHttpRequests for resources that haven't been previously
+    digested.
+    
+    <schema>
+      <element name="unprotected-resource">
+        <attribute name="contains" required="true" unique="true">
+          The regexp pattern to match against.
+        </attribute>
+      </element>
+    </schema>    
+  </configuration-point>
+  
+  <contribution configuration-id="UnprotectedAssets">
+   List of unprotected asset regexps for ResourceMatcher service.
+    
+  </contribution>
+  
+  <service-point id="UnprotectedResourceMatcher" interface="ResourceMatcher" >
+    
+    Uses the UnprotectedAssets configuration point to dynamically determine
+    which assets managed by the AssetService should be protected. The default
+    is to protect all resources.
+    
+    <invoke-factory>
+      <construct class="ResourceMatcherImpl">
+        <event-listener service-id="tapestry.ResetEventHub"/>
+        <set-configuration configuration-id="UnprotectedAssets" property="contributions" />
+      </construct>
+    </invoke-factory>
+  </service-point>  
+  
 </module>

Modified: jakarta/tapestry/branches/4.0/framework/src/descriptor/META-INF/tapestry.services.xml
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/branches/4.0/framework/src/descriptor/META-INF/tapestry.services.xml?rev=367727&r1=367726&r2=367727&view=diff
==============================================================================
--- jakarta/tapestry/branches/4.0/framework/src/descriptor/META-INF/tapestry.services.xml (original)
+++ jakarta/tapestry/branches/4.0/framework/src/descriptor/META-INF/tapestry.services.xml Tue Jan 10 10:48:09 2006
@@ -77,6 +77,8 @@
         <set-service property="context" service-id="tapestry.globals.WebContext"/>
         <set-object property="response" value="service:tapestry.globals.WebResponse"/>
         <set-service property="digestSource" service-id="tapestry.asset.ResourceDigestSource"/>
+        <set-service property="unprotectedMatcher" 
+                     service-id="tapestry.asset.UnprotectedResourceMatcher" />
       </construct>
     </invoke-factory>
   </service-point>  

Modified: jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/IPage.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/IPage.java?rev=367727&r1=367726&r2=367727&view=diff
==============================================================================
--- jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/IPage.java (original)
+++ jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/IPage.java Tue Jan 10 10:48:09 2006
@@ -16,7 +16,6 @@
 
 import java.util.Locale;
 
-import org.apache.hivemind.ApplicationRuntimeException;
 import org.apache.tapestry.event.ChangeObserver;
 import org.apache.tapestry.event.PageAttachListener;
 import org.apache.tapestry.event.PageBeginRenderListener;

Modified: jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/asset/AbstractAsset.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/asset/AbstractAsset.java?rev=367727&r1=367726&r2=367727&view=diff
==============================================================================
--- jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/asset/AbstractAsset.java (original)
+++ jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/asset/AbstractAsset.java Tue Jan 10 10:48:09 2006
@@ -20,22 +20,21 @@
 import org.apache.tapestry.IAsset;
 
 /**
- *  Base class for {@link org.apache.tapestry.IAsset} implementations.  Provides
- *  the location property.
- *
- *  @author Howard Lewis Ship
- *  @since 3.0
- *
- **/
-
-public abstract class AbstractAsset implements IAsset
-{
-	private Resource _resourceLocation;
+ * Base class for {@link org.apache.tapestry.IAsset} implementations. Provides
+ * the location property.
+ * 
+ * @author Howard Lewis Ship
+ * @since 3.0
+ */
+
+public abstract class AbstractAsset implements IAsset {
+
+    private Resource _resourceLocation;
     private Location _location;
 
     protected AbstractAsset(Resource resourceLocation, Location location)
     {
-    	_resourceLocation = resourceLocation;
+        _resourceLocation = resourceLocation;
         _location = location;
     }
 
@@ -43,19 +42,19 @@
     {
         return _location;
     }
-    
+
     public Resource getResourceLocation()
     {
-    	return _resourceLocation;
+        return _resourceLocation;
     }
-    
+
     public String toString()
     {
-    	ToStringBuilder builder = new ToStringBuilder(this);
-    	
-    	builder.append("resourceLocation", _resourceLocation);
-    	builder.append("location", _location);
-    	
-    	return builder.toString();
+        ToStringBuilder builder = new ToStringBuilder(this);
+
+        builder.append("resourceLocation", _resourceLocation);
+        builder.append("location", _location);
+
+        return builder.toString();
     }
 }

Modified: jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/asset/AssetService.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/asset/AssetService.java?rev=367727&r1=367726&r2=367727&view=diff
==============================================================================
--- jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/asset/AssetService.java (original)
+++ jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/asset/AssetService.java Tue Jan 10 10:48:09 2006
@@ -15,6 +15,7 @@
 package org.apache.tapestry.asset;
 
 import java.io.BufferedInputStream;
+import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -68,7 +69,6 @@
     private WebContext _context;
 
     /** @since 4.0 */
-
     private WebRequest _request;
 
     /** @since 4.0 */
@@ -77,6 +77,9 @@
     /** @since 4.0 */
     private ResourceDigestSource _digestSource;
 
+    /** @since 4.1 */
+    private ResourceMatcher _unprotectedMatcher;
+    
     /**
      * Defaults MIME types, by extension, used when the servlet container doesn't provide MIME
      * types. ServletExec Debugger, for example, fails to provide these.
@@ -132,7 +135,7 @@
      */
 
     public static final String DIGEST = "digest";
-
+    
     /**
      * Builds a {@link ILink}for a {@link PrivateAsset}.
      * <p>
@@ -143,19 +146,19 @@
     public ILink getLink(boolean post, Object parameter)
     {
         Defense.isAssignable(parameter, String.class, "parameter");
-
+        
         String path = (String) parameter;
-
+        
         String digest = _digestSource.getDigestForResource(path);
-
+        
         Map parameters = new HashMap();
-
+        
         parameters.put(ServiceConstants.SERVICE, getName());
         parameters.put(PATH, path);
         parameters.put(DIGEST, digest);
-
+        
         // Service is stateless, which is the exception to the rule.
-
+        
         return _linkFactory.constructLink(this, post, parameters, false);
     }
 
@@ -191,32 +194,38 @@
     {
         String path = cycle.getParameter(PATH);
         String md5Digest = cycle.getParameter(DIGEST);
-
+        boolean checkDigest = !_unprotectedMatcher.containsResource(path);
         try
         {
-            if (!_digestSource.getDigestForResource(path).equals(md5Digest))
+            if (checkDigest
+                    && !_digestSource.getDigestForResource(path).equals(md5Digest))
             {
                 _response.sendError(HttpServletResponse.SC_FORBIDDEN, AssetMessages
                         .md5Mismatch(path));
                 return;
             }
-
+            
             // If they were vended an asset in the past then it must be up-to date.
-            // Asset URIs change if the underlying file is modified.
-
-            if (_request.getHeader("If-Modified-Since") != null)
+            // Asset URIs change if the underlying file is modified. (unless unprotected)
+            
+            if (checkDigest && _request.getHeader("If-Modified-Since") != null)
             {
                 _response.setStatus(HttpServletResponse.SC_NOT_MODIFIED);
                 return;
             }
-
+            
             URL resourceURL = _classResolver.getResource(path);
-
+            
             if (resourceURL == null)
                 throw new ApplicationRuntimeException(AssetMessages.noSuchResource(path));
-
+            
+            //check caching for unprotected resources
+            
+            if (!checkDigest && cachedResource(resourceURL))
+                return;
+            
             URLConnection resourceConnection = resourceURL.openConnection();
-
+            
             writeAssetContent(cycle, path, resourceConnection);
         }
         catch (Throwable ex)
@@ -225,14 +234,41 @@
         }
 
     }
-
+    
+    /**
+     * Checks if the resource contained within the specified URL 
+     * has a modified time greater than the request header value
+     * of <code>If-Modified-Since</code>. If it doesn't then the 
+     * response status is set to {@link HttpServletResponse#SC_NOT_MODIFIED}.
+     * 
+     * @param resourceURL Resource being checked
+     * @return True if resource should be cached and response header was set.
+     * @since 4.1
+     */
+    
+    protected boolean cachedResource(URL resourceURL)
+    {
+        File resource = new File(resourceURL.getFile());
+        if (!resource.exists()) return false;
+        
+        //even if it doesn't exist in header the value will be -1, 
+        //which means we need to write out the contents of the resource
+        
+        long modify = Long.parseLong(_request.getHeader("If-Modified-Since"));
+        if (resource.lastModified() > modify)
+            return false;
+        
+        _response.setStatus(HttpServletResponse.SC_NOT_MODIFIED);
+        return true;
+    }
+    
     /** @since 2.2 */
 
     private void writeAssetContent(IRequestCycle cycle, String resourcePath,
             URLConnection resourceConnection) throws IOException
     {
         InputStream input = null;
-
+        
         try
         {
             // Getting the content type and length is very dependant
@@ -247,13 +283,13 @@
 
             _response.setDateHeader("Last-Modified", _startupTime);
             _response.setDateHeader("Expires", _expireTime);
-
+            
             // Set the content type. If the servlet container doesn't
             // provide it, try and guess it by the extension.
-
+            
             if (contentType == null || contentType.length() == 0)
                 contentType = getMimeType(resourcePath);
-
+            
             OutputStream output = _response.getOutputStream(new ContentType(contentType));
 
             input = new BufferedInputStream(resourceConnection.getInputStream());
@@ -320,5 +356,11 @@
     public void setRequest(WebRequest request)
     {
         _request = request;
+    }
+    
+    /** @since 4.1 */
+    public void setUnprotectedMatcher(ResourceMatcher matcher)
+    {
+        _unprotectedMatcher = matcher;
     }
 }

Modified: jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/asset/ExternalAsset.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/asset/ExternalAsset.java?rev=367727&r1=367726&r2=367727&view=diff
==============================================================================
--- jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/asset/ExternalAsset.java (original)
+++ jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/asset/ExternalAsset.java Tue Jan 10 10:48:09 2006
@@ -22,28 +22,25 @@
 import org.apache.tapestry.Tapestry;
 
 /**
- *  A reference to an external URL.  {@link ExternalAsset}s are not
- *  localizable.
- *
- *  @author Howard Lewis Ship
+ * A reference to an external URL. {@link ExternalAsset}s are not localizable.
  * 
- **/
+ * @author Howard Lewis Ship
+ */
+
+public class ExternalAsset extends AbstractAsset {
 
-public class ExternalAsset extends AbstractAsset
-{
     private String _URL;
 
     public ExternalAsset(String URL, Location location)
     {
-    	super(null, location);
-    	
+        super(null, location);
+
         _URL = URL;
     }
 
     /**
-     *  Simply returns the URL of the external asset.
-     *
-     **/
+     * Simply returns the URL of the external asset.
+     */
 
     public String buildURL()
     {
@@ -54,17 +51,15 @@
     {
         URL url;
 
-        try
-        {
+        try {
             url = new URL(_URL);
 
             return url.openStream();
-        }
-        catch (Exception ex)
-        {
+        } catch (Exception ex) {
             // MalrformedURLException or IOException
 
-            throw new ApplicationRuntimeException(Tapestry.format("ExternalAsset.resource-missing", _URL), ex);
+            throw new ApplicationRuntimeException(Tapestry.format(
+                    "ExternalAsset.resource-missing", _URL), ex);
         }
 
     }

Modified: jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/engine/encoders/AssetEncoder.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/engine/encoders/AssetEncoder.java?rev=367727&r1=367726&r2=367727&view=diff
==============================================================================
--- jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/engine/encoders/AssetEncoder.java (original)
+++ jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/engine/encoders/AssetEncoder.java Tue Jan 10 10:48:09 2006
@@ -43,11 +43,11 @@
 
         String path = encoding.getParameterValue(AssetService.PATH);
         String digest = encoding.getParameterValue(AssetService.DIGEST);
-
+        
         // _path ends with a slash, path starts with one.
-
+        
         String fullPath = _path + "/" + digest + path;
-
+        
         encoding.setServletPath(fullPath);
         encoding.setParameterValue(AssetService.PATH, null);
         encoding.setParameterValue(AssetService.DIGEST, null);
@@ -58,13 +58,13 @@
     {
         if (!encoding.getServletPath().equals(_path))
             return;
-
+        
         String pathInfo = encoding.getPathInfo();
-
+        
         // The lead character is a slash, so find the next slash (the divider between the
         // digest and the path).
         int slashx = pathInfo.indexOf('/', 1);
-
+        
         encoding.setParameterValue(ServiceConstants.SERVICE, Tapestry.ASSET_SERVICE);
         encoding.setParameterValue(AssetService.DIGEST, pathInfo.substring(1, slashx));
         encoding.setParameterValue(AssetService.PATH, pathInfo.substring(slashx));

Modified: jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/event/ReportStatusEvent.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/event/ReportStatusEvent.java?rev=367727&r1=367726&r2=367727&view=diff
==============================================================================
--- jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/event/ReportStatusEvent.java (original)
+++ jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/event/ReportStatusEvent.java Tue Jan 10 10:48:09 2006
@@ -31,7 +31,11 @@
  */
 public class ReportStatusEvent extends EventObject implements DescriptionReceiver
 {
-    private final DescriptionReceiver _receiver;
+    /**
+	 * 
+	 */
+	private static final long serialVersionUID = 7546818328708861783L;
+	private final DescriptionReceiver _receiver;
 
     public ReportStatusEvent(Object source, DescriptionReceiver receiver)
     {

Modified: jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/record/SessionPropertyPersistenceStrategy.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/record/SessionPropertyPersistenceStrategy.java?rev=367727&r1=367726&r2=367727&view=diff
==============================================================================
--- jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/record/SessionPropertyPersistenceStrategy.java (original)
+++ jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/record/SessionPropertyPersistenceStrategy.java Tue Jan 10 10:48:09 2006
@@ -72,9 +72,9 @@
 
         WebSessionAttributeCallback callback = new WebSessionAttributeCallback()
         {
-            public void handleAttribute(WebSession session, String name)
+            public void handleAttribute(WebSession sess, String name)
             {
-                PropertyChange change = RecordUtils.buildChange(name, session.getAttribute(name));
+                PropertyChange change = RecordUtils.buildChange(name, sess.getAttribute(name));
 
                 result.add(change);
             }
@@ -99,9 +99,9 @@
 
         WebSessionAttributeCallback callback = new WebSessionAttributeCallback()
         {
-            public void handleAttribute(WebSession session, String name)
+            public void handleAttribute(WebSession sess, String name)
             {
-                session.setAttribute(name, null);
+                sess.setAttribute(name, null);
             }
         };
 

Modified: jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/services/impl/EngineServiceOuterProxy.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/services/impl/EngineServiceOuterProxy.java?rev=367727&r1=367726&r2=367727&view=diff
==============================================================================
--- jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/services/impl/EngineServiceOuterProxy.java (original)
+++ jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/services/impl/EngineServiceOuterProxy.java Tue Jan 10 10:48:09 2006
@@ -35,7 +35,10 @@
  */
 public class EngineServiceOuterProxy implements IEngineService, Serializable
 {
-    private final String _serviceName;
+	/** serialver */
+	private static final long serialVersionUID = 2050789495671401625L;
+
+	private final String _serviceName;
 
     private IEngineService _delegate;
 

Modified: jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/valid/ValidationStrings_de.properties
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/valid/ValidationStrings_de.properties?rev=367727&r1=367726&r2=367727&view=diff
==============================================================================
--- jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/valid/ValidationStrings_de.properties (original)
+++ jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/valid/ValidationStrings_de.properties Tue Jan 10 10:48:09 2006
@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+
 field-is-required=Eingabefeld {0} ist ein Pflichtfeld.
 field-too-short=Sie m\u00c3\u00bcssen min. {0} Zeichen in das Eingabefeld {1} eingeben.
 invalid-date-format=Das Eingabefeld ''{0}'' hat ein falsches Datumsformat (Eingabeformat ist {1}).

Modified: jakarta/tapestry/branches/4.0/framework/src/test/org/apache/tapestry/asset/ClasspathAssetFactoryTest.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/branches/4.0/framework/src/test/org/apache/tapestry/asset/ClasspathAssetFactoryTest.java?rev=367727&r1=367726&r2=367727&view=diff
==============================================================================
--- jakarta/tapestry/branches/4.0/framework/src/test/org/apache/tapestry/asset/ClasspathAssetFactoryTest.java (original)
+++ jakarta/tapestry/branches/4.0/framework/src/test/org/apache/tapestry/asset/ClasspathAssetFactoryTest.java Tue Jan 10 10:48:09 2006
@@ -142,6 +142,33 @@
         verifyControls();
     }
 
+    /**
+     * Tests relative sub-directory paths.
+     */
+    public void testRelativeDirectoryPath()
+    {
+        IEngineService assetService = newService();
+        Location l = newLocation();
+        
+        replayControls();
+        
+        ClasspathAssetFactory factory = new ClasspathAssetFactory();
+        factory.setClassResolver(getClassResolver());
+        factory.setAssetService(assetService);
+        factory.setLocalizer(new DefaultResourceLocalizer());
+        
+        Resource subResource = new ClasspathResource(getClassResolver(),
+                "/org/apache/tapestry/asset/subresource/sub-resource.txt");
+        IAsset asset = factory.createAsset(subResource, l);
+        
+        assertTrue(asset instanceof PrivateAsset);
+        assertEquals("/org/apache/tapestry/asset/subresource/sub-resource.txt",
+                asset.getResourceLocation().getPath());
+        assertSame(l, asset.getLocation());
+        
+        verifyControls();
+    }
+    
     private ClasspathResource newBaseResource()
     {
         return new ClasspathResource(getClassResolver(),

Modified: jakarta/tapestry/branches/4.0/framework/src/test/org/apache/tapestry/describe/HTMLDescriptionReceiverTest.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/branches/4.0/framework/src/test/org/apache/tapestry/describe/HTMLDescriptionReceiverTest.java?rev=367727&r1=367726&r2=367727&view=diff
==============================================================================
--- jakarta/tapestry/branches/4.0/framework/src/test/org/apache/tapestry/describe/HTMLDescriptionReceiverTest.java (original)
+++ jakarta/tapestry/branches/4.0/framework/src/test/org/apache/tapestry/describe/HTMLDescriptionReceiverTest.java Tue Jan 10 10:48:09 2006
@@ -29,6 +29,7 @@
  */
 public class HTMLDescriptionReceiverTest extends BaseDescribeTestCase
 {
+	
     protected DescribableStrategy newStrategy()
     {
         return (DescribableStrategy) newMock(DescribableStrategy.class);

Modified: jakarta/tapestry/branches/4.0/framework/src/test/org/apache/tapestry/engine/encoders/AssetEncoderTest.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/branches/4.0/framework/src/test/org/apache/tapestry/engine/encoders/AssetEncoderTest.java?rev=367727&r1=367726&r2=367727&view=diff
==============================================================================
--- jakarta/tapestry/branches/4.0/framework/src/test/org/apache/tapestry/engine/encoders/AssetEncoderTest.java (original)
+++ jakarta/tapestry/branches/4.0/framework/src/test/org/apache/tapestry/engine/encoders/AssetEncoderTest.java Tue Jan 10 10:48:09 2006
@@ -31,16 +31,16 @@
     public void testWrongService()
     {
         ServiceEncoding encoding = newEncoding();
-
+        
         trainGetParameterValue(encoding, ServiceConstants.SERVICE, "foo");
-
+        
         replayControls();
-
+        
         new AssetEncoder().encode(encoding);
-
+        
         verifyControls();
     }
-
+    
     protected void trainGetParameterValue(ServiceEncoding encoding, String name, String value)
     {
         encoding.getParameterValue(name);
@@ -67,7 +67,7 @@
 
         verifyControls();
     }
-
+    
     protected void trainGetServletPath(ServiceEncoding encoding, String servletPath)
     {
         encoding.getServletPath();
@@ -77,18 +77,18 @@
     public void testEncode()
     {
         ServiceEncoding encoding = newEncoding();
-
+        
         trainGetParameterValue(encoding, ServiceConstants.SERVICE, Tapestry.ASSET_SERVICE);
         trainGetParameterValue(encoding, AssetService.PATH, "/foo/bar/Baz.gif");
         trainGetParameterValue(encoding, AssetService.DIGEST, "12345");
-
+        
         encoding.setServletPath("/assets/12345/foo/bar/Baz.gif");
         encoding.setParameterValue(AssetService.PATH, null);
         encoding.setParameterValue(AssetService.DIGEST, null);
         encoding.setParameterValue(ServiceConstants.SERVICE, null);
-
+        
         replayControls();
-
+        
         AssetEncoder encoder = new AssetEncoder();
         encoder.setPath("/assets");
 
@@ -100,14 +100,14 @@
     public void testDecode()
     {
         ServiceEncoding encoding = newEncoding();
-
+        
         trainGetServletPath(encoding, "/assets");
         trainGetPathInfo(encoding, "/12345/foo/bar/Baz.gif");
-
+        
         encoding.setParameterValue(ServiceConstants.SERVICE, Tapestry.ASSET_SERVICE);
         encoding.setParameterValue(AssetService.DIGEST, "12345");
         encoding.setParameterValue(AssetService.PATH, "/foo/bar/Baz.gif");
-
+        
         replayControls();
 
         AssetEncoder encoder = new AssetEncoder();

Modified: jakarta/tapestry/branches/4.0/framework/src/test/org/apache/tapestry/event/ReportStatusEventTest.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/branches/4.0/framework/src/test/org/apache/tapestry/event/ReportStatusEventTest.java?rev=367727&r1=367726&r2=367727&view=diff
==============================================================================
--- jakarta/tapestry/branches/4.0/framework/src/test/org/apache/tapestry/event/ReportStatusEventTest.java (original)
+++ jakarta/tapestry/branches/4.0/framework/src/test/org/apache/tapestry/event/ReportStatusEventTest.java Tue Jan 10 10:48:09 2006
@@ -57,7 +57,7 @@
         receiver.property("boolean-false", false);
         receiver.property("byte", (byte) 37);
         receiver.property("char", 'z');
-        receiver.property("double", (double) 3.14);
+        receiver.property("double", 3.14);
         receiver.property("float", (float) 9.99);
         receiver.property("int", -373);
         receiver.property("long", 373737l);
@@ -76,7 +76,7 @@
         event.property("boolean-false", false);
         event.property("byte", (byte) 37);
         event.property("char", 'z');
-        event.property("double", (double) 3.14);
+        event.property("double", 3.14);
         event.property("float", (float) 9.99);
         event.property("int", -373);
         event.property("long", 373737l);

Modified: jakarta/tapestry/branches/4.0/framework/src/test/org/apache/tapestry/form/validator/TestValidatorFactory.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/branches/4.0/framework/src/test/org/apache/tapestry/form/validator/TestValidatorFactory.java?rev=367727&r1=367726&r2=367727&view=diff
==============================================================================
--- jakarta/tapestry/branches/4.0/framework/src/test/org/apache/tapestry/form/validator/TestValidatorFactory.java (original)
+++ jakarta/tapestry/branches/4.0/framework/src/test/org/apache/tapestry/form/validator/TestValidatorFactory.java Tue Jan 10 10:48:09 2006
@@ -264,9 +264,8 @@
         }
         catch (ApplicationRuntimeException ex)
         {
-            assertEquals(
-                    "Error initializing validator 'fred' (class java.lang.Object): java.lang.Object",
-                    ex.getMessage());
+        		assertTrue(ex.getMessage()
+        				.startsWith("Error initializing validator 'fred' (class java.lang.Object): java.lang.Object"));
         }
 
         verifyControls();

Modified: jakarta/tapestry/branches/4.0/framework/src/test/org/apache/tapestry/junit/utils/TestDataSqueezer.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/branches/4.0/framework/src/test/org/apache/tapestry/junit/utils/TestDataSqueezer.java?rev=367727&r1=367726&r2=367727&view=diff
==============================================================================
--- jakarta/tapestry/branches/4.0/framework/src/test/org/apache/tapestry/junit/utils/TestDataSqueezer.java (original)
+++ jakarta/tapestry/branches/4.0/framework/src/test/org/apache/tapestry/junit/utils/TestDataSqueezer.java Tue Jan 10 10:48:09 2006
@@ -402,9 +402,9 @@
         assertEquals("fred", PropertyUtils.read(instance, "name"));
         assertEquals("flintstone", PropertyUtils.read(instance, "value"));
 
-        DataSqueezer ds = newDataSqueezer(resolver);
+        DataSqueezer ds1 = newDataSqueezer(resolver);
 
-        String encoded = ds.squeeze(instance);
+        String encoded = ds1.squeeze(instance);
 
         // OK; build a whole new class loader & stack to decode that
         // string back into an object.
@@ -430,11 +430,11 @@
 
     private DataSqueezer newDataSqueezer(ClassResolver resolver)
     {
-        DataSqueezerImpl ds = new DataSqueezerImpl();
+        DataSqueezerImpl retval = new DataSqueezerImpl();
         SerializableAdaptor adaptor = new SerializableAdaptor();
         adaptor.setResolver(resolver);
 
-        ds.register(adaptor);
-        return ds;
+        retval.register(adaptor);
+        return retval;
     }
 }

Modified: jakarta/tapestry/branches/4.0/framework/src/test/org/apache/tapestry/listener/TestListenerMapSource.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/branches/4.0/framework/src/test/org/apache/tapestry/listener/TestListenerMapSource.java?rev=367727&r1=367726&r2=367727&view=diff
==============================================================================
--- jakarta/tapestry/branches/4.0/framework/src/test/org/apache/tapestry/listener/TestListenerMapSource.java (original)
+++ jakarta/tapestry/branches/4.0/framework/src/test/org/apache/tapestry/listener/TestListenerMapSource.java Tue Jan 10 10:48:09 2006
@@ -276,9 +276,14 @@
         }
         catch (ApplicationRuntimeException ex)
         {
-            assertEquals(
-                    "Failure invoking listener method 'public void org.apache.tapestry.listener.ListenerMethodHolder.wrongTypes(java.util.Map)' on ListenerMethodHolder: argument type mismatch",
-                    ex.getMessage());
+        		assertEquals(IllegalArgumentException.class,
+        				ex.getRootCause().getClass());
+        		assertTrue(ex.getMessage()
+        				.startsWith("Failure invoking listener method 'public void "
+        						+ "org.apache.tapestry.listener.ListenerMethodHolder."
+        						+ "wrongTypes(java.util.Map)' on ListenerMethodHolder:"));
+        		//TODO: IBM jre doesn't format these messages the same as sun's jre,
+        		//IBM's message has no message string source for the IllegalArgumentException
             assertSame(holder, ex.getComponent());
         }
 

Modified: jakarta/tapestry/branches/4.0/framework/src/test/org/apache/tapestry/services/impl/EngineServiceInnerProxyTest.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/branches/4.0/framework/src/test/org/apache/tapestry/services/impl/EngineServiceInnerProxyTest.java?rev=367727&r1=367726&r2=367727&view=diff
==============================================================================
--- jakarta/tapestry/branches/4.0/framework/src/test/org/apache/tapestry/services/impl/EngineServiceInnerProxyTest.java (original)
+++ jakarta/tapestry/branches/4.0/framework/src/test/org/apache/tapestry/services/impl/EngineServiceInnerProxyTest.java Tue Jan 10 10:48:09 2006
@@ -24,8 +24,9 @@
  * @author Howard M. Lewis Ship
  * @since 4.0
  */
-public class EngineServiceInnerProxyTest extends AbstractEngineServiceProxyTestCase
-{
+public class EngineServiceInnerProxyTest extends
+        AbstractEngineServiceProxyTestCase {
+
     private EngineServiceSource newSource(String name, IEngineService service)
     {
         EngineServiceSource source = newSource();
@@ -43,17 +44,19 @@
 
         replayControls();
 
-        EngineServiceInnerProxy proxy = new EngineServiceInnerProxy("Inner", outer, source);
+        EngineServiceInnerProxy proxy = new EngineServiceInnerProxy("Inner",
+                outer, source);
 
         assertEquals("Inner", proxy.getName());
-        assertEquals("<InnerProxy for engine service 'Inner'>", proxy.toString());
+        assertEquals("<InnerProxy for engine service 'Inner'>", proxy
+                .toString());
 
         verifyControls();
     }
 
     protected EngineServiceSource newSource()
     {
-        return (EngineServiceSource) newMock(EngineServiceSource.class);
+        return (EngineServiceSource)newMock(EngineServiceSource.class);
     }
 
     public void testGetLinkNonPost()
@@ -71,7 +74,8 @@
         replayControls();
 
         EngineServiceOuterProxy outer = new EngineServiceOuterProxy("fred");
-        EngineServiceInnerProxy inner = new EngineServiceInnerProxy("fred", outer, source);
+        EngineServiceInnerProxy inner = new EngineServiceInnerProxy("fred",
+                outer, source);
 
         outer.installDelegate(inner);
 
@@ -97,7 +101,8 @@
         replayControls();
 
         EngineServiceOuterProxy outer = new EngineServiceOuterProxy("fred");
-        EngineServiceInnerProxy inner = new EngineServiceInnerProxy("fred", outer, source);
+        EngineServiceInnerProxy inner = new EngineServiceInnerProxy("fred",
+                outer, source);
 
         outer.installDelegate(inner);
 
@@ -107,7 +112,9 @@
 
         verifyControls();
     }
-    public void testService() throws Exception
+
+    public void testService()
+        throws Exception
     {
         IRequestCycle cycle = newCycle();
         IEngineService service = newEngineService();
@@ -119,7 +126,8 @@
         replayControls();
 
         EngineServiceOuterProxy outer = new EngineServiceOuterProxy("fred");
-        EngineServiceInnerProxy inner = new EngineServiceInnerProxy("fred", outer, source);
+        EngineServiceInnerProxy inner = new EngineServiceInnerProxy("fred",
+                outer, source);
 
         outer.installDelegate(inner);
 

Modified: jakarta/tapestry/branches/4.0/portlet/src/test/org/apache/tapestry/portlet/TestRenderService.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/branches/4.0/portlet/src/test/org/apache/tapestry/portlet/TestRenderService.java?rev=367727&r1=367726&r2=367727&view=diff
==============================================================================
--- jakarta/tapestry/branches/4.0/portlet/src/test/org/apache/tapestry/portlet/TestRenderService.java (original)
+++ jakarta/tapestry/branches/4.0/portlet/src/test/org/apache/tapestry/portlet/TestRenderService.java Tue Jan 10 10:48:09 2006
@@ -1,17 +1,3 @@
-// Copyright 2006 The Apache Software Foundation
-//
-// Licensed 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.tapestry.portlet;
 
 import javax.portlet.PortletMode;

Modified: jakarta/tapestry/branches/4.0/project.properties
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/branches/4.0/project.properties?rev=367727&r1=367726&r2=367727&view=diff
==============================================================================
--- jakarta/tapestry/branches/4.0/project.properties (original)
+++ jakarta/tapestry/branches/4.0/project.properties Tue Jan 10 10:48:09 2006
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 project.name=jakarta-tapestry
-project.version=4.0
+project.version=5.0.0
 
 dist.name=tapestry
 

Modified: jakarta/tapestry/branches/4.0/src/documentation/content/xdocs/UsersGuide/script.xml
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/branches/4.0/src/documentation/content/xdocs/UsersGuide/script.xml?rev=367727&r1=367726&r2=367727&view=diff
==============================================================================
--- jakarta/tapestry/branches/4.0/src/documentation/content/xdocs/UsersGuide/script.xml (original)
+++ jakarta/tapestry/branches/4.0/src/documentation/content/xdocs/UsersGuide/script.xml Tue Jan 10 10:48:09 2006
@@ -1,18 +1,18 @@
 <?xml version="1.0"?>
 <!-- 
-   Copyright 2005 The Apache Software Foundation
-
-   Licensed 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.
+    Copyright 2005 The Apache Software Foundation
+    
+    Licensed 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.
 -->
 
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.3//EN"

Modified: jakarta/tapestry/branches/4.0/src/documentation/content/xdocs/UsersGuide/validation.xml
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/branches/4.0/src/documentation/content/xdocs/UsersGuide/validation.xml?rev=367727&r1=367726&r2=367727&view=diff
==============================================================================
--- jakarta/tapestry/branches/4.0/src/documentation/content/xdocs/UsersGuide/validation.xml (original)
+++ jakarta/tapestry/branches/4.0/src/documentation/content/xdocs/UsersGuide/validation.xml Tue Jan 10 10:48:09 2006
@@ -14,7 +14,6 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.2//EN" "./dtd/document-v12.dtd"
 [
 	<!ENTITY projectroot '../'>

Modified: jakarta/tapestry/branches/4.0/src/documentation/content/xdocs/index.xml
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/branches/4.0/src/documentation/content/xdocs/index.xml?rev=367727&r1=367726&r2=367727&view=diff
==============================================================================
--- jakarta/tapestry/branches/4.0/src/documentation/content/xdocs/index.xml (original)
+++ jakarta/tapestry/branches/4.0/src/documentation/content/xdocs/index.xml Tue Jan 10 10:48:09 2006
@@ -119,7 +119,23 @@
 
 </section>
 
-
+  <section>
+    <title>Beyond Tapestry 4.0</title>
+    
+    <p>
+      It isn't clear whether the next release of Tapestry will be numbered 4.1 or 5.0 ... it depends on the
+      number and kind of API changes that occur. In any case, we hope to have it out in a much shorter
+      time span than the 4.0 release (which took almost two years); preferably about six months.  You may
+      see the code name <em>Magritte</em> as a placeholder name until the version number is tied down (Tapestry 4.0
+      was <em>Picasso</em>).
+    </p>    
+    
+    <p>
+      We're still working on the feature set right now, and any thing available from Subversion trunk
+      is very definately unstable and alpha.
+    </p>
+    
+  </section>
 
 <section>
   <title>Tapestry 4.0</title>
@@ -322,11 +338,6 @@
 <link href="http://www.onjava.com/pub/a/onjava/2001/11/21/tapestry.html">OnJava</link>,
 in November 2001.
 </p>
-
-  <p>
-    IBM's DeveloperWorks has published a great article on setting up and using
-    Tapestry: <link href="http://www-128.ibm.com/developerworks/java/library/j-tapestry1/">In Tune with Tapestry</link>.
-  </p>
 
 </section>
 

Modified: jakarta/tapestry/branches/4.0/status.xml
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/branches/4.0/status.xml?rev=367727&r1=367726&r2=367727&view=diff
==============================================================================
--- jakarta/tapestry/branches/4.0/status.xml (original)
+++ jakarta/tapestry/branches/4.0/status.xml Tue Jan 10 10:48:09 2006
@@ -24,6 +24,7 @@
     <person name="Mind Bridge" id="MB"/>
     <person name="Geoff Longman" id="GL"/>
     <person name="Paul Ferraro" email="pmf8@columbia.edu" id="PF"/>
+    <person name="Jesse Kuhnert" email="jkuhnert@gmail.com" id="JK"/>
     <!-- Add more people here -->
     <!-- Retired: -->
     <person name="Malcom Edgar" id="ME"/>
@@ -54,6 +55,16 @@
     -->
   </todo>
   <changes>
+    <release version="5.0.0" date="unreleased">
+      <action type="update" dev="JK" >Cleaned up warnings/imports showing on eclipse problem pane.</action>
+      <action type="add" dev="JK" fixes-bug="TAPESTRY-821">ResourceMatcher service added with configurable regexp pattern 
+      hivemind contributions to conditionally allow some resources to not
+      require md5sum digest checks.</action>
+      <action type="add" dev="JK" fixes-bug="TAPESTRY-812" due-to="Takashi Okamoto">
+      Added japanese localized validator strings.
+      </action>
+      <action type="fix" dev="HLS" fixes-bug="TAPESTRY-787">Port late bug fixes from 4.0 branch to trunk</action>
+    </release>
     <release version="4.0" date="Jan 6 2006">
       <action type="update" dev="HLS">Add link to DeveloperWorks Tapestry article</action>
     </release>
@@ -93,7 +104,7 @@
         are used in thread-unsafe manner</action>
       <action type="fix" dev="HLS" fixes-bug="TAPESTRY-767">tapestry.url.ServiceEncoders has reversed the descriptions
         of the after and before attributes</action>
-      <action type="fix" dev="HLS" fixes-bug="TAPESTRY-739">Change return type to inteface for:
+      <action type="fix" dev="HLS" fixes-bug="TAPESTRY-739">Change return type to interface for
         ListenerMapSource.createListenerMethodInvoker()</action>
       <action type="fix" dev="HLS" fixes-bug="TAPESTRY-387" due-to="Kevin J. Menard, Jr.">Typographical Errors in
         Documentation</action>



---------------------------------------------------------------------
To unsubscribe, e-mail: tapestry-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tapestry-dev-help@jakarta.apache.org


Mime
View raw message