Attachment 77967 Details for Bug 200803 – first draft how a composite container might look like

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] first draft how a composite container might look like

patch.txt (text/plain), 63.60 KB, created by Markus Kuppe

on 2007-09-10 06:12:58 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Markus Kuppe

Created: 2007-09-10 06:12:58 EDT

Size: 63.60 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.ecf.discovery
>Index: .settings/org.eclipse.jdt.core.prefs
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.ecf/plugins/org.eclipse.ecf.discovery/.settings/org.eclipse.jdt.core.prefs,v
>retrieving revision 1.2
>diff -u -r1.2 org.eclipse.jdt.core.prefs
>--- .settings/org.eclipse.jdt.core.prefs	20 Apr 2007 21:45:40 -0000	1.2
>+++ .settings/org.eclipse.jdt.core.prefs	10 Sep 2007 10:14:35 -0000
>@@ -1,7 +1,331 @@
>-#Fri Apr 20 14:30:58 GMT-08:00 2007
>+#Thu Aug 16 11:00:59 EDT 2007
> eclipse.preferences.version=1
>+org.eclipse.jdt.core.builder.cleanOutputFolder=clean
>+org.eclipse.jdt.core.builder.duplicateResourceTask=warning
>+org.eclipse.jdt.core.builder.invalidClasspath=abort
>+org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
>+org.eclipse.jdt.core.circularClasspath=error
>+org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
>+org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
>+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
> org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.1
>+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
> org.eclipse.jdt.core.compiler.compliance=1.3
>+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
>+org.eclipse.jdt.core.compiler.debug.localVariable=generate
>+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
>+org.eclipse.jdt.core.compiler.doc.comment.support=enabled
>+org.eclipse.jdt.core.compiler.maxProblemPerUnit=1000
>+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
> org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
>+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.deprecationWhenOverridingDeprecatedMethod=enabled
>+org.eclipse.jdt.core.compiler.problem.discouragedReference=error
>+org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
> org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
>+org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
>+org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
>+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
>+org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
>+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
>+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
>+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
>+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
>+org.eclipse.jdt.core.compiler.problem.invalidJavadoc=error
>+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
>+org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
>+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
>+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
>+org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
>+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
>+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
>+org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
>+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
>+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
>+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
>+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
>+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
>+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
>+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
>+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
>+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
>+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
>+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
>+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
>+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
>+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
>+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
>+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning
>+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
>+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
>+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
>+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
>+org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning
>+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
>+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=enabled
>+org.eclipse.jdt.core.compiler.problem.unusedImport=error
>+org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
>+org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
>+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=enabled
>+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=enabled
>+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
>+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
> org.eclipse.jdt.core.compiler.source=1.3
>+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=16
>+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
>+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
>+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
>+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
>+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
>+org.eclipse.jdt.core.formatter.blank_lines_before_imports=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=1
>+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
>+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
>+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
>+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
>+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=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=end_of_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=end_of_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_in_block_comment=false
>+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
>+org.eclipse.jdt.core.formatter.comment.format_block_comments=false
>+org.eclipse.jdt.core.formatter.comment.format_header=false
>+org.eclipse.jdt.core.formatter.comment.format_html=true
>+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=false
>+org.eclipse.jdt.core.formatter.comment.format_line_comments=false
>+org.eclipse.jdt.core.formatter.comment.format_source_code=true
>+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=false
>+org.eclipse.jdt.core.formatter.comment.indent_root_tags=false
>+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
>+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not 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=false
>+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
>+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
>+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
>+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
>+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
>+org.eclipse.jdt.core.formatter.indent_empty_lines=false
>+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
>+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
>+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
>+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true
>+org.eclipse.jdt.core.formatter.indentation.size=4
>+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=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_annotation_declaration=insert
>+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=do not 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=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=do not 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=do not insert
>+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
>+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
>+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
>+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
>+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
>+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
>+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
>+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
>+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
>+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
>+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
>+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
>+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
>+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
>+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
>+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
>+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=insert
>+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
>+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=insert
>+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
>+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=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=insert
>+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
>+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
>+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
>+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
>+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
>+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
>+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
>+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
>+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
>+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
>+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
>+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
>+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
>+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
>+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
>+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
>+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
>+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=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=false
>+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
>+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
>+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
>+org.eclipse.jdt.core.formatter.lineSplit=800
>+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
>+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
>+org.eclipse.jdt.core.formatter.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=false
>+org.eclipse.jdt.core.formatter.tabulation.char=tab
>+org.eclipse.jdt.core.formatter.tabulation.size=4
>+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
>+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
>+org.eclipse.jdt.core.incompatibleJDKLevel=ignore
>+org.eclipse.jdt.core.incompleteClasspath=error
>Index: META-INF/MANIFEST.MF
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.ecf/plugins/org.eclipse.ecf.discovery/META-INF/MANIFEST.MF,v
>retrieving revision 1.81
>diff -u -r1.81 MANIFEST.MF
>--- META-INF/MANIFEST.MF	6 Sep 2007 04:42:05 -0000	1.81
>+++ META-INF/MANIFEST.MF	10 Sep 2007 10:14:35 -0000
>@@ -15,4 +15,5 @@
>  J2SE-1.3
> Require-Bundle: org.eclipse.equinox.common,
>  org.eclipse.ecf
>-Import-Package: org.osgi.framework;version="1.3.0"
>+Import-Package: org.eclipse.osgi.util;version="1.1.0",
>+ org.osgi.framework;version="1.3.0"
>Index: plugin.xml
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.ecf/plugins/org.eclipse.ecf.discovery/plugin.xml,v
>retrieving revision 1.1
>diff -u -r1.1 plugin.xml
>--- plugin.xml	7 Dec 2006 01:52:38 -0000	1.1
>+++ plugin.xml	10 Sep 2007 10:14:35 -0000
>@@ -1,5 +1,14 @@
> <?xml version="1.0" encoding="UTF-8"?>
> <?eclipse version="3.2"?>
> <plugin>
>+   <extension
>+         point="org.eclipse.ecf.containerFactory">
>+      <containerFactory
>+            class="org.eclipse.ecf.internal.discovery.CompositeDiscoveryContainerInstantiator"
>+            description="Composite Discovery Container"
>+            name="ecf.discovery.*"
>+            server="true">
>+       </containerFactory>
>+   </extension>
> 
> </plugin>
>Index: src/org/eclipse/ecf/internal/discovery/messages.properties
>===================================================================
>RCS file: src/org/eclipse/ecf/internal/discovery/messages.properties
>diff -N src/org/eclipse/ecf/internal/discovery/messages.properties
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/ecf/internal/discovery/messages.properties	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,3 @@
>+CompositeDiscoveryContainerInstantiator_2=Exception making Composite container
>+CompositeDiscoveryContainerInstantiator_3=Exception making Composite container
>+CompositeDiscoveryContainer_DEPRECATED=deprecated API isn't supported by CompositeContainer
>Index: .settings/org.eclipse.jdt.ui.prefs
>===================================================================
>RCS file: .settings/org.eclipse.jdt.ui.prefs
>diff -N .settings/org.eclipse.jdt.ui.prefs
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ .settings/org.eclipse.jdt.ui.prefs	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,58 @@
>+#Tue Aug 21 11:27:48 CDT 2007
>+eclipse.preferences.version=1
>+editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
>+formatter_profile=_core
>+formatter_settings_version=11
>+internal.default.compliance=user
>+org.eclipse.jdt.ui.ignorelowercasenames=true
>+org.eclipse.jdt.ui.importorder=;
>+org.eclipse.jdt.ui.ondemandthreshold=3
>+org.eclipse.jdt.ui.staticondemandthreshold=99
>+sp_cleanup.add_default_serial_version_id=true
>+sp_cleanup.add_generated_serial_version_id=false
>+sp_cleanup.add_missing_annotations=true
>+sp_cleanup.add_missing_deprecated_annotations=true
>+sp_cleanup.add_missing_nls_tags=false
>+sp_cleanup.add_missing_override_annotations=true
>+sp_cleanup.add_serial_version_id=false
>+sp_cleanup.always_use_blocks=true
>+sp_cleanup.always_use_parentheses_in_expressions=false
>+sp_cleanup.always_use_this_for_non_static_field_access=false
>+sp_cleanup.always_use_this_for_non_static_method_access=false
>+sp_cleanup.convert_to_enhanced_for_loop=false
>+sp_cleanup.correct_indentation=false
>+sp_cleanup.format_source_code=true
>+sp_cleanup.make_local_variable_final=false
>+sp_cleanup.make_parameters_final=false
>+sp_cleanup.make_private_fields_final=true
>+sp_cleanup.make_variable_declarations_final=true
>+sp_cleanup.never_use_blocks=false
>+sp_cleanup.never_use_parentheses_in_expressions=true
>+sp_cleanup.on_save_use_additional_actions=false
>+sp_cleanup.organize_imports=true
>+sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
>+sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
>+sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
>+sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
>+sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
>+sp_cleanup.remove_private_constructors=true
>+sp_cleanup.remove_trailing_whitespaces=false
>+sp_cleanup.remove_trailing_whitespaces_all=true
>+sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
>+sp_cleanup.remove_unnecessary_casts=true
>+sp_cleanup.remove_unnecessary_nls_tags=false
>+sp_cleanup.remove_unused_imports=false
>+sp_cleanup.remove_unused_local_variables=false
>+sp_cleanup.remove_unused_private_fields=true
>+sp_cleanup.remove_unused_private_members=false
>+sp_cleanup.remove_unused_private_methods=true
>+sp_cleanup.remove_unused_private_types=true
>+sp_cleanup.sort_members=false
>+sp_cleanup.sort_members_all=false
>+sp_cleanup.use_blocks=false
>+sp_cleanup.use_blocks_only_for_return_and_throw=false
>+sp_cleanup.use_parentheses_in_expressions=false
>+sp_cleanup.use_this_for_non_static_field_access=false
>+sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
>+sp_cleanup.use_this_for_non_static_method_access=false
>+sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
>Index: src/org/eclipse/ecf/internal/discovery/Messages.java
>===================================================================
>RCS file: src/org/eclipse/ecf/internal/discovery/Messages.java
>diff -N src/org/eclipse/ecf/internal/discovery/Messages.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/ecf/internal/discovery/Messages.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,17 @@
>+package org.eclipse.ecf.internal.discovery;
>+
>+import org.eclipse.osgi.util.NLS;
>+
>+public class Messages extends NLS {
>+	private static final String BUNDLE_NAME = "org.eclipse.ecf.internal.discovery.messages"; //$NON-NLS-1$
>+	public static String CompositeDiscoveryContainer_DEPRECATED;
>+	public static String CompositeDiscoveryContainerInstantiator_2;
>+	public static String CompositeDiscoveryContainerInstantiator_3;
>+	static {
>+		// initialize resource bundle
>+		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
>+	}
>+
>+	private Messages() {
>+	}
>+}
>Index: src/org/eclipse/ecf/internal/discovery/CompositeDiscoveryContainer.java
>===================================================================
>RCS file: src/org/eclipse/ecf/internal/discovery/CompositeDiscoveryContainer.java
>diff -N src/org/eclipse/ecf/internal/discovery/CompositeDiscoveryContainer.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/ecf/internal/discovery/CompositeDiscoveryContainer.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,382 @@
>+/*******************************************************************************
>+ * Copyright (c) 2007 Versant Corp.
>+ * All rights reserved. This program and the accompanying materials
>+ * are made available under the terms of the Eclipse Public License v1.0
>+ * which accompanies this distribution, and is available at
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ *
>+ * Contributors:
>+ *     Markus Kuppe (mkuppe <at> versant <dot> com) - initial API and implementation
>+ ******************************************************************************/
>+package org.eclipse.ecf.internal.discovery;
>+
>+import java.util.*;
>+import org.eclipse.ecf.core.*;
>+import org.eclipse.ecf.core.events.ContainerDisconnectedEvent;
>+import org.eclipse.ecf.core.events.ContainerDisconnectingEvent;
>+import org.eclipse.ecf.core.identity.*;
>+import org.eclipse.ecf.core.security.IConnectContext;
>+import org.eclipse.ecf.core.util.ECFException;
>+import org.eclipse.ecf.discovery.*;
>+import org.eclipse.ecf.discovery.identity.IServiceID;
>+import org.eclipse.ecf.discovery.identity.IServiceTypeID;
>+import org.eclipse.ecf.discovery.service.IDiscoveryService;
>+
>+public class CompositeDiscoveryContainer extends AbstractContainer implements IContainer, IDiscoveryService {
>+	private class CompositeContainerServiceListener implements IServiceListener {
>+
>+		/*
>+		 * (non-Javadoc)
>+		 * 
>+		 * @see org.eclipse.ecf.discovery.IServiceListener#serviceAdded(org.eclipse.ecf.discovery.IServiceEvent)
>+		 */
>+		public void serviceAdded(IServiceEvent event) {
>+			synchronized (serviceListeners) {
>+				List l = (List) serviceListeners.get(event.getServiceInfo().getServiceID().getServiceTypeID());
>+				synchronized (l) {
>+					for (Iterator itr = l.iterator(); itr.hasNext();) {
>+						IServiceListener isl = (IServiceListener) itr.next();
>+						isl.serviceAdded(event);
>+					}
>+				}
>+			}
>+		}
>+
>+		/*
>+		 * (non-Javadoc)
>+		 * 
>+		 * @see org.eclipse.ecf.discovery.IServiceListener#serviceRemoved(org.eclipse.ecf.discovery.IServiceEvent)
>+		 */
>+		public void serviceRemoved(IServiceEvent event) {
>+			synchronized (serviceListeners) {
>+				List l = (List) serviceListeners.get(event.getServiceInfo().getServiceID().getServiceTypeID());
>+				synchronized (l) {
>+					for (Iterator itr = l.iterator(); itr.hasNext();) {
>+						IServiceListener isl = (IServiceListener) itr.next();
>+						isl.serviceRemoved(event);
>+					}
>+				}
>+			}
>+		}
>+
>+		/*
>+		 * (non-Javadoc)
>+		 * 
>+		 * @see org.eclipse.ecf.discovery.IServiceListener#serviceResolved(org.eclipse.ecf.discovery.IServiceEvent)
>+		 */
>+		public void serviceResolved(IServiceEvent event) {
>+			synchronized (serviceListeners) {
>+				List l = (List) serviceListeners.get(event.getServiceInfo().getServiceID().getServiceTypeID());
>+				synchronized (l) {
>+					for (Iterator itr = l.iterator(); itr.hasNext();) {
>+						IServiceListener isl = (IServiceListener) itr.next();
>+						isl.serviceResolved(event);
>+					}
>+				}
>+			}
>+		}
>+	}
>+
>+	private class CompositeContainerServiceTypeListener implements IServiceTypeListener {
>+
>+		/*
>+		 * (non-Javadoc)
>+		 * 
>+		 * @see org.eclipse.ecf.discovery.IServiceTypeListener#serviceTypeAdded(org.eclipse.ecf.discovery.IServiceEvent)
>+		 */
>+		public void serviceTypeAdded(IServiceEvent event) {
>+			// notify our listeners
>+			synchronized (serviceTypeListeners) {
>+				for (Iterator itr = serviceTypeListeners.iterator(); itr.hasNext();) {
>+					IServiceTypeListener listener = (IServiceTypeListener) itr.next();
>+					listener.serviceTypeAdded(event);
>+				}
>+			}
>+			// add ourself as a listener to the underlying providers
>+			IServiceTypeID istid = event.getServiceInfo().getServiceID().getServiceTypeID();
>+			synchronized (containers) {
>+				for (Iterator itr = containers.iterator(); itr.hasNext();) {
>+					//TODO ccstl doesn't have to be a listener for a non matching (namespace) container, but it doesn't hurt either
>+					IDiscoveryContainerAdapter idca = (IDiscoveryContainerAdapter) itr.next();
>+					idca.addServiceListener(istid, ccsl);
>+				}
>+			}
>+		}
>+	}
>+
>+	protected CompositeContainerServiceListener ccsl = new CompositeContainerServiceListener();
>+	protected CompositeContainerServiceTypeListener ccstl = new CompositeContainerServiceTypeListener();
>+
>+	protected List containers = new ArrayList();
>+
>+	private ID id;
>+
>+	protected Map serviceListeners = new HashMap();
>+
>+	protected List serviceTypeListeners = new ArrayList();
>+
>+	public CompositeDiscoveryContainer(List containers) throws IDCreateException {
>+		this.containers = containers;
>+		this.id = IDFactory.getDefault().createStringID(CompositeDiscoveryContainer.class.getName());
>+	}
>+
>+	/*
>+	 * (non-Javadoc)
>+	 * 
>+	 * @see org.eclipse.ecf.discovery.IDiscoveryContainerAdapter#addServiceListener(org.eclipse.ecf.discovery.identity.IServiceTypeID,
>+	 *      org.eclipse.ecf.discovery.IServiceListener)
>+	 */
>+	public void addServiceListener(IServiceTypeID type, IServiceListener listener) {
>+		synchronized (serviceListeners) {
>+			List l = (List) serviceListeners.get(type);
>+			if (l == null) {
>+				l = new ArrayList();
>+				serviceListeners.put(type, l);
>+			}
>+			l.add(listener);
>+		}
>+	}
>+
>+	/**
>+	 * @deprecated
>+	 * @see org.eclipse.ecf.discovery.IDiscoveryContainerAdapter#addServiceListener(java.lang.String,
>+	 *      org.eclipse.ecf.discovery.IServiceListener)
>+	 */
>+	public void addServiceListener(String type, IServiceListener listener) {
>+		throw new UnsupportedOperationException(Messages.CompositeDiscoveryContainer_DEPRECATED);
>+	}
>+
>+	/*
>+	 * (non-Javadoc)
>+	 * 
>+	 * @see org.eclipse.ecf.discovery.IDiscoveryContainerAdapter#addServiceTypeListener(org.eclipse.ecf.discovery.IServiceTypeListener)
>+	 */
>+	public void addServiceTypeListener(IServiceTypeListener listener) {
>+		synchronized (serviceTypeListeners) {
>+			serviceTypeListeners.add(listener);
>+		}
>+	}
>+
>+	/*
>+	 * (non-Javadoc)
>+	 * 
>+	 * @see org.eclipse.ecf.core.IContainer#connect(org.eclipse.ecf.core.identity.ID,
>+	 *      org.eclipse.ecf.core.security.IConnectContext)
>+	 */
>+	public void connect(ID targetID, IConnectContext connectContext) throws ContainerConnectException {
>+		synchronized (containers) {
>+			for (Iterator itr = containers.iterator(); itr.hasNext();) {
>+				IContainer container = (IContainer) itr.next();
>+				container.connect(targetID, connectContext);
>+				IDiscoveryContainerAdapter idca = (IDiscoveryContainerAdapter) container;
>+				idca.addServiceTypeListener(ccstl);
>+			}
>+		}
>+	}
>+
>+	/*
>+	 * (non-Javadoc)
>+	 * 
>+	 * @see org.eclipse.ecf.core.IContainer#disconnect()
>+	 */
>+	public void disconnect() {
>+		fireContainerEvent(new ContainerDisconnectingEvent(this.getID(), getConnectedID()));
>+		synchronized (containers) {
>+			for (Iterator itr = containers.iterator(); itr.hasNext();) {
>+				IContainer container = (IContainer) itr.next();
>+				container.disconnect();
>+			}
>+		}
>+		fireContainerEvent(new ContainerDisconnectedEvent(this.getID(), getConnectedID()));
>+	}
>+
>+	/* (non-Javadoc)
>+	 * @see org.eclipse.ecf.core.AbstractContainer#dispose()
>+	 */
>+	public void dispose() {
>+		disconnect();
>+		synchronized (containers) {
>+			for (Iterator itr = containers.iterator(); itr.hasNext();) {
>+				IContainer container = (IContainer) itr.next();
>+				container.dispose();
>+			}
>+		}
>+		super.dispose();
>+	}
>+
>+	/* (non-Javadoc)
>+	 * @see org.eclipse.ecf.core.IContainer#getConnectedID()
>+	 */
>+	public ID getConnectedID() {
>+		return getID();
>+	}
>+
>+	/* (non-Javadoc)
>+	 * @see org.eclipse.ecf.core.IContainer#getConnectNamespace()
>+	 */
>+	public Namespace getConnectNamespace() {
>+		throw new UnsupportedOperationException("not yet implemented"); //$NON-NLS-1$
>+	}
>+
>+	/**
>+	 * Get the IContainer for the given Namespace
>+	 * @param aNamespace 
>+	 * @return The IDiscoveryContainerAdapter for the given Namespace
>+	 */
>+	private IDiscoveryContainerAdapter getContainerByNamespace(Namespace aNamespace) {
>+		synchronized (containers) {
>+			for (Iterator itr = containers.iterator(); itr.hasNext();) {
>+				IContainer container = (IContainer) itr.next();
>+				// TODO handle the case for the generic ServiceID which should work with all containers
>+				// could be done by a smart equals impl or better a comparator
>+				Namespace containerNamespace = container.getConnectNamespace();
>+				if (containerNamespace.equals(aNamespace)) {
>+					return (IDiscoveryContainerAdapter) container;
>+				}
>+			}
>+		}
>+		return null;
>+	}
>+
>+	/*
>+	 * (non-Javadoc)
>+	 * 
>+	 * @see org.eclipse.ecf.core.identity.IIdentifiable#getID()
>+	 */
>+	public ID getID() {
>+		return id;
>+	}
>+
>+	/* (non-Javadoc)
>+	 * @see org.eclipse.ecf.discovery.IDiscoveryContainerAdapter#getServiceInfo(org.eclipse.ecf.discovery.identity.IServiceID, int)
>+	 */
>+	public IServiceInfo getServiceInfo(IServiceID aService, int timeout) {
>+		synchronized (containers) {
>+			for (Iterator itr = containers.iterator(); itr.hasNext();) {
>+				IDiscoveryContainerAdapter idca = (IDiscoveryContainerAdapter) itr.next();
>+				IServiceInfo service = idca.getServiceInfo(aService, timeout);
>+				if (service != null) {
>+					return service;
>+				}
>+			}
>+		}
>+		return null;
>+	}
>+
>+	/* (non-Javadoc)
>+	 * @see org.eclipse.ecf.discovery.IDiscoveryContainerAdapter#getServices(org.eclipse.ecf.discovery.identity.IServiceTypeID)
>+	 */
>+	public IServiceInfo[] getServices(IServiceTypeID type) {
>+		Set set = new HashSet();
>+		synchronized (containers) {
>+			for (Iterator itr = containers.iterator(); itr.hasNext();) {
>+				IDiscoveryContainerAdapter idca = (IDiscoveryContainerAdapter) itr.next();
>+				IServiceInfo[] services = idca.getServices(type);
>+				for (int i = 0; i < services.length; i++) {
>+					set.add(services[i]);
>+				}
>+			}
>+		}
>+		return (IServiceInfo[]) set.toArray(new IServiceInfo[set.size()]);
>+	}
>+
>+	/**
>+	 * @deprecated
>+	 * @see org.eclipse.ecf.discovery.IDiscoveryContainerAdapter#getServices(java.lang.String)
>+	 */
>+	public IServiceInfo[] getServices(String type) {
>+		throw new UnsupportedOperationException(Messages.CompositeDiscoveryContainer_DEPRECATED);
>+	}
>+
>+	/* (non-Javadoc)
>+	 * @see org.eclipse.ecf.discovery.IDiscoveryContainerAdapter#getServicesNamespace()
>+	 */
>+	public Namespace getServicesNamespace() {
>+		throw new UnsupportedOperationException("not yet implemented"); //$NON-NLS-1$
>+	}
>+
>+	/* (non-Javadoc)
>+	 * @see org.eclipse.ecf.discovery.IDiscoveryContainerAdapter#registerService(org.eclipse.ecf.discovery.IServiceInfo)
>+	 */
>+	public void registerService(IServiceInfo serviceInfo) throws ECFException {
>+		IDiscoveryContainerAdapter idca = getContainerByNamespace(serviceInfo.getServiceID().getNamespace());
>+		if (idca != null) {
>+			idca.registerService(serviceInfo);
>+		}
>+	}
>+
>+	/* (non-Javadoc)
>+	 * @see org.eclipse.ecf.discovery.IDiscoveryContainerAdapter#registerServiceType(org.eclipse.ecf.discovery.identity.IServiceTypeID)
>+	 */
>+	public void registerServiceType(IServiceTypeID type) {
>+		IDiscoveryContainerAdapter idca = getContainerByNamespace(type.getNamespace());
>+		if (idca != null) {
>+			idca.registerServiceType(type);
>+		}
>+	}
>+
>+	/**
>+	 * @deprecated
>+	 * @see org.eclipse.ecf.discovery.IDiscoveryContainerAdapter#registerServiceType(java.lang.String)
>+	 */
>+	public void registerServiceType(String serviceType) {
>+		throw new UnsupportedOperationException(Messages.CompositeDiscoveryContainer_DEPRECATED);
>+	}
>+
>+	/*
>+	 * (non-Javadoc)
>+	 * 
>+	 * @see org.eclipse.ecf.discovery.IDiscoveryContainerAdapter#removeServiceListener(org.eclipse.ecf.discovery.identity.IServiceTypeID,
>+	 *      org.eclipse.ecf.discovery.IServiceListener)
>+	 */
>+	public void removeServiceListener(IServiceTypeID type, IServiceListener listener) {
>+		synchronized (serviceListeners) {
>+			List l = (List) serviceListeners.get(type);
>+			synchronized (l) {
>+				l.remove(listener);
>+			}
>+		}
>+	}
>+
>+	/**
>+	 * @deprecated
>+	 * @see org.eclipse.ecf.discovery.IDiscoveryContainerAdapter#removeServiceListener(java.lang.String,
>+	 *      org.eclipse.ecf.discovery.IServiceListener)
>+	 */
>+	public void removeServiceListener(String type, IServiceListener listener) {
>+		throw new UnsupportedOperationException(Messages.CompositeDiscoveryContainer_DEPRECATED);
>+	}
>+
>+	/*
>+	 * (non-Javadoc)
>+	 * 
>+	 * @see org.eclipse.ecf.discovery.IDiscoveryContainerAdapter#removeServiceTypeListener(org.eclipse.ecf.discovery.IServiceTypeListener)
>+	 */
>+	public void removeServiceTypeListener(IServiceTypeListener listener) {
>+		synchronized (serviceTypeListeners) {
>+			serviceTypeListeners.remove(listener);
>+		}
>+	}
>+
>+	/* (non-Javadoc)
>+	 * @see org.eclipse.ecf.discovery.IDiscoveryContainerAdapter#requestServiceInfo(org.eclipse.ecf.discovery.identity.IServiceID, int)
>+	 */
>+	public void requestServiceInfo(IServiceID service, int timeout) {
>+		IDiscoveryContainerAdapter idca = getContainerByNamespace(service.getNamespace());
>+		if (idca != null) {
>+			idca.requestServiceInfo(service, timeout);
>+		}
>+	}
>+
>+	/* (non-Javadoc)
>+	 * @see org.eclipse.ecf.discovery.IDiscoveryContainerAdapter#unregisterService(org.eclipse.ecf.discovery.IServiceInfo)
>+	 */
>+	public void unregisterService(IServiceInfo serviceInfo) {
>+		synchronized (containers) {
>+			for (Iterator itr = containers.iterator(); itr.hasNext();) {
>+				IDiscoveryContainerAdapter idca = (IDiscoveryContainerAdapter) itr.next();
>+				idca.unregisterService(serviceInfo);
>+			}
>+		}
>+	}
>+}
>Index: src/org/eclipse/ecf/internal/discovery/CompositeDiscoveryContainerInstantiator.java
>===================================================================
>RCS file: src/org/eclipse/ecf/internal/discovery/CompositeDiscoveryContainerInstantiator.java
>diff -N src/org/eclipse/ecf/internal/discovery/CompositeDiscoveryContainerInstantiator.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/ecf/internal/discovery/CompositeDiscoveryContainerInstantiator.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,73 @@
>+/*******************************************************************************
>+ * Copyright (c) 2007 Versant Corp.
>+ * All rights reserved. This program and the accompanying materials
>+ * are made available under the terms of the Eclipse Public License v1.0
>+ * which accompanies this distribution, and is available at
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ *
>+ * Contributors:
>+ *     Markus Kuppe (mkuppe <at> versant <dot> com) - initial API and implementation
>+ ******************************************************************************/
>+
>+package org.eclipse.ecf.internal.discovery;
>+
>+import java.util.*;
>+import org.eclipse.ecf.core.*;
>+import org.eclipse.ecf.core.identity.IDCreateException;
>+import org.eclipse.ecf.core.provider.IContainerInstantiator;
>+import org.eclipse.ecf.discovery.IDiscoveryContainerAdapter;
>+
>+public class CompositeDiscoveryContainerInstantiator implements IContainerInstantiator {
>+
>+	/*
>+	 * (non-Javadoc)
>+	 * 
>+	 * @see org.eclipse.ecf.core.provider.IContainerInstantiator#createInstance(org.eclipse.ecf.core.ContainerTypeDescription,
>+	 *      java.lang.Object[])
>+	 */
>+	public IContainer createInstance(ContainerTypeDescription description, Object[] parameters) throws ContainerCreateException {
>+
>+		try {
>+			IContainerFactory factory = ContainerFactory.getDefault();
>+			List containers = new ArrayList();
>+			List list = factory.getDescriptions();
>+			for (Iterator itr = list.iterator(); itr.hasNext();) {
>+				ContainerTypeDescription ctd = (ContainerTypeDescription) itr.next();
>+				String name = ctd.getName();
>+				if (!name.equals("ecf.discovery.*") //$NON-NLS-1$
>+						&& name.startsWith("ecf.discovery.")) { //$NON-NLS-1$
>+					IContainer container = factory.createContainer(ctd.getName());
>+					containers.add(container);
>+				}
>+			}
>+			return new CompositeDiscoveryContainer(containers);
>+		} catch (IDCreateException e) {
>+			ContainerCreateException excep = new ContainerCreateException(Messages.CompositeDiscoveryContainerInstantiator_2);
>+			excep.setStackTrace(e.getStackTrace());
>+			throw excep;
>+		} catch (ContainerCreateException e) {
>+			ContainerCreateException excep = new ContainerCreateException(Messages.CompositeDiscoveryContainerInstantiator_3);
>+			excep.setStackTrace(e.getStackTrace());
>+			throw excep;
>+		}
>+	}
>+
>+	/*
>+	 * (non-Javadoc)
>+	 * 
>+	 * @see org.eclipse.ecf.core.provider.IContainerInstantiator#getSupportedAdapterTypes(org.eclipse.ecf.core.ContainerTypeDescription)
>+	 */
>+	public String[] getSupportedAdapterTypes(ContainerTypeDescription description) {
>+		return new String[] {IDiscoveryContainerAdapter.class.getName()};
>+	}
>+
>+	/*
>+	 * (non-Javadoc)
>+	 * 
>+	 * @see org.eclipse.ecf.core.provider.IContainerInstantiator#getSupportedParameterTypes(org.eclipse.ecf.core.ContainerTypeDescription)
>+	 */
>+	public Class[][] getSupportedParameterTypes(ContainerTypeDescription description) {
>+		return new Class[0][0];
>+	}
>+
>+}
>#P org.eclipse.ecf.tests.discovery
>Index: META-INF/MANIFEST.MF
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.ecf/tests/org.eclipse.ecf.tests.discovery/META-INF/MANIFEST.MF,v
>retrieving revision 1.11
>diff -u -r1.11 MANIFEST.MF
>--- META-INF/MANIFEST.MF	22 Aug 2007 13:59:33 -0000	1.11
>+++ META-INF/MANIFEST.MF	10 Sep 2007 10:14:39 -0000
>@@ -9,7 +9,8 @@
> Require-Bundle: org.junit,
>  org.eclipse.ecf,
>  org.eclipse.ecf.discovery,
>- org.eclipse.equinox.common
>+ org.eclipse.equinox.common,
>+ org.eclipse.ecf.provider.jmdns
> Eclipse-LazyStart: true
> Import-Package: org.osgi.framework;version="1.4.0",
>  org.osgi.util.tracker;version="1.3.2"
>Index: src/org/eclipse/ecf/tests/discovery/JMDNSNamespaceTest.java
>===================================================================
>RCS file: src/org/eclipse/ecf/tests/discovery/JMDNSNamespaceTest.java
>diff -N src/org/eclipse/ecf/tests/discovery/JMDNSNamespaceTest.java
>--- src/org/eclipse/ecf/tests/discovery/JMDNSNamespaceTest.java	5 Sep 2007 23:24:12 -0000	1.1
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,89 +0,0 @@
>-/*******************************************************************************
>- * Copyright (c) 2007 Versant Corp.
>- * All rights reserved. This program and the accompanying materials
>- * are made available under the terms of the Eclipse Public License v1.0
>- * which accompanies this distribution, and is available at
>- * http://www.eclipse.org/legal/epl-v10.html
>- *
>- * Contributors:
>- *     Markus Kuppe (mkuppe <at> versant <dot> com) - initial API and implementation
>- ******************************************************************************/
>-
>-package org.eclipse.ecf.tests.discovery;
>-
>-import java.util.Arrays;
>-
>-import junit.framework.TestCase;
>-
>-import org.eclipse.ecf.core.identity.IDCreateException;
>-import org.eclipse.ecf.core.identity.IDFactory;
>-import org.eclipse.ecf.discovery.identity.IServiceID;
>-import org.eclipse.ecf.discovery.identity.IServiceTypeID;
>-import org.eclipse.ecf.discovery.identity.ServiceIDFactory;
>-
>-/**
>- *
>- */
>-public class JMDNSNamespaceTest extends TestCase {
>-	private IServiceID createID(String serviceType, String serviceName) {
>-		try {
>-			return createIDWithEx(serviceType, serviceName);
>-		} catch (final IDCreateException e) {
>-			fail(e.getMessage());
>-		} catch (final ClassCastException e) {
>-			fail(e.getMessage());
>-		}
>-		return null;
>-	}
>-
>-	private IServiceID createIDWithEx(String serviceType, String serviceName) throws IDCreateException {
>-		return ServiceIDFactory.getDefault().createServiceID(IDFactory.getDefault().getNamespaceByName("ecf.namespace.jmdns"), serviceType, serviceName);
>-	}
>-
>-	public void testJMDNSServiceTypeID() {
>-		final IServiceID sid = createID(DiscoveryServiceTest.TEST_SERVICE_TYPE, null);
>-		final IServiceTypeID stid = sid.getServiceTypeID();
>-		assertEquals(stid.getName(), DiscoveryServiceTest.TEST_SERVICE_TYPE);
>-		assertEquals(stid.getNamingAuthority(), "IANA");
>-		assertTrue(Arrays.equals(stid.getProtocols(), new String[] {"tcp"}));
>-		assertTrue(Arrays.equals(stid.getScopes(), new String[] {"local"}));
>-		assertTrue(Arrays.equals(stid.getServices(), new String[] {"ecftcp"}));
>-	}
>-
>-	public void testJMDNSServiceTypeID2() {
>-		final String serviceType = "_service._dns-srv._udp.ecf.eclipse.org.";
>-		final IServiceID sid = createID(serviceType, null);
>-		final IServiceTypeID stid = sid.getServiceTypeID();
>-		assertEquals(stid.getName(), serviceType);
>-		assertEquals(stid.getNamingAuthority(), "IANA");
>-		assertTrue(Arrays.equals(stid.getProtocols(), new String[] {"udp"}));
>-		assertTrue(Arrays.equals(stid.getScopes(), new String[] {"ecf.eclipse.org"}));
>-		assertTrue(Arrays.equals(stid.getServices(), new String[] {"service", "dns-srv"}));
>-	}
>-
>-	public void testJMDNSServiceTypeIDWithNullString() {
>-		try {
>-			createIDWithEx(null, null);
>-		} catch (final IDCreateException ex) {
>-			return;
>-		}
>-		fail();
>-	}
>-
>-	public void testJMDNSServiceTypeIDWithEmptyString() {
>-		try {
>-			createIDWithEx("", null);
>-		} catch (final IDCreateException ex) {
>-			return;
>-		}
>-		fail();
>-	}
>-
>-	/*
>-	public void testJMDNSServiceTypeIDWithIPv6() {
>-		final String serviceType = "1.0.0.0.0.c.e.f.f.f.6.5.0.5.2.0.0.0.0.0.0.0.0.0.0.0.0.0.0.8.e.f.ip6.arpa.";
>-		fail("Not implemented yet, don't know how to handle this service type " + serviceType + " if it even is one");
>-	}
>-	*/
>-
>-}
>Index: src/org/eclipse/ecf/tests/discovery/DiscoveryServiceTest.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.ecf/tests/org.eclipse.ecf.tests.discovery/src/org/eclipse/ecf/tests/discovery/DiscoveryServiceTest.java,v
>retrieving revision 1.4
>diff -u -r1.4 DiscoveryServiceTest.java
>--- src/org/eclipse/ecf/tests/discovery/DiscoveryServiceTest.java	5 Sep 2007 23:24:12 -0000	1.4
>+++ src/org/eclipse/ecf/tests/discovery/DiscoveryServiceTest.java	10 Sep 2007 10:14:39 -0000
>@@ -27,7 +27,7 @@
> 
> public class DiscoveryServiceTest extends TestCase {
> 
>-	static final String TEST_SERVICE_TYPE = "_ecftcp._tcp.local.";
>+	public static final String TEST_SERVICE_TYPE = "_ecftcp._tcp.local.";
> 	static final String TEST_PROTOCOL = "ecftcp";
> 	static final String TEST_HOST = "localhost";
> 	static final int TEST_PORT = 3282;
>Index: src/org/eclipse/ecf/tests/discovery/AllTests.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.ecf/tests/org.eclipse.ecf.tests.discovery/src/org/eclipse/ecf/tests/discovery/AllTests.java,v
>retrieving revision 1.3
>diff -u -r1.3 AllTests.java
>--- src/org/eclipse/ecf/tests/discovery/AllTests.java	5 Sep 2007 23:24:12 -0000	1.3
>+++ src/org/eclipse/ecf/tests/discovery/AllTests.java	10 Sep 2007 10:14:39 -0000
>@@ -8,7 +8,6 @@
>  * Contributors:
>  *    Composent, Inc. - initial API and implementation
>  *****************************************************************************/
>-
> package org.eclipse.ecf.tests.discovery;
> 
> import junit.framework.Test;
>@@ -25,7 +24,8 @@
> 		//$JUnit-BEGIN$
> 		suite.addTestSuite(DiscoveryServiceTest.class);
> 		suite.addTestSuite(DiscoveryTest.class);
>-		suite.addTestSuite(JMDNSNamespaceTest.class);
>+		Test ts = org.eclipse.ecf.tests.discovery.identity.AllTests.suite();
>+		suite.addTest(ts);
> 		//$JUnit-END$
> 		return suite;
> 	}
>Index: src/org/eclipse/ecf/tests/discovery/identity/AllTests.java
>===================================================================
>RCS file: src/org/eclipse/ecf/tests/discovery/identity/AllTests.java
>diff -N src/org/eclipse/ecf/tests/discovery/identity/AllTests.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/ecf/tests/discovery/identity/AllTests.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,19 @@
>+package org.eclipse.ecf.tests.discovery.identity;
>+
>+import junit.framework.Test;
>+import junit.framework.TestSuite;
>+
>+public class AllTests {
>+
>+	public static Test suite() {
>+		TestSuite suite = new TestSuite(
>+				"Test for org.eclipse.ecf.tests.discovery.identity");
>+		//$JUnit-BEGIN$
>+		suite.addTestSuite(JMDNSServiceIDTest.class);
>+		suite.addTestSuite(CompositeServiceIDTest.class);
>+		suite.addTestSuite(JSLPServiceIDTest.class);
>+		//$JUnit-END$
>+		return suite;
>+	}
>+
>+}
>Index: src/org/eclipse/ecf/tests/discovery/identity/CompositeServiceIDTest.java
>===================================================================
>RCS file: src/org/eclipse/ecf/tests/discovery/identity/CompositeServiceIDTest.java
>diff -N src/org/eclipse/ecf/tests/discovery/identity/CompositeServiceIDTest.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/ecf/tests/discovery/identity/CompositeServiceIDTest.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,24 @@
>+/*******************************************************************************
>+ * Copyright (c) 2007 Versant Corp.
>+ * All rights reserved. This program and the accompanying materials
>+ * are made available under the terms of the Eclipse Public License v1.0
>+ * which accompanies this distribution, and is available at
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ *
>+ * Contributors:
>+ *     Markus Kuppe (mkuppe <at> versant <dot> com) - initial API and implementation
>+ ******************************************************************************/
>+package org.eclipse.ecf.tests.discovery.identity;
>+
>+/**
>+ * 
>+ */
>+public class CompositeServiceIDTest extends ServiceIDTest {
>+
>+	private static final String ECF_NAMESPACE_DISCOVERY = "ecf.namespace.discovery";
>+
>+	public CompositeServiceIDTest() {
>+		super(ECF_NAMESPACE_DISCOVERY);
>+	}
>+
>+}
>Index: src/org/eclipse/ecf/tests/discovery/identity/JMDNSServiceIDTest.java
>===================================================================
>RCS file: src/org/eclipse/ecf/tests/discovery/identity/JMDNSServiceIDTest.java
>diff -N src/org/eclipse/ecf/tests/discovery/identity/JMDNSServiceIDTest.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/ecf/tests/discovery/identity/JMDNSServiceIDTest.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,30 @@
>+/*******************************************************************************
>+ * Copyright (c) 2007 Versant Corp.
>+ * All rights reserved. This program and the accompanying materials
>+ * are made available under the terms of the Eclipse Public License v1.0
>+ * which accompanies this distribution, and is available at
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ *
>+ * Contributors:
>+ *     Markus Kuppe (mkuppe <at> versant <dot> com) - initial API and implementation
>+ ******************************************************************************/
>+
>+package org.eclipse.ecf.tests.discovery.identity;
>+
>+
>+import org.eclipse.ecf.provider.jmdns.identity.JMDNSNamespace;
>+
>+/**
>+ *
>+ */
>+public class JMDNSServiceIDTest extends ServiceIDTest {
>+	
>+	public JMDNSServiceIDTest() {
>+		super(JMDNSNamespace.NAME);
>+	}
>+	
>+	public void testJMDNSServiceTypeIDWithIPv6() {
>+		final String serviceType = "1.0.0.0.0.c.e.f.f.f.6.5.0.5.2.0.0.0.0.0.0.0.0.0.0.0.0.0.0.8.e.f.ip6.arpa.";
>+		fail("Not implemented yet, don't know how to handle this service type " + serviceType + " if it even is one");
>+	}
>+}
>Index: src/org/eclipse/ecf/tests/discovery/identity/ServiceIDTest.java
>===================================================================
>RCS file: src/org/eclipse/ecf/tests/discovery/identity/ServiceIDTest.java
>diff -N src/org/eclipse/ecf/tests/discovery/identity/ServiceIDTest.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/ecf/tests/discovery/identity/ServiceIDTest.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,99 @@
>+/*******************************************************************************
>+ * Copyright (c) 2007 Versant Corp.
>+ * All rights reserved. This program and the accompanying materials
>+ * are made available under the terms of the Eclipse Public License v1.0
>+ * which accompanies this distribution, and is available at
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ *
>+ * Contributors:
>+ *     Markus Kuppe (mkuppe <at> versant <dot> com) - initial API and implementation
>+ ******************************************************************************/
>+package org.eclipse.ecf.tests.discovery.identity;
>+
>+import java.util.Arrays;
>+
>+import junit.framework.TestCase;
>+
>+import org.eclipse.ecf.core.identity.IDCreateException;
>+import org.eclipse.ecf.core.identity.IDFactory;
>+import org.eclipse.ecf.discovery.identity.IServiceID;
>+import org.eclipse.ecf.discovery.identity.IServiceTypeID;
>+import org.eclipse.ecf.discovery.identity.ServiceIDFactory;
>+import org.eclipse.ecf.tests.discovery.DiscoveryServiceTest;
>+
>+public abstract class ServiceIDTest extends TestCase {
>+
>+	protected String namespace;
>+
>+	public ServiceIDTest(String string) {
>+		namespace = string;
>+	}
>+
>+	protected IServiceID createID(String serviceType, String serviceName) {
>+		try {
>+			return createIDWithEx(serviceType, serviceName);
>+		} catch (final IDCreateException e) {
>+			fail(e.getMessage());
>+		} catch (final ClassCastException e) {
>+			fail(e.getMessage());
>+		}
>+		return null;
>+	}
>+
>+	protected IServiceID createIDWithEx(String serviceType, String serviceName)
>+			throws IDCreateException {
>+		return ServiceIDFactory.getDefault().createServiceID(
>+				IDFactory.getDefault().getNamespaceByName(namespace),
>+				serviceType, serviceName);
>+	}
>+
>+	public void testServiceTypeIDWithNullString() {
>+		try {
>+			createIDWithEx(null, null);
>+		} catch (final IDCreateException ex) {
>+			return;
>+		}
>+		fail();
>+	}
>+
>+	public void testServiceTypeIDWithEmptyString() {
>+		try {
>+			createIDWithEx("", null);
>+		} catch (final IDCreateException ex) {
>+			return;
>+		}
>+		fail();
>+	}
>+
>+	public void testServiceTypeID() {
>+		final IServiceID sid = createID(DiscoveryServiceTest.TEST_SERVICE_TYPE, null);
>+		final IServiceTypeID stid = sid.getServiceTypeID();
>+		assertEquals(stid.getName(), DiscoveryServiceTest.TEST_SERVICE_TYPE);
>+		assertEquals(stid.getNamingAuthority(), "IANA");
>+		assertTrue(Arrays.equals(stid.getProtocols(), new String[] {"tcp"}));
>+		assertTrue(Arrays.equals(stid.getScopes(), new String[] {"local"}));
>+		assertTrue(Arrays.equals(stid.getServices(), new String[] {"ecftcp"}));
>+	}
>+
>+	public void testServiceTypeID2() {
>+		final String serviceType = "_service._dns-srv._udp.ecf.eclipse.org._IANA";
>+		final IServiceID sid = createID(serviceType, null);
>+		final IServiceTypeID stid = sid.getServiceTypeID();
>+		assertEquals(stid.getName(), serviceType);
>+		assertEquals(stid.getNamingAuthority(), "IANA");
>+		assertTrue(Arrays.equals(stid.getProtocols(), new String[] {"udp"}));
>+		assertTrue(Arrays.equals(stid.getScopes(), new String[] {"ecf.eclipse.org"}));
>+		assertTrue(Arrays.equals(stid.getServices(), new String[] {"service", "dns-srv"}));
>+	}
>+	
>+	public void testServiceTypeID3() {
>+		final String serviceType = "_service._dns-srv._udp.ecf.eclipse.org._ECLIPSE";
>+		final IServiceID sid = createID(serviceType, null);
>+		final IServiceTypeID stid = sid.getServiceTypeID();
>+		assertEquals(stid.getName(), serviceType);
>+		assertEquals(stid.getNamingAuthority(), "ECLIPSE");
>+		assertTrue(Arrays.equals(stid.getProtocols(), new String[] {"udp"}));
>+		assertTrue(Arrays.equals(stid.getScopes(), new String[] {"ecf.eclipse.org"}));
>+		assertTrue(Arrays.equals(stid.getServices(), new String[] {"service", "dns-srv"}));
>+	}
>+}

Actions: View | Diff

Attachments on bug 200803: 77967 | 79065