Author: thomas.diesler(a)jboss.com Date: 2006-12-21 07:40:22 -0500 (Thu, 21 Dec 2006) New Revision: 1683 Added: branches/tdiesler/trunk/build/ branches/tdiesler/trunk/build/JBossWSCodeStyle.xml branches/tdiesler/trunk/build/README-COMMITTERS branches/tdiesler/trunk/build/ant.properties.example branches/tdiesler/trunk/build/build.xml branches/tdiesler/trunk/build/version.properties branches/tdiesler/trunk/integration-jboss42/ branches/tdiesler/trunk/integration-jboss50/ branches/tdiesler/trunk/integration-tomcat/ branches/tdiesler/trunk/jbossws/ branches/tdiesler/trunk/jbossws/src/ branches/tdiesler/trunk/jbossws/src/ant/ branches/tdiesler/trunk/jbossws/src/main/ branches/tdiesler/trunk/jbossws/src/test/ Removed: branches/tdiesler/trunk/.classpath branches/tdiesler/trunk/.project branches/tdiesler/trunk/JBossWSCodeStyle.xml branches/tdiesler/trunk/README-COMMITTERS branches/tdiesler/trunk/STATUS_AND_NEWS.txt branches/tdiesler/trunk/ant.properties.example branches/tdiesler/trunk/build.xml branches/tdiesler/trunk/jbossws/src/ant/ branches/tdiesler/trunk/jbossws/src/main/ branches/tdiesler/trunk/jbossws/src/test/ branches/tdiesler/trunk/src/ branches/tdiesler/trunk/version.properties Modified: branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/integration/tomcat/CrossContextLoader.java Log: partial commit Deleted: branches/tdiesler/trunk/.classpath =================================================================== --- branches/tdiesler/trunk/.classpath 2006-12-21 12:35:57 UTC (rev 1682) +++ branches/tdiesler/trunk/.classpath 2006-12-21 12:40:22 UTC (rev 1683) @@ -1,35 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry excluding="org/jboss/ws/integration/jboss50/**" kind="src" path="src/main/java"/> - <classpathentry kind="lib" path="thirdparty/activation.jar"/> - <classpathentry kind="lib" path="thirdparty/mailapi.jar"/> - <classpathentry kind="lib" path="thirdparty/qdox.jar"/> - <classpathentry kind="lib" path="thirdparty/servlet-api.jar"/> - <classpathentry kind="lib" path="thirdparty/wsdl4j.jar"/> - <classpathentry kind="lib" path="thirdparty/xercesImpl.jar"/> - <classpathentry kind="lib" path="thirdparty/xml-apis.jar"/> - <classpathentry kind="lib" path="thirdparty/xmlsec.jar"/> - <classpathentry kind="lib" path="thirdparty/xmlunit1.0.jar"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="lib" path="thirdparty/xalan.jar"/> - <classpathentry kind="lib" path="thirdparty/junit.jar"/> - <classpathentry kind="lib" path="thirdparty/concurrent.jar"/> - <classpathentry kind="lib" path="thirdparty/javassist.jar"/> - <classpathentry kind="lib" path="thirdparty/jboss-xml-binding.jar"/> - <classpathentry kind="lib" path="thirdparty/policy-1.0.jar"/> - <classpathentry kind="lib" path="thirdparty/stax-api-1.0.jar"/> - <classpathentry kind="lib" path="thirdparty/wstx-lgpl-2.0.6.jar"/> - <classpathentry kind="lib" path="thirdparty/jaxb-api.jar"/> - <classpathentry kind="lib" path="thirdparty/ant.jar"/> - <classpathentry kind="lib" path="thirdparty/jboss-container.jar" sourcepath="/home/tdiesler/svn/jbossmc/trunk/container/src/main"/> - <classpathentry kind="lib" path="thirdparty/jboss-microcontainer.jar"/> - <classpathentry kind="lib" path="thirdparty/jboss-remoting.jar"/> - <classpathentry kind="lib" path="thirdparty/jaxb-xjc.jar"/> - <classpathentry kind="lib" path="thirdparty/jaxb-impl.jar"/> - <classpathentry kind="lib" path="thirdparty/jboss-deployers.jar" sourcepath="/home/tdiesler/svn/jbossmc/trunk/deployers/src/main"/> - <classpathentry kind="lib" path="thirdparty/jboss-common-core.jar"/> - <classpathentry kind="lib" path="thirdparty/jboss-dependency.jar"/> - <classpathentry kind="lib" path="thirdparty/jboss-logging-spi.jar"/> - <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jboss-4.2.x"/> - <classpathentry kind="output" path="output-eclipse"/> -</classpath> Deleted: branches/tdiesler/trunk/.project =================================================================== --- branches/tdiesler/trunk/.project 2006-12-21 12:35:57 UTC (rev 1682) +++ branches/tdiesler/trunk/.project 2006-12-21 12:40:22 UTC (rev 1683) @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>trunk</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.jdt.core.javanature</nature> - </natures> -</projectDescription> Deleted: branches/tdiesler/trunk/JBossWSCodeStyle.xml =================================================================== --- branches/tdiesler/trunk/JBossWSCodeStyle.xml 2006-12-21 12:35:57 UTC (rev 1682) +++ branches/tdiesler/trunk/JBossWSCodeStyle.xml 2006-12-21 12:40:22 UTC (rev 1683) @@ -1,246 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<profiles version="8"> -<profile name="JBossWSCodeStyle" version="8"> -<setting id="org.eclipse.jdt.core.formatter.align_type_members_on_columns" value="false"/> -<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression" value="16"/> -<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant" value="16"/> -<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call" value="16"/> -<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation" value="16"/> -<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression" value="16"/> -<setting id="org.eclipse.jdt.core.formatter.alignment_for_binary_expression" value="16"/> -<setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_if" value="16"/> -<setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression" value="80"/> -<setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="0"/> -<setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer" value="16"/> -<setting id="org.eclipse.jdt.core.formatter.alignment_for_multiple_fields" value="16"/> -<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration" value="16"/> -<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration" value="16"/> -<setting id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation" value="16"/> -<setting id="org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration" value="16"/> -<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration" value="16"/> -<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration" value="16"/> -<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration" value="16"/> -<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration" value="16"/> -<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_imports" value="1"/> -<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_package" value="1"/> -<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_field" value="0"/> -<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration" value="0"/> -<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value="1"/> -<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_member_type" value="1"/> -<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_method" value="1"/> -<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk" value="1"/> -<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_package" value="0"/> -<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations" value="1"/> -<setting id="org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration" value="end_of_line"/> -<setting id="org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration" value="end_of_line"/> -<setting id="org.eclipse.jdt.core.formatter.brace_position_for_array_initializer" value="end_of_line"/> -<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block" value="next_line"/> -<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block_in_case" value="next_line"/> -<setting id="org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration" value="next_line"/> -<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_constant" value="next_line"/> -<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration" value="next_line"/> -<setting id="org.eclipse.jdt.core.formatter.brace_position_for_method_declaration" value="next_line"/> -<setting id="org.eclipse.jdt.core.formatter.brace_position_for_switch" value="next_line"/> -<setting id="org.eclipse.jdt.core.formatter.brace_position_for_type_declaration" value="next_line"/> -<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines" value="false"/> -<setting id="org.eclipse.jdt.core.formatter.comment.format_comments" value="false"/> -<setting id="org.eclipse.jdt.core.formatter.comment.format_header" value="false"/> -<setting id="org.eclipse.jdt.core.formatter.comment.format_html" value="true"/> -<setting id="org.eclipse.jdt.core.formatter.comment.format_source_code" value="true"/> -<setting id="org.eclipse.jdt.core.formatter.comment.indent_parameter_description" value="true"/> -<setting id="org.eclipse.jdt.core.formatter.comment.indent_root_tags" value="true"/> -<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="80"/> -<setting id="org.eclipse.jdt.core.formatter.compact_else_if" value="true"/> -<setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="2"/> -<setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="2"/> -<setting id="org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line" value="false"/> -<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header" value="true"/> -<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header" value="true"/> -<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header" value="true"/> -<setting id="org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases" value="true"/> -<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_block" value="true"/> -<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_body" value="true"/> -<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases" value="true"/> -<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch" value="true"/> -<setting id="org.eclipse.jdt.core.formatter.indentation.size" value="3"/> -<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_binary_operator" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_ellipsis" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_unary_operator" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_binary_operator" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_ellipsis" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_unary_operator" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line" value="true"/> -<setting id="org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line" value="false"/> -<setting id="org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line" value="false"/> -<setting id="org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line" value="false"/> -<setting id="org.eclipse.jdt.core.formatter.lineSplit" value="168"/> -<setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body" value="0"/> -<setting id="org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve" value="1"/> -<setting id="org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line" value="true"/> -<setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="space"/> -<setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="3"/> -<setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="false"/> -</profile> -</profiles> Deleted: branches/tdiesler/trunk/README-COMMITTERS =================================================================== --- branches/tdiesler/trunk/README-COMMITTERS 2006-12-21 12:35:57 UTC (rev 1682) +++ branches/tdiesler/trunk/README-COMMITTERS 2006-12-21 12:40:22 UTC (rev 1683) @@ -1,19 +0,0 @@ -1. Edit your subversion config ~/.subversion/config and set the following in each section: - -[miscellany] -enable-auto-props = yes - -[auto-props] -*.java = svn:keywords=Id Revision;svn:eol-style=LF -*.xml = svn:keywords=Id Revision;svn:eol-style=LF -*.wsdl = svn:keywords=Id Revision;svn:eol-style=LF -*.xsd = svn:keywords=Id Revision;svn:eol-style=LF -*.txt = svn:keywords=Id Revision;svn:eol-style=LF - -2. If you are using an IDE, make sure that it refers to the same config. So, -for example, if you are using Eclipse with Subclipse on windows, you need to -set Team->SVN->Configuration Location to: - -c:\cygwin\home\<your user name>\.subversion - -3. If you are using Eclipse, set your code style to JBossWSCodeStyle.xml Deleted: branches/tdiesler/trunk/STATUS_AND_NEWS.txt =================================================================== --- branches/tdiesler/trunk/STATUS_AND_NEWS.txt 2006-12-21 12:35:57 UTC (rev 1682) +++ branches/tdiesler/trunk/STATUS_AND_NEWS.txt 2006-12-21 12:40:22 UTC (rev 1683) @@ -1,47 +0,0 @@ -# $Id$ - -a -18-Dec-2006 ------------ -* All good with jbossas -r 59084 - -11-Dec-2006 ------------ - -* Synchronize JAXWS API with 2.1 -* Add unimplemented methods - BindingImpl: getBindingID - HTTPBindingJAXWS: getBindingID - SOAP11BindingJAXWS: getBindingID - SOAP12BindingJAXWS: getBindingID - MessageBindingJAXWS: getBindingID - PayloadBindingJAXWS: getBindingID - BindingProvider: getEndpointReference - ClientImpl: getEndpointReference - ServiceDelegateImpl: methods with WebServiceFeature - -23-Nov-2006 ------------ - -* You should expect to see no test failures against jbossas -r 58663 -* ant tests | grep FIXME | sort -u - [junit] FIXME: [JBAS-3824] Fix ENC for EJB2.1 and Servlets - [junit] FIXME: [JBAS-3825] Fix BASIC authentication - [junit] FIXME: [JBWEB-68] Servlet.init(ServletConfig) not called - [junit] FIXME: [JBWS-1291] Fix JaxrpcMappingValidator - [junit] FIXME: [JBWS-1294] Add support for mapping async methods - [junit] FIXME: [JBWS-1297] Implement JAXB Fault Marshalling - [junit] FIXME: [JBWS-1312] Fix JMS transport in trunk - [junit] FIXME: [JBWS-1313] Fix XOP tests in trunk - [junit] FIXME: [JBWS-1328] Client security configuration not loaded when client deployed with issolated classloader - [junit] FIXME: [JBWS-1329] Fix StorePassEncryptTestCase for jbossas-5.0 - [junit] FIXME: [JBWS-1330] Fix jaxrpc wsse tests for jbossws-5.0 - [junit] FIXME: [JBWS-1394] Fix OneWayJava2WSDLTestCase in trunk - [junit] FIXME: [JBWS-1397] Fix <wsdl-publish-location> for jboss-5.0.x - [junit] FIXME: [JBWS-269] Support attachments in Web Services Tools - [junit] FIXME: [JBWS-434] Support sequences of anys - [junit] FIXME: [JBWS-798] Complete EventingTestCase - [junit] FIXME: [JBWS-868] BPEL in jbossws-samples - [junit] FIXME: [JBWS-940] Add wsdl-java support for jdk 1.4 typesafe enums - [junit] FIXME: [JBWS-981] Virtual host configuration for EJB endpoints - Deleted: branches/tdiesler/trunk/ant.properties.example =================================================================== --- branches/tdiesler/trunk/ant.properties.example 2006-12-21 12:35:57 UTC (rev 1682) +++ branches/tdiesler/trunk/ant.properties.example 2006-12-21 12:40:22 UTC (rev 1683) @@ -1,36 +0,0 @@ -# -# A sample ant properties file -# - -# Required JBoss Home -#jboss50.home=/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta2 -#jboss42.home=/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.CR1 - -# The JBoss server instance -jboss.server.instance=default - -# Tomcat Home -tomcat.home=/usr/java/tomcat -tomcat.manager.username=manager -tomcat.manager.password=manager - -# The target server the test endpoints are deployed to -# This can be [jboss|tomcat] -jbossws.target.server=jboss - -# JBoss Repository -#jboss.repository=file:/home/tdiesler/cvs/jboss.local.repository -jboss.repository=http://repository.jboss.com - -# JBossWS Release -jbossws.portal.content=/home/tdiesler/svn/jbossws/portal-content -jboss.local.repository=/home/tdiesler/cvs/jboss.local.repository - -# Force thirdparty HTTP get -#force.thirdparty.get=true - -# Java Compiler options -javac.debug=yes -javac.deprecation=yes -javac.fail.onerror=yes -javac.verbose=no Copied: branches/tdiesler/trunk/build/JBossWSCodeStyle.xml (from rev 1675, branches/tdiesler/trunk/JBossWSCodeStyle.xml) Copied: branches/tdiesler/trunk/build/README-COMMITTERS (from rev 1675, branches/tdiesler/trunk/README-COMMITTERS) Copied: branches/tdiesler/trunk/build/ant.properties.example (from rev 1675, branches/tdiesler/trunk/ant.properties.example) Copied: branches/tdiesler/trunk/build/build.xml (from rev 1675, branches/tdiesler/trunk/build.xml) Copied: branches/tdiesler/trunk/build/version.properties (from rev 1675, branches/tdiesler/trunk/version.properties) Deleted: branches/tdiesler/trunk/build.xml =================================================================== --- branches/tdiesler/trunk/build.xml 2006-12-21 12:35:57 UTC (rev 1682) +++ branches/tdiesler/trunk/build.xml 2006-12-21 12:40:22 UTC (rev 1683) @@ -1,528 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- ====================================================================== --> -<!-- --> -<!-- JBoss, the OpenSource J2EE webOS --> -<!-- --> -<!-- Distributable under LGPL license. --> -<!-- See terms of license at http://www.gnu.org. --> -<!-- --> -<!-- ====================================================================== --> - -<!-- $Id$ --> - -<project default="main" name="JBossWS"> - - <import file="${basedir}/src/ant/build-thirdparty.xml"/> - <import file="${basedir}/src/ant/build-samples.xml"/> - <import file="${basedir}/src/ant/build-release.xml"/> - - <!-- ================================================================== --> - <!-- Setup --> - <!-- ================================================================== --> - - <property file="ant.properties"/> - <property file="version.properties"/> - - <property environment="env"/> - <property name="build.dir" value="${basedir}/output"/> - <property name="build.classes.dir" value="${build.dir}/classes"/> - <property name="build.classes14.dir" value="${build.dir}/classes14"/> - <property name="build.etc.dir" value="${build.dir}/etc"/> - <property name="build.lib.dir" value="${build.dir}/lib"/> - <property name="build.resources.dir" value="${build.dir}/resources"/> - <property name="build.samples.dir" value="${build.dir}/samples"/> - <property name="build.bin.dist" value="${build.dir}/bin-dist"/> - <property name="build.src.dist" value="${build.dir}/src-dist"/> - <property name="build.api" value="${build.dir}/api"/> - <property name="docs.userguide.dir" value="${basedir}/docs/user-guide/project"/> - <property name="src.dir" value="${basedir}/src/main"/> - <property name="src.etc.dir" value="${src.dir}/etc"/> - <property name="src.java.dir" value="${src.dir}/java"/> - <property name="src.resources.dir" value="${src.dir}/resources"/> - <property name="src.dist.dir" value="${src.resources.dir}/dist"/> - <property name="src.samples.dir" value="${src.resources.dir}/samples"/> - <property name="test.dir" value="${basedir}/src/test"/> - <property name="test.etc.dir" value="${test.dir}/etc"/> - <property name="test.java.dir" value="${test.dir}/java"/> - <property name="test.resources.dir" value="${test.dir}/resources"/> - - <property name="thirdparty.dir" value="${basedir}/thirdparty"/> - - <property name="jboss50.lib" value="${jboss50.home}/lib"/> - <property name="jboss50.client" value="${jboss50.home}/client"/> - <property name="jboss50.server" value="${jboss50.home}/server/${jboss.server.instance}"/> - <property name="jboss50.server.lib" value="${jboss50.server}/lib"/> - <property name="jboss50.server.deploy" value="${jboss50.server}/deploy"/> - <property name="jboss50.server.deployers" value="${jboss50.server}/deployers"/> - <property name="jboss50.thirdparty" value="${jboss50.home}/../../../thirdparty"/> - - <property name="jboss42.lib" value="${jboss42.home}/lib"/> - <property name="jboss42.client" value="${jboss42.home}/client"/> - <property name="jboss42.server" value="${jboss42.home}/server/${jboss.server.instance}"/> - <property name="jboss42.server.lib" value="${jboss42.server}/lib"/> - <property name="jboss42.server.deploy" value="${jboss42.server}/deploy"/> - <property name="jboss42.thirdparty" value="${jboss42.home}/../../../thirdparty"/> - - <property name="tomcat.webapps.dir" value="${tomcat.home}/webapps"/> - <property name="tomcat.common.dir" value="${tomcat.home}/common"/> - - <!-- ================================================================== --> - <!-- Initialization --> - <!-- ================================================================== --> - - <target name="prepare"> - - <echo message="jboss50.home = ${jboss50.home}"/> - <echo message="jboss42.home = ${jboss42.home}"/> - <echo message="tomcat.home = ${tomcat.home}"/> - <echo/> - - <available property="jbossws.portal.content.available" file="${jbossws.portal.content}" type="dir"/> - <available property="jboss50.ejb3.available" file="${jboss50.client}/jboss-ejb3-client.jar"/> - <available property="jboss42.ejb3.available" file="${jboss42.client}/jboss-ejb3-client.jar"/> - <available property="jbossws.thirdparty.available" file="${build.lib.dir}/jbossws-thirdparty.jar"/> - <available property="jboss.source.dist.available" file="${jboss.thirdparty}" type="dir"/> - <available property="tomcat.available" file="${tomcat.home}/server/lib/catalina.jar"/> - - <checksum file="version.properties" fileext=".md5" verifyproperty="checksum.ok"/> - <checksum file="version.properties" fileext=".md5"/> - - <condition property="force.thirdparty.get"> - <or> - <not> - <available file="${thirdparty.dir}" type="dir"/> - </not> - <isfalse value="${checksum.ok}"/> - </or> - </condition> - - <fail message="Not available: ${jboss50.client}/jboss-ejb3-client.jar" unless="jboss50.ejb3.available"/> - <fail message="Not available: ${jboss42.client}/jboss-ejb3-client.jar" unless="jboss42.ejb3.available"/> - - <tstamp> - <format property="build.id" pattern="yyyyMMddHHmm"/> - </tstamp> - - </target> - - <target name="init" depends="prepare, thirdparty"> - - <!-- The combined compile classpath --> - <path id="core.classpath"> - <path refid="library.classpath"/> - <path refid="jboss.core.classpath"/> - </path> - - </target> - - <!-- ================================================================== --> - <!-- Compile --> - <!-- ================================================================== --> - - <!-- - | Compile everything. - | - | This target should depend on other compile-* targets for each - | different type of compile that needs to be performed, short of - | documentation compiles. - --> - - <target name="compile" depends="init,compile-classes,compile-etc,compile-resources" description="Compile all source files."/> - - <!-- Compile java sources --> - <target name="compile-classes" depends="compile-interfaces,compile-core,compile-integration"/> - - <!-- Compile core java sources --> - <target name="compile-interfaces" depends="init"> - <mkdir dir="${build.classes14.dir}"/> - <javac srcdir="${src.java.dir}" destdir="${build.classes14.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}" deprecation="${javac.deprecation}" - failonerror="${javac.fail.onerror}" source="1.4" target="1.4"> - <include name="javax/xml/rpc/**"/> - <include name="javax/xml/soap/**"/> - <classpath refid="core.classpath"/> - </javac> - </target> - - <!-- Compile core java sources --> - <target name="compile-core" depends="compile-interfaces"> - <mkdir dir="${build.classes.dir}"/> - <javac srcdir="${src.java.dir}" sourcepath="" destdir="${build.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}" - deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}"> - <include name="javax/xml/ws/**"/> - <include name="javax/jws/**"/> - <include name="org/jboss/ws/**"/> - <exclude name="org/jboss/ws/integration/**"/> - <classpath path="${build.classes14.dir}"/> - <classpath refid="core.classpath"/> - </javac> - </target> - - <!-- Compile integration java sources --> - <target name="compile-integration" depends="compile-jboss50-integration,compile-jboss42-integration,compile-tomcat-integration"/> - <target name="compile-jboss50-integration" depends="compile-core"> - <mkdir dir="${build.classes.dir}"/> - <javac srcdir="${src.java.dir}" sourcepath="" destdir="${build.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}" - deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}"> - <include name="org/jboss/ws/integration/jboss50/**"/> - <classpath path="${build.classes14.dir}"/> - <classpath refid="jboss50.integration.classpath"/> - <classpath refid="core.classpath"/> - </javac> - </target> - <target name="compile-jboss42-integration" depends="compile-core"> - <mkdir dir="${build.classes.dir}"/> - <javac srcdir="${src.java.dir}" sourcepath="" destdir="${build.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}" - deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}"> - <include name="org/jboss/ws/integration/jboss42/**"/> - <classpath path="${build.classes14.dir}"/> - <classpath refid="jboss42.integration.classpath"/> - <classpath refid="core.classpath"/> - </javac> - </target> - <target name="compile-tomcat-integration" depends="compile-core"> - <mkdir dir="${build.classes.dir}"/> - <javac srcdir="${src.java.dir}" sourcepath="" destdir="${build.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}" - deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}"> - <include name="org/jboss/ws/integration/tomcat/**"/> - <classpath path="${build.classes14.dir}"/> - <classpath refid="tomcat.integration.classpath"/> - <classpath refid="core.classpath"/> - </javac> - </target> - - <!-- Compile etc files (manifests and such) --> - <target name="compile-etc" depends="init"> - <mkdir dir="${build.etc.dir}"/> - <copy todir="${build.etc.dir}" filtering="yes" overwrite="yes"> - <fileset dir="${src.etc.dir}"/> - <filterset> - <filter token="java.vm.version" value="${java.vm.version}"/> - <filter token="java.vm.vendor" value="${java.vm.vendor}"/> - <filter token="build.id" value="${build.id}"/> - <filter token="implementation.version" value="jbossws-${version.id}"/> - <filtersfile file="version.properties"/> - </filterset> - </copy> - </target> - - <!-- Compile resource files --> - <target name="compile-resources" depends="init"> - <mkdir dir="${build.resources.dir}"/> - <copy todir="${build.resources.dir}" filtering="yes" overwrite="yes"> - <fileset dir="${src.resources.dir}"/> - </copy> - </target> - - <!-- ================================================================== --> - <!-- Archives --> - <!-- ================================================================== --> - - <!-- - | Build all jar files. - --> - <target name="jars" description="Builds all jar files." depends="compile,module-jars"> - </target> - - <!-- - | Build all jar files. - --> - <target name="module-jars"> - - <!-- Build jboss-jaxrpc.jar --> - <mkdir dir="${build.lib.dir}"/> - <jar jarfile="${build.lib.dir}/jboss-jaxrpc.jar" manifest="${build.etc.dir}/default.mf"> - <fileset dir="${build.classes14.dir}"> - <include name="javax/xml/rpc/**"/> - </fileset> - </jar> - - <!-- Build jboss-saaj.jar --> - <mkdir dir="${build.lib.dir}"/> - <jar jarfile="${build.lib.dir}/jboss-saaj.jar" manifest="${build.etc.dir}/default.mf"> - <fileset dir="${build.classes14.dir}"> - <include name="javax/xml/soap/**"/> - </fileset> - <metainf dir="${build.resources.dir}/jboss-saaj.jar/META-INF"/> - </jar> - - <!-- Build jboss-jaxws.jar --> - <mkdir dir="${build.lib.dir}"/> - <jar jarfile="${build.lib.dir}/jboss-jaxws.jar" manifest="${build.etc.dir}/default.mf"> - <fileset dir="${build.classes.dir}"> - <include name="javax/jws/**"/> - <include name="javax/xml/ws/**"/> - <include name="org/jboss/ws/jaxws/injection/**"/> - </fileset> - </jar> - - <!-- Build jbossws-core.jar --> - <mkdir dir="${build.lib.dir}"/> - <jar jarfile="${build.lib.dir}/jbossws-core.jar" manifest="${build.etc.dir}/default.mf"> - <fileset dir="${build.classes.dir}"> - <include name="org/jboss/ws/**"/> - <exclude name="org/jboss/ws/integration/**"/> - </fileset> - <fileset dir="${build.resources.dir}"> - <include name="schema/**"/> - <include name="dtd/**"/> - </fileset> - </jar> - - <!-- Build jbossws-jboss50-integration.jar --> - <jar jarfile="${build.lib.dir}/jbossws-jboss50-integration.jar" manifest="${build.etc.dir}/default.mf"> - <fileset dir="${build.classes.dir}"> - <include name="org/jboss/ws/integration/*.class"/> - <include name="org/jboss/ws/integration/jboss50/**"/> - </fileset> - </jar> - - <!-- Build jbossws-jboss42-integration.jar --> - <jar jarfile="${build.lib.dir}/jbossws-jboss42-integration.jar" manifest="${build.etc.dir}/default.mf"> - <fileset dir="${build.classes.dir}"> - <include name="org/jboss/ws/integration/*.class"/> - <include name="org/jboss/ws/integration/jboss42/**"/> - </fileset> - </jar> - - <!-- Build jbossws-tomcat-integration.jar --> - <jar jarfile="${build.lib.dir}/jbossws-tomcat-integration.jar" manifest="${build.etc.dir}/default.mf"> - <fileset dir="${build.classes.dir}"> - <include name="org/jboss/ws/integration/tomcat/**"/> - </fileset> - </jar> - - <!-- Build jbossws-client.jar --> - <jar jarfile="${build.lib.dir}/jbossws-client.jar" manifest="${build.etc.dir}/default.mf"> - <fileset dir="${build.classes14.dir}"> - <include name="javax/xml/rpc/**"/> - <include name="javax/xml/soap/**"/> - </fileset> - <fileset dir="${build.classes.dir}"> - <include name="javax/xml/ws/**"/> - <include name="javax/jws/**"/> - <include name="org/jboss/ws/**"/> - <exclude name="org/jboss/ws/integration/jboss50/**"/> - <exclude name="org/jboss/ws/integration/tomcat/**"/> - </fileset> - <fileset dir="${build.resources.dir}/jbossws.sar"> - <include name="META-INF/standard-jaxrpc-client-config.xml"/> - <include name="META-INF/standard-jaxws-client-config.xml"/> - </fileset> - <fileset dir="${build.resources.dir}"> - <include name="schema/**"/> - <include name="dtd/**"/> - </fileset> - <fileset dir="${build.etc.dir}"> - <include name="wstools.sh"/> - <include name="wstools.bat"/> - <include name="wstools-log4j.xml"/> - </fileset> - <metainf dir="${build.resources.dir}/jboss-saaj.jar/META-INF"/> - </jar> - - <!-- Build jbossws-context.war --> - <war warfile="${build.lib.dir}/jbossws-context.war" webxml="${build.resources.dir}/jbossws.war/JBoss/WEB-INF/web.xml"> - <fileset dir="${build.resources.dir}/jbossws.war"> - <include name="index.html"/> - <include name="styles.css"/> - </fileset> - <webinf dir="${build.resources.dir}/jbossws.war/JBoss/WEB-INF"> - <include name="jboss-web.xml"/> - </webinf> - </war> - - <!-- Build jbossws.war --> - <war warfile="${build.lib.dir}/jbossws.war" webxml="${build.resources.dir}/jbossws.war/Tomcat/WEB-INF/web.xml"> - <fileset dir="${build.resources.dir}/jbossws.war"> - <include name="index.html"/> - <include name="styles.css"/> - </fileset> - <fileset dir="${build.resources.dir}/jbossws.war/Tomcat"> - <include name="META-INF/jboss-beans.xml"/> - </fileset> - <fileset dir="${build.resources.dir}/jbossws.sar"> - <include name="META-INF/standard-jaxrpc-client-config.xml"/> - <include name="META-INF/standard-jaxrpc-endpoint-config.xml"/> - <include name="META-INF/standard-jaxws-client-config.xml"/> - <include name="META-INF/standard-jaxws-endpoint-config.xml"/> - </fileset> - <classes dir="${build.resources.dir}/jbossws.war/Tomcat/WEB-INF"> - <include name="log4j.xml"/> - </classes> - </war> - - <!-- Build jbossws.sar --> - <jar jarfile="${build.lib.dir}/jbossws.sar" manifest="${build.etc.dir}/default.mf"> - <fileset dir="${build.lib.dir}"> - <include name="jbossws-context.war"/> - </fileset> - <fileset dir="${thirdparty.dir}"> - <include name="jaxb-api.jar"/> - <include name="jaxb-impl.jar"/> - <include name="policy-1.0.jar"/> - <include name="sjsxp.jar"/> - <include name="stax-api-1.0.jar"/> - <include name="wstx-lgpl-2.9.3.jar"/> - <include name="xmlsec.jar"/> - </fileset> - <fileset dir="${build.resources.dir}/jbossws.sar"> - <include name="META-INF/standard-jaxrpc-client-config.xml"/> - <include name="META-INF/standard-jaxrpc-endpoint-config.xml"/> - <include name="META-INF/standard-jaxws-client-config.xml"/> - <include name="META-INF/standard-jaxws-endpoint-config.xml"/> - </fileset> - </jar> - - <!-- Build jbossws.deployer --> - <jar jarfile="${build.lib.dir}/jbossws.deployer" manifest="${build.etc.dir}/default.mf"> - <fileset dir="${build.lib.dir}"> - <include name="jbossws-jboss-integration.jar"/> - <include name="jbossws-core.jar"/> - <include name="jboss-jaxws.jar"/> - </fileset> - <fileset dir="${thirdparty.dir}"> - <include name="wsdl4j.jar"/> - </fileset> - <metainf dir="${build.resources.dir}/jbossws.deployer/META-INF"> - <include name="jbossws-deployer-beans.xml"/> - </metainf> - </jar> - - <zip destfile="${build.lib.dir}/jbossws-src.zip"> - <fileset dir="${src.java.dir}"/> - </zip> - </target> - - <!-- ================================================================== --> - <!-- Documentation --> - <!-- ================================================================== --> - - <!-- Generate the JavaDoc --> - <target name="javadoc" depends="init" description="Generate the Javadoc"> - - <mkdir dir="${build.api}"/> - <javadoc destdir="${build.api}" author="true" version="true" use="true" windowtitle="JBossWS API"> - <packageset dir="${src.java.dir}" defaultexcludes="yes"> - <include name="org/jboss/ws/**"/> - </packageset> - <packageset dir="${jboss.server.root}/../src/main" defaultexcludes="yes"> - <include name="org/jboss/webservice/metadata/**"/> - </packageset> - - <doctitle><![CDATA[<h1>JBossWS</h1>]]></doctitle> - <tag name="todo" scope="all" description="To do:"/> - <group title="Core" packages="org.jboss.ws.core*"/> - <group title="Metadata" packages="org.jboss.ws.metadata*"/> - <group title="Integration" packages="org.jboss.ws.integration*"/> - <group title="Extensions" packages="org.jboss.ws.extensions*"/> - <group title="Tools" packages="org.jboss.ws.tools*"/> - </javadoc> - </target> - - <!-- ================================================================== --> - <!-- Deployment --> - <!-- ================================================================== --> - - <!-- Deploy jbossws to the server --> - <target name="deploy-jbossws" depends="main" description="Deploy jbossws"> - <antcall target="deploy-to-server"> - <param name="jboss.deploy.home" value="${jboss.jdk15.home}"/> - <param name="jbossws" value="jbossws"/> - </antcall> - <antcall target="deploy-to-thirdparty"> - <param name="jboss.deploy.home" value="${jboss.jdk15.home}"/> - <param name="jbossws" value="jbossws"/> - </antcall> - </target> - - <!-- Deploy to jboss --> - <target name="deploy-to-server"> - <copy todir="${jboss.deploy.home}/client" file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true"/> - <copy todir="${jboss.deploy.home}/lib" file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true"/> - <copy todir="${jboss.deploy.home}/client" overwrite="true"> - <fileset dir="${build.lib.dir}"> - <include name="jboss-jaxrpc.jar"/> - <include name="jboss-saaj.jar"/> - <include name="${jbossws}-client.jar"/> - </fileset> - </copy> - <copy todir="${jboss.deploy.home}/server/${jboss.server.instance}/lib" overwrite="true"> - <fileset dir="${build.lib.dir}"> - <include name="jboss-jaxrpc.jar"/> - <include name="jboss-saaj.jar"/> - </fileset> - </copy> - <delete dir="${jboss.deploy.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/> - <mkdir dir="${jboss.deploy.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/> - <unjar dest="${jboss.deploy.home}/server/${jboss.server.instance}/deployers/jbossws.deployer" src="${build.lib.dir}/jbossws.deployer"/> - <delete dir="${jboss.deploy.home}/server/${jboss.server.instance}/deploy/${jbossws}.sar"/> - <mkdir dir="${jboss.deploy.home}/server/${jboss.server.instance}/deploy/${jbossws}.sar"/> - <unjar dest="${jboss.deploy.home}/server/${jboss.server.instance}/deploy/${jbossws}.sar" src="${build.lib.dir}/${jbossws}.sar"/> - </target> - - <!-- Deploy to jboss/thirdparty --> - <target name="deploy-to-thirdparty" if="jboss.source.dist.available"> - <!-- Only needed for the JBossAS webservice testsuite - <copy todir="${jboss.deploy.home}/../../../thirdparty/jboss/jbossxb/lib" file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true"/> - <copy todir="${jboss.deploy.home}/../../../thirdparty/jboss/${jbossws}/lib" file="${build.lib.dir}/${jbossws}-client.jar" overwrite="true"/> - <copy todir="${jboss.deploy.home}/../../../thirdparty/jboss/${jbossws}/lib" file="${build.lib.dir}/${jbossws}.sar" overwrite="true"/> - --> - </target> - - <!-- Deploy to Tomcat --> - <target name="deploy-tomcat" depends="main,jbossws-thirdparty-jar" description="Deploy JBossWS to Tomcat"> - <copy todir="${tomcat.common.dir}/endorsed" file="${thirdparty.dir}/serializer.jar"/> - <copy todir="${tomcat.common.dir}/endorsed" file="${thirdparty.dir}/xalan.jar"/> - <copy todir="${tomcat.common.dir}/endorsed" file="${thirdparty.dir}/xercesImpl.jar"/> - <copy todir="${tomcat.common.dir}/lib" file="${thirdparty.dir}/activation.jar"/> - <copy todir="${tomcat.common.dir}/lib" file="${thirdparty.dir}/log4j.jar"/> - <copy todir="${tomcat.common.dir}/lib" file="${thirdparty.dir}/mailapi.jar"/> - <copy todir="${tomcat.common.dir}/lib" file="${build.lib.dir}/jbossws-core.jar" overwrite="true"/> - <copy todir="${tomcat.common.dir}/lib" file="${build.lib.dir}/jbossws-tomcat-integration.jar" overwrite="true"/> - <copy todir="${tomcat.common.dir}/lib" file="${build.lib.dir}/jbossws-thirdparty.jar" overwrite="true"/> - <copy todir="${tomcat.common.dir}/lib" file="${build.lib.dir}/jboss-jaxws.jar" overwrite="true"/> - <copy todir="${tomcat.common.dir}/lib" file="${build.lib.dir}/jboss-jaxrpc.jar" overwrite="true"/> - <copy todir="${tomcat.common.dir}/lib" file="${build.lib.dir}/jboss-saaj.jar" overwrite="true"/> - <copy todir="${tomcat.webapps.dir}" file="${build.lib.dir}/jbossws.war" overwrite="true"/> - <delete dir="${tomcat.webapps.dir}/jbossws"/> - </target> - - <target name="jbossws-thirdparty-jar" unless="jbossws.thirdparty.available"> - <!-- Build jbossws-thirdparty.jar --> - <mkdir dir="${build.lib.dir}/build"/> - <unjar dest="${build.lib.dir}/build" src="${thirdparty.dir}/jaxb-api.jar"/> - <unjar dest="${build.lib.dir}/build" src="${thirdparty.dir}/jboss-common-core.jar"/> - <unjar dest="${build.lib.dir}/build" src="${jboss.server.lib}/jboss-j2ee.jar"/> - <unjar dest="${build.lib.dir}/build" src="${thirdparty.dir}/jboss-container.jar"/> - <unjar dest="${build.lib.dir}/build" src="${thirdparty.dir}/jboss-dependency.jar"/> - <unjar dest="${build.lib.dir}/build" src="${thirdparty.dir}/jboss-logging-spi.jar"/> - <unjar dest="${build.lib.dir}/build" src="${thirdparty.dir}/jboss-microcontainer.jar"/> - <unjar dest="${build.lib.dir}/build" src="${thirdparty.dir}/jboss-remoting.jar"/> - <unjar dest="${build.lib.dir}/build" src="${thirdparty.dir}/jboss-xml-binding.jar"/> - <unjar dest="${build.lib.dir}/build" src="${thirdparty.dir}/javassist.jar"/> - <unjar dest="${build.lib.dir}/build" src="${thirdparty.dir}/concurrent.jar"/> - <unjar dest="${build.lib.dir}/build" src="${thirdparty.dir}/wsdl4j.jar"/> - <unjar dest="${build.lib.dir}/build" src="${thirdparty.dir}/xmlsec.jar"/> - <jar jarfile="${build.lib.dir}/jbossws-thirdparty.jar" manifest="${build.etc.dir}/default.mf"> - <fileset dir="${build.lib.dir}/build"/> - </jar> - <delete dir="${build.lib.dir}/build"/> - </target> - - <target name="clean" depends="prepare" description="Cleans up most generated files."> - <delete dir="${build.dir}"/> - </target> - - <target name="build-docs" description="Build the documentation"> - <ant antfile="${docs.userguide.dir}/build.xml" dir="${docs.userguide.dir}" target="all.doc"/> - </target> - - <target name="main" description="Executes the default target (most)." depends="most"/> - - <target name="most" description="Builds almost everything." depends="jars"/> - - <target name="all" description="Create a distribution zip file" depends="build-bin-dist,build-src-dist"> - </target> - -</project> \ No newline at end of file Copied: branches/tdiesler/trunk/jbossws/src (from rev 1675, branches/tdiesler/trunk/src) Copied: branches/tdiesler/trunk/jbossws/src/ant (from rev 1682, branches/tdiesler/trunk/src/ant) Copied: branches/tdiesler/trunk/jbossws/src/main (from rev 1682, branches/tdiesler/trunk/src/main) Modified: branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/integration/tomcat/CrossContextLoader.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/tomcat/CrossContextLoader.java 2006-12-21 12:35:57 UTC (rev 1682) +++ branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/integration/tomcat/CrossContextLoader.java 2006-12-21 12:40:22 UTC (rev 1683) @@ -21,7 +21,7 @@ */ package org.jboss.ws.integration.tomcat; -// $Id: $ +// $Id$ import java.io.File; import java.net.MalformedURLException; Copied: branches/tdiesler/trunk/jbossws/src/test (from rev 1682, branches/tdiesler/trunk/src/test) Deleted: branches/tdiesler/trunk/version.properties =================================================================== --- branches/tdiesler/trunk/version.properties 2006-12-21 12:35:57 UTC (rev 1682) +++ branches/tdiesler/trunk/version.properties 2006-12-21 12:40:22 UTC (rev 1683) @@ -1,44 +0,0 @@ - -# $Id$ - -specification.title=JBossWS -specification.vendor=JBoss (http://www.jboss.org) -specification.version=jbossws-2.0 - -version.id=2.0.0.CR3.DEV -repository.id=snapshot - -implementation.title=JBoss Web Services (JBossWS) -implementation.url=http://www.jboss.org/products/jbossws -implementation.vendor=JBoss Inc. -implementation.vendor.id=http://www.jboss.org - -# thirdparty library versions that are referenced in component-info.xml -apache-xmlsec=1.3.0 -ibm-wsdl4j=1.5.2jboss -javassist=3.4.GA -jboss-common-core=2.0.2.CR1 -jboss-common-logging=2.0.1.GA -jboss-jbossxb=1.0.0.CR7 -jboss-microcontainer=snapshot -jboss-remoting=2.2.0.Alpha2 - -# thirdparty library versions -apache-ant=1.6.5 -apache-log4j=1.2.8 -apache-xalan=j_2.7.0 -apache-xerces=2.7.1 -hibernate=3.2.0.CR2 -jboss-backport-concurrent=2.1.0.GA -jbpm-bpel=1.1.Beta2 -junit=3.8.1 -oswego-concurrent=1.3.4 -qdox=1.4 -stax-api=1.0 -sun-jaf=1.0.2 -sun-javamail=1.3.1 -sun-jaxb=2.0.3 -sun-servlet=2.4 -woodstox=2.0.6 -wscommons-policy=1.0 -xmlunit=1.0