Merge remote-tracking branch 'origin/master'

2 files changed, 108 insertions, 108 deletions

diff --git a/framework/bundles/org.eclipse.ecf.identity/.settings/.api_filters b/framework/bundles/org.eclipse.ecf.identity/.settings/.api_filters
index dfeb7bea6..3a63a0c37 100644
--- a/framework/bundles/org.eclipse.ecf.identity/.settings/.api_filters
+++ b/framework/bundles/org.eclipse.ecf.identity/.settings/.api_filters
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>

-<component id="org.eclipse.ecf.identity" version="2">

-    <resource path="src/org/eclipse/ecf/core/util/SystemLogService.java" type="org.eclipse.ecf.core.util.SystemLogService">

-        <filter id="574619656">

-            <message_arguments>

-                <message_argument value="LogService"/>

-                <message_argument value="SystemLogService"/>

-            </message_arguments>

-        </filter>

-    </resource>

-</component>

+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<component id="org.eclipse.ecf.identity" version="2">
+    <resource path="src/org/eclipse/ecf/core/util/SystemLogService.java" type="org.eclipse.ecf.core.util.SystemLogService">
+        <filter id="574619656">
+            <message_arguments>
+                <message_argument value="LogService"/>
+                <message_argument value="SystemLogService"/>
+            </message_arguments>
+        </filter>
+    </resource>
+</component>
diff --git a/framework/bundles/org.eclipse.ecf.identity/.settings/org.eclipse.pde.api.tools.prefs b/framework/bundles/org.eclipse.ecf.identity/.settings/org.eclipse.pde.api.tools.prefs
index ab935311a..9917f9f36 100644
--- a/framework/bundles/org.eclipse.ecf.identity/.settings/org.eclipse.pde.api.tools.prefs
+++ b/framework/bundles/org.eclipse.ecf.identity/.settings/org.eclipse.pde.api.tools.prefs
@@ -1,97 +1,97 @@
-ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error

-ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error

-ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error

-ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error

-ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error

-API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error

-API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_API_TYPE=Error

-API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_TYPE=Error

-API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error

-API_USE_SCAN_FIELD_SEVERITY=Error

-API_USE_SCAN_METHOD_SEVERITY=Error

-API_USE_SCAN_TYPE_SEVERITY=Error

-CLASS_ELEMENT_TYPE_ADDED_METHOD=Error

-CLASS_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error

-CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error

-CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error

-CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error

-CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error

-CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error

-CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error

-CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error

-CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error

-CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error

-CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error

-CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error

-CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error

-CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error

-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error

-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error

-CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error

-ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error

-ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error

-ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error

-ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error

-ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error

-ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error

-FIELD_ELEMENT_TYPE_ADDED_VALUE=Error

-FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error

-FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error

-FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error

-FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error

-FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error

-FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error

-FIELD_ELEMENT_TYPE_CHANGED_VALUE=Error

-FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error

-FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error

-ILLEGAL_EXTEND=Warning

-ILLEGAL_IMPLEMENT=Warning

-ILLEGAL_INSTANTIATE=Warning

-ILLEGAL_OVERRIDE=Warning

-ILLEGAL_REFERENCE=Warning

-INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Error

-INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error

-INTERFACE_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error

-INTERFACE_ELEMENT_TYPE_ADDED_SUPER_INTERFACE_WITH_METHODS=Error

-INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error

-INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error

-INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error

-INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error

-INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error

-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error

-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error

-INVALID_JAVADOC_TAG=Ignore

-INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Error

-LEAK_EXTEND=Warning

-LEAK_FIELD_DECL=Warning

-LEAK_IMPLEMENT=Warning

-LEAK_METHOD_PARAM=Warning

-LEAK_METHOD_RETURN_TYPE=Warning

-METHOD_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error

-METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error

-METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error

-METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error

-METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error

-METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error

-METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error

-METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error

-METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error

-METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error

-MISSING_EE_DESCRIPTIONS=Ignore

-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error

-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error

-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error

-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error

-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error

-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error

-UNUSED_PROBLEM_FILTERS=Warning

-automatically_removed_unused_problem_filters=false

-eclipse.preferences.version=1

-incompatible_api_component_version=Error

-incompatible_api_component_version_include_major_without_breaking_change=Disabled

-incompatible_api_component_version_include_minor_without_api_change=Disabled

-invalid_since_tag_version=Error

-malformed_since_tag=Error

-missing_since_tag=Error

-report_api_breakage_when_major_version_incremented=Disabled

-report_resolution_errors_api_component=Warning

+ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
+ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
+ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error
+ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_API_TYPE=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_TYPE=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
+API_USE_SCAN_FIELD_SEVERITY=Error
+API_USE_SCAN_METHOD_SEVERITY=Error
+API_USE_SCAN_TYPE_SEVERITY=Error
+CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
+CLASS_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
+CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
+CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
+CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
+CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error
+CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error
+CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error
+CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error
+CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
+CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
+ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error
+ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error
+ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error
+ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+FIELD_ELEMENT_TYPE_ADDED_VALUE=Error
+FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error
+FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
+FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
+FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
+FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error
+FIELD_ELEMENT_TYPE_CHANGED_VALUE=Error
+FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error
+FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error
+ILLEGAL_EXTEND=Warning
+ILLEGAL_IMPLEMENT=Warning
+ILLEGAL_INSTANTIATE=Warning
+ILLEGAL_OVERRIDE=Warning
+ILLEGAL_REFERENCE=Warning
+INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Error
+INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
+INTERFACE_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
+INTERFACE_ELEMENT_TYPE_ADDED_SUPER_INTERFACE_WITH_METHODS=Error
+INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
+INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+INVALID_JAVADOC_TAG=Ignore
+INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Error
+LEAK_EXTEND=Warning
+LEAK_FIELD_DECL=Warning
+LEAK_IMPLEMENT=Warning
+LEAK_METHOD_PARAM=Warning
+LEAK_METHOD_RETURN_TYPE=Warning
+METHOD_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
+METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
+METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
+METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
+METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
+METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
+METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
+METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+MISSING_EE_DESCRIPTIONS=Ignore
+TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
+UNUSED_PROBLEM_FILTERS=Warning
+automatically_removed_unused_problem_filters=false
+eclipse.preferences.version=1
+incompatible_api_component_version=Error
+incompatible_api_component_version_include_major_without_breaking_change=Disabled
+incompatible_api_component_version_include_minor_without_api_change=Disabled
+invalid_since_tag_version=Error
+malformed_since_tag=Error
+missing_since_tag=Error
+report_api_breakage_when_major_version_incremented=Disabled
+report_resolution_errors_api_component=Warning