diff options
Diffstat (limited to 'framework')
1160 files changed, 9665 insertions, 6992 deletions
diff --git a/framework/bundles/org.eclipse.ecf.console/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.console/META-INF/MANIFEST.MF index 01c86c64c..ac4305f07 100644 --- a/framework/bundles/org.eclipse.ecf.console/META-INF/MANIFEST.MF +++ b/framework/bundles/org.eclipse.ecf.console/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: %plugin.name Bundle-SymbolicName: org.eclipse.ecf.console Automatic-Module-Name: org.eclipse.ecf.console Bundle-Vendor: %plugin.provider -Bundle-Version: 1.3.0.qualifier +Bundle-Version: 1.3.100.qualifier Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 Import-Package: org.apache.felix.service.command;version="[0.10.0,2.0.0)";resolution:=optional, diff --git a/framework/bundles/org.eclipse.ecf.console/about.html b/framework/bundles/org.eclipse.ecf.console/about.html index 4c79781a5..9f1dc0dd5 100644 --- a/framework/bundles/org.eclipse.ecf.console/about.html +++ b/framework/bundles/org.eclipse.ecf.console/about.html @@ -22,7 +22,7 @@ being redistributed by another party ("Redistributor") and different t apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise indicated below, the terms and conditions of the EPL still apply to any source code in the Content -and such source code may be obtained at <a href="/">http://www.eclipse.org</a>.</p> +and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p> </body> </html>
\ No newline at end of file diff --git a/framework/bundles/org.eclipse.ecf.console/plugin.properties b/framework/bundles/org.eclipse.ecf.console/plugin.properties index 1ea7e3fdd..84f339fd7 100644 --- a/framework/bundles/org.eclipse.ecf.console/plugin.properties +++ b/framework/bundles/org.eclipse.ecf.console/plugin.properties @@ -1,10 +1,11 @@ ############################################################################ # Copyright (c) 2011 Composent Inc., IBM Corp. and others. -# 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 # +# This program and the accompanying materials are made +# available under the terms of the Eclipse Public License 2.0 +# which is available at https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 ############################################################################ plugin.name=ECF OSGi Console Command Provider plugin.provider=Eclipse.org - ECF diff --git a/framework/bundles/org.eclipse.ecf.console/pom.xml b/framework/bundles/org.eclipse.ecf.console/pom.xml index f9dd4fabd..0b6a8c9a7 100644 --- a/framework/bundles/org.eclipse.ecf.console/pom.xml +++ b/framework/bundles/org.eclipse.ecf.console/pom.xml @@ -10,6 +10,6 @@ </parent> <groupId>org.eclipse.ecf</groupId> <artifactId>org.eclipse.ecf.console</artifactId> - <version>1.3.0-SNAPSHOT</version> + <version>1.3.100-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/framework/bundles/org.eclipse.ecf.console/src/org/eclipse/ecf/console/AbstractCommand.java b/framework/bundles/org.eclipse.ecf.console/src/org/eclipse/ecf/console/AbstractCommand.java index e8bedf051..c640385d5 100644 --- a/framework/bundles/org.eclipse.ecf.console/src/org/eclipse/ecf/console/AbstractCommand.java +++ b/framework/bundles/org.eclipse.ecf.console/src/org/eclipse/ecf/console/AbstractCommand.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2018 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2018 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.console; import java.util.ArrayList; diff --git a/framework/bundles/org.eclipse.ecf.console/src/org/eclipse/ecf/internal/console/ContainerCommand.java b/framework/bundles/org.eclipse.ecf.console/src/org/eclipse/ecf/internal/console/ContainerCommand.java index 0b8e466bc..fc257790c 100644 --- a/framework/bundles/org.eclipse.ecf.console/src/org/eclipse/ecf/internal/console/ContainerCommand.java +++ b/framework/bundles/org.eclipse.ecf.console/src/org/eclipse/ecf/internal/console/ContainerCommand.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2018 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2018 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.internal.console; import java.util.List; diff --git a/framework/bundles/org.eclipse.ecf.datashare/.settings/org.eclipse.jdt.core.prefs b/framework/bundles/org.eclipse.ecf.datashare/.settings/org.eclipse.jdt.core.prefs index 8721ce210..8a762c3d9 100644 --- a/framework/bundles/org.eclipse.ecf.datashare/.settings/org.eclipse.jdt.core.prefs +++ b/framework/bundles/org.eclipse.ecf.datashare/.settings/org.eclipse.jdt.core.prefs @@ -7,6 +7,7 @@ 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=enabled +org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve org.eclipse.jdt.core.compiler.compliance=1.4 @@ -16,16 +17,17 @@ 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=error +org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning org.eclipse.jdt.core.compiler.problem.autoboxing=ignore org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning org.eclipse.jdt.core.compiler.problem.deadCode=warning -org.eclipse.jdt.core.compiler.problem.deprecation=warning +org.eclipse.jdt.core.compiler.problem.deprecation=ignore 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=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled +org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled org.eclipse.jdt.core.compiler.problem.fieldHiding=warning @@ -66,6 +68,7 @@ org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=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 @@ -91,23 +94,28 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=enab org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning +org.eclipse.jdt.core.compiler.release=disabled 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_additive_operator=16 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_bitwise_operator=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_logical_operator=16 org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=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_string_concatenation=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 @@ -177,11 +185,12 @@ 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_additive_operator=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_bitwise_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 @@ -211,6 +220,8 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=inser 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_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=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 @@ -234,12 +245,16 @@ 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_relational_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=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_bitwise_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 @@ -285,6 +300,8 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do n 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_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=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 @@ -320,8 +337,11 @@ org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not inser 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_relational_operator=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_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=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 @@ -344,6 +364,10 @@ 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.formatter.wrap_before_additive_operator=true +org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true +org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true +org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true +org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true org.eclipse.jdt.core.incompatibleJDKLevel=ignore org.eclipse.jdt.core.incompleteClasspath=error diff --git a/framework/bundles/org.eclipse.ecf.datashare/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.datashare/META-INF/MANIFEST.MF index 2d4126fcc..98fd76e97 100644 --- a/framework/bundles/org.eclipse.ecf.datashare/META-INF/MANIFEST.MF +++ b/framework/bundles/org.eclipse.ecf.datashare/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin.name Bundle-SymbolicName: org.eclipse.ecf.datashare;singleton:=true Automatic-Module-Name: org.eclipse.ecf.datashare -Bundle-Version: 3.0.200.qualifier +Bundle-Version: 3.0.300.qualifier Bundle-Vendor: %plugin.provider Bundle-Localization: plugin Export-Package: org.eclipse.ecf.datashare;version="3.1.0", diff --git a/framework/bundles/org.eclipse.ecf.datashare/about.html b/framework/bundles/org.eclipse.ecf.datashare/about.html index 4c79781a5..9f1dc0dd5 100644 --- a/framework/bundles/org.eclipse.ecf.datashare/about.html +++ b/framework/bundles/org.eclipse.ecf.datashare/about.html @@ -22,7 +22,7 @@ being redistributed by another party ("Redistributor") and different t apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise indicated below, the terms and conditions of the EPL still apply to any source code in the Content -and such source code may be obtained at <a href="/">http://www.eclipse.org</a>.</p> +and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p> </body> </html>
\ No newline at end of file diff --git a/framework/bundles/org.eclipse.ecf.datashare/plugin.properties b/framework/bundles/org.eclipse.ecf.datashare/plugin.properties index d1cfa1b93..6dbc462cf 100644 --- a/framework/bundles/org.eclipse.ecf.datashare/plugin.properties +++ b/framework/bundles/org.eclipse.ecf.datashare/plugin.properties @@ -1,10 +1,11 @@ ############################################################################ # Copyright (c) 2007 Composent Inc., IBM Corp. and others. -# 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 # +# This program and the accompanying materials are made +# available under the terms of the Eclipse Public License 2.0 +# which is available at https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 ############################################################################ plugin.name=ECF DataShare API plugin.provider=Eclipse.org - ECF diff --git a/framework/bundles/org.eclipse.ecf.datashare/pom.xml b/framework/bundles/org.eclipse.ecf.datashare/pom.xml index f60d97965..350a35624 100644 --- a/framework/bundles/org.eclipse.ecf.datashare/pom.xml +++ b/framework/bundles/org.eclipse.ecf.datashare/pom.xml @@ -10,6 +10,6 @@ </parent> <groupId>org.eclipse.ecf</groupId> <artifactId>org.eclipse.ecf.datashare</artifactId> - <version>3.0.200-SNAPSHOT</version> + <version>3.0.300-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/AbstractShare.java b/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/AbstractShare.java index d418a8760..4aa6abdc1 100644 --- a/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/AbstractShare.java +++ b/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/AbstractShare.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.datashare; diff --git a/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/BaseChannelConfig.java b/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/BaseChannelConfig.java index 7f85080bd..c5658705a 100644 --- a/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/BaseChannelConfig.java +++ b/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/BaseChannelConfig.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc., Peter Nehrer, Boris Bokowski. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc., Peter Nehrer, Boris Bokowski. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.datashare; import java.util.Map; diff --git a/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/ChannelContainer.java b/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/ChannelContainer.java index 6d9610fc0..282ebb707 100644 --- a/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/ChannelContainer.java +++ b/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/ChannelContainer.java @@ -1,12 +1,15 @@ -/******************************************************************************* -* Copyright (c) 2009 EclipseSource and others. 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: -* EclipseSource - initial API and implementation -******************************************************************************/ +/**************************************************************************** + * Copyright (c) 2009 EclipseSource and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * Contributors: + * EclipseSource - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.datashare; import org.eclipse.core.runtime.Assert; diff --git a/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/IAbstractChannel.java b/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/IAbstractChannel.java index 607d8980d..625c64c8d 100644 --- a/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/IAbstractChannel.java +++ b/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/IAbstractChannel.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc., Peter Nehrer, Boris Bokowski. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc., Peter Nehrer, Boris Bokowski. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.datashare; import org.eclipse.core.runtime.IAdaptable; diff --git a/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/IAbstractChannelContainerAdapter.java b/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/IAbstractChannelContainerAdapter.java index 545641dbd..9a84fa2eb 100644 --- a/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/IAbstractChannelContainerAdapter.java +++ b/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/IAbstractChannelContainerAdapter.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc., Peter Nehrer, Boris Bokowski. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc., Peter Nehrer, Boris Bokowski. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.datashare; import org.eclipse.core.runtime.IAdaptable; diff --git a/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/IChannel.java b/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/IChannel.java index a6cc1addd..de1c45d0f 100644 --- a/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/IChannel.java +++ b/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/IChannel.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc., Peter Nehrer, Boris Bokowski. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc., Peter Nehrer, Boris Bokowski. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.datashare; import org.eclipse.ecf.core.identity.ID; diff --git a/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/IChannelConfig.java b/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/IChannelConfig.java index 950fe73d2..76eeedd8b 100644 --- a/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/IChannelConfig.java +++ b/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/IChannelConfig.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc., Peter Nehrer, Boris Bokowski. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc., Peter Nehrer, Boris Bokowski. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.datashare; import java.util.Map; diff --git a/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/IChannelContainer.java b/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/IChannelContainer.java index dc384185c..d4c675038 100644 --- a/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/IChannelContainer.java +++ b/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/IChannelContainer.java @@ -1,12 +1,15 @@ -/******************************************************************************* -* Copyright (c) 2009 EclipseSource and others. 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: -* EclipseSource - initial API and implementation -******************************************************************************/ +/**************************************************************************** + * Copyright (c) 2009 EclipseSource and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * Contributors: + * EclipseSource - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.datashare; import org.eclipse.ecf.core.IContainer; diff --git a/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/IChannelContainerAdapter.java b/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/IChannelContainerAdapter.java index effcccc78..f2638ee02 100644 --- a/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/IChannelContainerAdapter.java +++ b/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/IChannelContainerAdapter.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc., Peter Nehrer, Boris Bokowski. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc., Peter Nehrer, Boris Bokowski. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.datashare; import java.util.Map; diff --git a/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/IChannelContainerListener.java b/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/IChannelContainerListener.java index 7956e2db0..68fccb92b 100644 --- a/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/IChannelContainerListener.java +++ b/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/IChannelContainerListener.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc., Peter Nehrer, Boris Bokowski. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc., Peter Nehrer, Boris Bokowski. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.datashare; import org.eclipse.ecf.datashare.events.IChannelContainerEvent; diff --git a/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/IChannelListener.java b/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/IChannelListener.java index 9ef2213de..f22ef1c00 100644 --- a/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/IChannelListener.java +++ b/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/IChannelListener.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc., Peter Nehrer, Boris Bokowski. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc., Peter Nehrer, Boris Bokowski. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.datashare; import org.eclipse.ecf.datashare.events.IChannelEvent; diff --git a/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/IStreamContainerAdapter.java b/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/IStreamContainerAdapter.java index 6a90366fc..034475c35 100644 --- a/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/IStreamContainerAdapter.java +++ b/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/IStreamContainerAdapter.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2008 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.datashare; diff --git a/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/events/IChannelConnectEvent.java b/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/events/IChannelConnectEvent.java index 222f90b45..553e80cd7 100644 --- a/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/events/IChannelConnectEvent.java +++ b/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/events/IChannelConnectEvent.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004, 2009 Composent, Inc., Peter Nehrer, Boris Bokowski. 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 - * +/**************************************************************************** + * Copyright (c) 2004, 2009 Composent, Inc., Peter Nehrer, Boris Bokowski. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.datashare.events; import org.eclipse.ecf.core.IContainer; diff --git a/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/events/IChannelContainerChannelActivatedEvent.java b/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/events/IChannelContainerChannelActivatedEvent.java index 769c85753..ae57b6996 100644 --- a/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/events/IChannelContainerChannelActivatedEvent.java +++ b/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/events/IChannelContainerChannelActivatedEvent.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc., Peter Nehrer, Boris Bokowski. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc., Peter Nehrer, Boris Bokowski. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.datashare.events; /** diff --git a/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/events/IChannelContainerChannelDeactivatedEvent.java b/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/events/IChannelContainerChannelDeactivatedEvent.java index e81d5ec0f..d26e33e40 100644 --- a/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/events/IChannelContainerChannelDeactivatedEvent.java +++ b/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/events/IChannelContainerChannelDeactivatedEvent.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004, 2009 Composent, Inc., Peter Nehrer, Boris Bokowski. 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 - * +/**************************************************************************** + * Copyright (c) 2004, 2009 Composent, Inc., Peter Nehrer, Boris Bokowski. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.datashare.events; /** diff --git a/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/events/IChannelContainerEvent.java b/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/events/IChannelContainerEvent.java index a4c65ec35..c556ce03b 100644 --- a/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/events/IChannelContainerEvent.java +++ b/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/events/IChannelContainerEvent.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004, 2009 Composent, Inc., Peter Nehrer, Boris Bokowski. 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 - * +/**************************************************************************** + * Copyright (c) 2004, 2009 Composent, Inc., Peter Nehrer, Boris Bokowski. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.datashare.events; import org.eclipse.ecf.core.identity.ID; diff --git a/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/events/IChannelDisconnectEvent.java b/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/events/IChannelDisconnectEvent.java index f2277ea85..e30f9a569 100644 --- a/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/events/IChannelDisconnectEvent.java +++ b/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/events/IChannelDisconnectEvent.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc., Peter Nehrer, Boris Bokowski. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc., Peter Nehrer, Boris Bokowski. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.datashare.events; import org.eclipse.ecf.core.identity.ID; diff --git a/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/events/IChannelEvent.java b/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/events/IChannelEvent.java index 3d9f21261..384404af8 100644 --- a/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/events/IChannelEvent.java +++ b/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/events/IChannelEvent.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc., Peter Nehrer, Boris Bokowski. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc., Peter Nehrer, Boris Bokowski. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.datashare.events; import org.eclipse.ecf.core.identity.ID; diff --git a/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/events/IChannelMessageEvent.java b/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/events/IChannelMessageEvent.java index 780f004f3..f374207be 100644 --- a/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/events/IChannelMessageEvent.java +++ b/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/events/IChannelMessageEvent.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc., Peter Nehrer, Boris Bokowski. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc., Peter Nehrer, Boris Bokowski. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.datashare.events; import org.eclipse.ecf.core.identity.ID; diff --git a/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/mergeable/IChannelHeader.java b/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/mergeable/IChannelHeader.java index 499a8bdf6..e4b70501e 100644 --- a/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/mergeable/IChannelHeader.java +++ b/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/mergeable/IChannelHeader.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.datashare.mergeable; /** diff --git a/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/mergeable/IConflict.java b/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/mergeable/IConflict.java index e1ca005f4..a22d2753c 100644 --- a/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/mergeable/IConflict.java +++ b/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/mergeable/IConflict.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.datashare.mergeable; /** diff --git a/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/mergeable/IItem.java b/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/mergeable/IItem.java index 801d93adf..84b892cd7 100644 --- a/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/mergeable/IItem.java +++ b/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/mergeable/IItem.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.datashare.mergeable; import java.util.List; diff --git a/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/mergeable/IItemFactory.java b/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/mergeable/IItemFactory.java index 238516d95..3793cdc81 100644 --- a/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/mergeable/IItemFactory.java +++ b/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/mergeable/IItemFactory.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.datashare.mergeable; /** diff --git a/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/mergeable/IItemHistory.java b/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/mergeable/IItemHistory.java index 1b6afb733..22cc4b1cc 100644 --- a/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/mergeable/IItemHistory.java +++ b/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/mergeable/IItemHistory.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.datashare.mergeable; import java.util.List; diff --git a/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/mergeable/IMergeableChannel.java b/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/mergeable/IMergeableChannel.java index c1c8b7c34..08d806f95 100644 --- a/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/mergeable/IMergeableChannel.java +++ b/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/mergeable/IMergeableChannel.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.datashare.mergeable; import java.util.List; diff --git a/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/mergeable/IMergeableChannelContainerAdapter.java b/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/mergeable/IMergeableChannelContainerAdapter.java index 551f2863e..577e625be 100644 --- a/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/mergeable/IMergeableChannelContainerAdapter.java +++ b/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/mergeable/IMergeableChannelContainerAdapter.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.datashare.mergeable; import java.util.Map; diff --git a/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/mergeable/IUpdateInfo.java b/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/mergeable/IUpdateInfo.java index c0b388616..eb2459381 100644 --- a/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/mergeable/IUpdateInfo.java +++ b/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/mergeable/IUpdateInfo.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.datashare.mergeable; import java.util.Date; diff --git a/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/mergeable/MergeException.java b/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/mergeable/MergeException.java index 56c0f94b1..1bed37b7b 100644 --- a/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/mergeable/MergeException.java +++ b/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/mergeable/MergeException.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.datashare.mergeable; import org.eclipse.core.runtime.IStatus; diff --git a/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/mergeable/PublishException.java b/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/mergeable/PublishException.java index bfb92d2c9..a3e1c544b 100644 --- a/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/mergeable/PublishException.java +++ b/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/mergeable/PublishException.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.datashare.mergeable; import org.eclipse.core.runtime.IStatus; diff --git a/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/service/IDatashareService.java b/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/service/IDatashareService.java index 1dd354563..b299b4bb6 100644 --- a/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/service/IDatashareService.java +++ b/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/service/IDatashareService.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.datashare.service; diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui.browser/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.discovery.ui.browser/META-INF/MANIFEST.MF index 1915e15da..ca1b45ec7 100644 --- a/framework/bundles/org.eclipse.ecf.discovery.ui.browser/META-INF/MANIFEST.MF +++ b/framework/bundles/org.eclipse.ecf.discovery.ui.browser/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.ecf.discovery.ui.browser;singleton:=true Automatic-Module-Name: org.eclipse.ecf.discovery.ui.browser -Bundle-Version: 1.0.100.qualifier +Bundle-Version: 1.0.200.qualifier Bundle-Activator: org.eclipse.ecf.discovery.ui.browser.Activator Bundle-Vendor: %pluginProvider Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1, diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui.browser/about.html b/framework/bundles/org.eclipse.ecf.discovery.ui.browser/about.html index 6a60a262f..7e02a356d 100644 --- a/framework/bundles/org.eclipse.ecf.discovery.ui.browser/about.html +++ b/framework/bundles/org.eclipse.ecf.discovery.ui.browser/about.html @@ -22,7 +22,7 @@ being redistributed by another party ("Redistributor") and different t apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise indicated below, the terms and conditions of the EPL still apply to any source code in the Content -and such source code may be obtained at <a href="/">http://www.eclipse.org</a>.</p> +and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p> </body> </html>
\ No newline at end of file diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui.browser/plugin.properties b/framework/bundles/org.eclipse.ecf.discovery.ui.browser/plugin.properties index 532fc6b93..d6d01b505 100644 --- a/framework/bundles/org.eclipse.ecf.discovery.ui.browser/plugin.properties +++ b/framework/bundles/org.eclipse.ecf.discovery.ui.browser/plugin.properties @@ -1,10 +1,11 @@ ############################################################################ # Copyright (c) 2009 Composent Inc., Markus Alexander Kuppe and others. -# 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 # +# This program and the accompanying materials are made +# available under the terms of the Eclipse Public License 2.0 +# which is available at https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 ############################################################################ pluginProvider = Eclipse.org - ECF pluginName = ECF Discovery UI Webbrowser diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui.browser/plugin.xml b/framework/bundles/org.eclipse.ecf.discovery.ui.browser/plugin.xml index d5d2bf8cd..5c4e64bd6 100644 --- a/framework/bundles/org.eclipse.ecf.discovery.ui.browser/plugin.xml +++ b/framework/bundles/org.eclipse.ecf.discovery.ui.browser/plugin.xml @@ -2,52 +2,6 @@ <?eclipse version="3.0"?> <plugin> <extension - point="org.eclipse.ui.menus"> - <menuContribution - locationURI="popup:org.eclipse.ecf.discovery.ui.DiscoveryView?after=additions"> - <command - commandId="org.eclipse.ecf.discovery.ui.browser.command.open" - mnemonic="S" - style="push"> - <visibleWhen - checkEnabled="false"> - <with - variable="activeMenuSelection"> - <iterate - ifEmpty="false"> - <test - args="http" - property="org.eclipse.ecf.discovery.isServiceType" - value="true"> - </test></iterate> - </with> - </visibleWhen> - </command> - </menuContribution> - <menuContribution - locationURI="popup:org.eclipse.ecf.discovery.ui.DiscoveryView?after=additions"> - <command - commandId="org.eclipse.ecf.discovery.ui.browser.command.open" - mnemonic="S" - style="push"> - <visibleWhen - checkEnabled="false"> - <with - variable="activeMenuSelection"> - <iterate - ifEmpty="false"> - <test - args="https" - property="org.eclipse.ecf.discovery.isServiceType" - value="true"> - </test> - </iterate> - </with> - </visibleWhen> - </command> - </menuContribution> - </extension> - <extension point="org.eclipse.ui.commands"> <command defaultHandler="org.eclipse.ecf.discovery.ui.browser.OpenBrowserCommand" diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui.browser/pom.xml b/framework/bundles/org.eclipse.ecf.discovery.ui.browser/pom.xml index bf51bb659..edba8e9d0 100644 --- a/framework/bundles/org.eclipse.ecf.discovery.ui.browser/pom.xml +++ b/framework/bundles/org.eclipse.ecf.discovery.ui.browser/pom.xml @@ -10,6 +10,6 @@ </parent> <groupId>org.eclipse.ecf</groupId> <artifactId>org.eclipse.ecf.discovery.ui.browser</artifactId> - <version>1.0.100-SNAPSHOT</version> + <version>1.0.200-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui.browser/src/org/eclipse/ecf/discovery/ui/browser/OpenBrowserCommand.java b/framework/bundles/org.eclipse.ecf.discovery.ui.browser/src/org/eclipse/ecf/discovery/ui/browser/OpenBrowserCommand.java index c9b86359a..a1c5b7c46 100644 --- a/framework/bundles/org.eclipse.ecf.discovery.ui.browser/src/org/eclipse/ecf/discovery/ui/browser/OpenBrowserCommand.java +++ b/framework/bundles/org.eclipse.ecf.discovery.ui.browser/src/org/eclipse/ecf/discovery/ui/browser/OpenBrowserCommand.java @@ -1,13 +1,15 @@ -/******************************************************************************* +/**************************************************************************** * Copyright (c) 2009 Markus Alexander Kuppe. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Markus Alexander Kuppe (ecf-dev_eclipse.org <at> lemmster <dot> de) - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.discovery.ui.browser; import java.net.MalformedURLException; diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui.edit/.settings/org.eclipse.jdt.core.prefs b/framework/bundles/org.eclipse.ecf.discovery.ui.edit/.settings/org.eclipse.jdt.core.prefs index cc4b0a349..6e32f8d30 100644 --- a/framework/bundles/org.eclipse.ecf.discovery.ui.edit/.settings/org.eclipse.jdt.core.prefs +++ b/framework/bundles/org.eclipse.ecf.discovery.ui.edit/.settings/org.eclipse.jdt.core.prefs @@ -16,7 +16,7 @@ org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning org.eclipse.jdt.core.compiler.problem.autoboxing=ignore org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning org.eclipse.jdt.core.compiler.problem.deadCode=warning -org.eclipse.jdt.core.compiler.problem.deprecation=warning +org.eclipse.jdt.core.compiler.problem.deprecation=ignore org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled org.eclipse.jdt.core.compiler.problem.discouragedReference=warning diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui.edit/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.discovery.ui.edit/META-INF/MANIFEST.MF index d87f565b4..587c5d677 100644 --- a/framework/bundles/org.eclipse.ecf.discovery.ui.edit/META-INF/MANIFEST.MF +++ b/framework/bundles/org.eclipse.ecf.discovery.ui.edit/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.ecf.discovery.ui.edit;singleton:=true Automatic-Module-Name: org.eclipse.ecf.discovery.ui.edit -Bundle-Version: 3.0.100.qualifier +Bundle-Version: 3.0.200.qualifier Bundle-ClassPath: . Bundle-Activator: org.eclipse.ecf.discovery.ui.model.provider.DiscoveryEditPlugin$Implementation Bundle-Vendor: %providerName diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui.edit/about.html b/framework/bundles/org.eclipse.ecf.discovery.ui.edit/about.html index 6a60a262f..7e02a356d 100644 --- a/framework/bundles/org.eclipse.ecf.discovery.ui.edit/about.html +++ b/framework/bundles/org.eclipse.ecf.discovery.ui.edit/about.html @@ -22,7 +22,7 @@ being redistributed by another party ("Redistributor") and different t apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise indicated below, the terms and conditions of the EPL still apply to any source code in the Content -and such source code may be obtained at <a href="/">http://www.eclipse.org</a>.</p> +and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p> </body> </html>
\ No newline at end of file diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui.edit/plugin.properties b/framework/bundles/org.eclipse.ecf.discovery.ui.edit/plugin.properties index db26fe924..0e3a1ecd1 100644 --- a/framework/bundles/org.eclipse.ecf.discovery.ui.edit/plugin.properties +++ b/framework/bundles/org.eclipse.ecf.discovery.ui.edit/plugin.properties @@ -1,11 +1,12 @@ -/**************************************************************************** -* Copyright (c) 2008 Versant Corp. and others. -* 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 -* -*****************************************************************************/ +############################################################################ +# Copyright (c) 2008 Versant Corp. and others. +# +# This program and the accompanying materials are made +# available under the terms of the Eclipse Public License 2.0 +# which is available at https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 +############################################################################ pluginName=ECF Discovery UI Edit providerName=Eclipse.org - ECF diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui.edit/pom.xml b/framework/bundles/org.eclipse.ecf.discovery.ui.edit/pom.xml index 54bca76d0..5f5fdec70 100644 --- a/framework/bundles/org.eclipse.ecf.discovery.ui.edit/pom.xml +++ b/framework/bundles/org.eclipse.ecf.discovery.ui.edit/pom.xml @@ -10,6 +10,6 @@ </parent> <groupId>org.eclipse.ecf</groupId> <artifactId>org.eclipse.ecf.discovery.ui.edit</artifactId> - <version>3.0.100-SNAPSHOT</version> + <version>3.0.200-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui.edit/src/org/eclipse/ecf/discovery/ui/model/IItemStatusLineProvider.java b/framework/bundles/org.eclipse.ecf.discovery.ui.edit/src/org/eclipse/ecf/discovery/ui/model/IItemStatusLineProvider.java index a737b0f71..40dbc6a62 100644 --- a/framework/bundles/org.eclipse.ecf.discovery.ui.edit/src/org/eclipse/ecf/discovery/ui/model/IItemStatusLineProvider.java +++ b/framework/bundles/org.eclipse.ecf.discovery.ui.edit/src/org/eclipse/ecf/discovery/ui/model/IItemStatusLineProvider.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2008 Versant Corp. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Versant Corp. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.discovery.ui.model; diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui.edit/src/org/eclipse/ecf/discovery/ui/model/ItemProviderWithStatusLineAdapter.java b/framework/bundles/org.eclipse.ecf.discovery.ui.edit/src/org/eclipse/ecf/discovery/ui/model/ItemProviderWithStatusLineAdapter.java index f3cedc305..90ec403db 100644 --- a/framework/bundles/org.eclipse.ecf.discovery.ui.edit/src/org/eclipse/ecf/discovery/ui/model/ItemProviderWithStatusLineAdapter.java +++ b/framework/bundles/org.eclipse.ecf.discovery.ui.edit/src/org/eclipse/ecf/discovery/ui/model/ItemProviderWithStatusLineAdapter.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2008 Versant Corp. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Versant Corp. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.discovery.ui.model; diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui.edit/src/org/eclipse/ecf/discovery/ui/model/provider/DiscoveryEditPlugin.java b/framework/bundles/org.eclipse.ecf.discovery.ui.edit/src/org/eclipse/ecf/discovery/ui/model/provider/DiscoveryEditPlugin.java index 8beb05b9c..67cdffe4c 100644 --- a/framework/bundles/org.eclipse.ecf.discovery.ui.edit/src/org/eclipse/ecf/discovery/ui/model/provider/DiscoveryEditPlugin.java +++ b/framework/bundles/org.eclipse.ecf.discovery.ui.edit/src/org/eclipse/ecf/discovery/ui/model/provider/DiscoveryEditPlugin.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2008 Versant Corp. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Versant Corp. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.discovery.ui.model.provider; diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui.edit/src/org/eclipse/ecf/discovery/ui/model/provider/DiscoveryEditingDomainProvider.java b/framework/bundles/org.eclipse.ecf.discovery.ui.edit/src/org/eclipse/ecf/discovery/ui/model/provider/DiscoveryEditingDomainProvider.java index 53548a5e2..fb48b063f 100644 --- a/framework/bundles/org.eclipse.ecf.discovery.ui.edit/src/org/eclipse/ecf/discovery/ui/model/provider/DiscoveryEditingDomainProvider.java +++ b/framework/bundles/org.eclipse.ecf.discovery.ui.edit/src/org/eclipse/ecf/discovery/ui/model/provider/DiscoveryEditingDomainProvider.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2008 Versant Corp. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Versant Corp. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.discovery.ui.model.provider; diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui.edit/src/org/eclipse/ecf/discovery/ui/model/provider/IHostItemProvider.java b/framework/bundles/org.eclipse.ecf.discovery.ui.edit/src/org/eclipse/ecf/discovery/ui/model/provider/IHostItemProvider.java index 20ef468d2..80163472c 100644 --- a/framework/bundles/org.eclipse.ecf.discovery.ui.edit/src/org/eclipse/ecf/discovery/ui/model/provider/IHostItemProvider.java +++ b/framework/bundles/org.eclipse.ecf.discovery.ui.edit/src/org/eclipse/ecf/discovery/ui/model/provider/IHostItemProvider.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2008 Versant Corp. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Versant Corp. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.discovery.ui.model.provider; diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui.edit/src/org/eclipse/ecf/discovery/ui/model/provider/INetworkItemProvider.java b/framework/bundles/org.eclipse.ecf.discovery.ui.edit/src/org/eclipse/ecf/discovery/ui/model/provider/INetworkItemProvider.java index 480c9ecc6..1ecc2ce40 100644 --- a/framework/bundles/org.eclipse.ecf.discovery.ui.edit/src/org/eclipse/ecf/discovery/ui/model/provider/INetworkItemProvider.java +++ b/framework/bundles/org.eclipse.ecf.discovery.ui.edit/src/org/eclipse/ecf/discovery/ui/model/provider/INetworkItemProvider.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2008 Versant Corp. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Versant Corp. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.discovery.ui.model.provider; diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui.edit/src/org/eclipse/ecf/discovery/ui/model/provider/IServiceIDItemProvider.java b/framework/bundles/org.eclipse.ecf.discovery.ui.edit/src/org/eclipse/ecf/discovery/ui/model/provider/IServiceIDItemProvider.java index 9f344b166..3447fca00 100644 --- a/framework/bundles/org.eclipse.ecf.discovery.ui.edit/src/org/eclipse/ecf/discovery/ui/model/provider/IServiceIDItemProvider.java +++ b/framework/bundles/org.eclipse.ecf.discovery.ui.edit/src/org/eclipse/ecf/discovery/ui/model/provider/IServiceIDItemProvider.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2008 Versant Corp. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Versant Corp. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.discovery.ui.model.provider; diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui.edit/src/org/eclipse/ecf/discovery/ui/model/provider/IServiceInfoItemProvider.java b/framework/bundles/org.eclipse.ecf.discovery.ui.edit/src/org/eclipse/ecf/discovery/ui/model/provider/IServiceInfoItemProvider.java index 29019de78..5e8192ed0 100644 --- a/framework/bundles/org.eclipse.ecf.discovery.ui.edit/src/org/eclipse/ecf/discovery/ui/model/provider/IServiceInfoItemProvider.java +++ b/framework/bundles/org.eclipse.ecf.discovery.ui.edit/src/org/eclipse/ecf/discovery/ui/model/provider/IServiceInfoItemProvider.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2008 Versant Corp. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Versant Corp. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.discovery.ui.model.provider; diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui.edit/src/org/eclipse/ecf/discovery/ui/model/provider/IServiceTypeIDItemProvider.java b/framework/bundles/org.eclipse.ecf.discovery.ui.edit/src/org/eclipse/ecf/discovery/ui/model/provider/IServiceTypeIDItemProvider.java index 9c2db64aa..39d25d167 100644 --- a/framework/bundles/org.eclipse.ecf.discovery.ui.edit/src/org/eclipse/ecf/discovery/ui/model/provider/IServiceTypeIDItemProvider.java +++ b/framework/bundles/org.eclipse.ecf.discovery.ui.edit/src/org/eclipse/ecf/discovery/ui/model/provider/IServiceTypeIDItemProvider.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2008 Versant Corp. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Versant Corp. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.discovery.ui.model.provider; diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui.edit/src/org/eclipse/ecf/discovery/ui/model/provider/ModelItemProviderAdapterFactory.java b/framework/bundles/org.eclipse.ecf.discovery.ui.edit/src/org/eclipse/ecf/discovery/ui/model/provider/ModelItemProviderAdapterFactory.java index 7435e5cc3..cb7458e60 100644 --- a/framework/bundles/org.eclipse.ecf.discovery.ui.edit/src/org/eclipse/ecf/discovery/ui/model/provider/ModelItemProviderAdapterFactory.java +++ b/framework/bundles/org.eclipse.ecf.discovery.ui.edit/src/org/eclipse/ecf/discovery/ui/model/provider/ModelItemProviderAdapterFactory.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2008 Versant Corp. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Versant Corp. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.discovery.ui.model.provider; diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui.model/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.discovery.ui.model/META-INF/MANIFEST.MF index bba20f48f..96f663abd 100644 --- a/framework/bundles/org.eclipse.ecf.discovery.ui.model/META-INF/MANIFEST.MF +++ b/framework/bundles/org.eclipse.ecf.discovery.ui.model/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.ecf.discovery.ui.model;singleton:=true Automatic-Module-Name: org.eclipse.ecf.discovery.ui.model -Bundle-Version: 3.0.100.qualifier +Bundle-Version: 3.0.201.qualifier Bundle-ClassPath: . Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui.model/about.html b/framework/bundles/org.eclipse.ecf.discovery.ui.model/about.html index 6a60a262f..7e02a356d 100644 --- a/framework/bundles/org.eclipse.ecf.discovery.ui.model/about.html +++ b/framework/bundles/org.eclipse.ecf.discovery.ui.model/about.html @@ -22,7 +22,7 @@ being redistributed by another party ("Redistributor") and different t apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise indicated below, the terms and conditions of the EPL still apply to any source code in the Content -and such source code may be obtained at <a href="/">http://www.eclipse.org</a>.</p> +and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p> </body> </html>
\ No newline at end of file diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui.model/plugin.properties b/framework/bundles/org.eclipse.ecf.discovery.ui.model/plugin.properties index 77ff4f48d..363d7f79e 100644 --- a/framework/bundles/org.eclipse.ecf.discovery.ui.model/plugin.properties +++ b/framework/bundles/org.eclipse.ecf.discovery.ui.model/plugin.properties @@ -1,11 +1,12 @@ -/**************************************************************************** -* Copyright (c) 2008 Versant Corp. and others. -* 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 -* -*****************************************************************************/ +############################################################################ +# Copyright (c) 2008 Versant Corp. and others. +# +# This program and the accompanying materials are made +# available under the terms of the Eclipse Public License 2.0 +# which is available at https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 +############################################################################ pluginName=ECF Discovery UI Model providerName=Eclipse.org - ECF diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui.model/pom.xml b/framework/bundles/org.eclipse.ecf.discovery.ui.model/pom.xml index 0110567e7..1323b8b32 100644 --- a/framework/bundles/org.eclipse.ecf.discovery.ui.model/pom.xml +++ b/framework/bundles/org.eclipse.ecf.discovery.ui.model/pom.xml @@ -10,6 +10,6 @@ </parent> <groupId>org.eclipse.ecf</groupId> <artifactId>org.eclipse.ecf.discovery.ui.model</artifactId> - <version>3.0.100-SNAPSHOT</version> + <version>3.0.201-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui.model/src/org/eclipse/ecf/discovery/ui/model/IHost.java b/framework/bundles/org.eclipse.ecf.discovery.ui.model/src/org/eclipse/ecf/discovery/ui/model/IHost.java index 8dc9cc323..0f83177af 100644 --- a/framework/bundles/org.eclipse.ecf.discovery.ui.model/src/org/eclipse/ecf/discovery/ui/model/IHost.java +++ b/framework/bundles/org.eclipse.ecf.discovery.ui.model/src/org/eclipse/ecf/discovery/ui/model/IHost.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2008 Versant Corp. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Versant Corp. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.discovery.ui.model; diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui.model/src/org/eclipse/ecf/discovery/ui/model/INetwork.java b/framework/bundles/org.eclipse.ecf.discovery.ui.model/src/org/eclipse/ecf/discovery/ui/model/INetwork.java index 0673d2f8d..06d81756e 100644 --- a/framework/bundles/org.eclipse.ecf.discovery.ui.model/src/org/eclipse/ecf/discovery/ui/model/INetwork.java +++ b/framework/bundles/org.eclipse.ecf.discovery.ui.model/src/org/eclipse/ecf/discovery/ui/model/INetwork.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2008 Versant Corp. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Versant Corp. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.discovery.ui.model; diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui.model/src/org/eclipse/ecf/discovery/ui/model/IServiceID.java b/framework/bundles/org.eclipse.ecf.discovery.ui.model/src/org/eclipse/ecf/discovery/ui/model/IServiceID.java index 9c46d1a4e..1735a9f11 100644 --- a/framework/bundles/org.eclipse.ecf.discovery.ui.model/src/org/eclipse/ecf/discovery/ui/model/IServiceID.java +++ b/framework/bundles/org.eclipse.ecf.discovery.ui.model/src/org/eclipse/ecf/discovery/ui/model/IServiceID.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2008 Versant Corp. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Versant Corp. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.discovery.ui.model; diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui.model/src/org/eclipse/ecf/discovery/ui/model/IServiceInfo.java b/framework/bundles/org.eclipse.ecf.discovery.ui.model/src/org/eclipse/ecf/discovery/ui/model/IServiceInfo.java index 8aa93b4b6..5fb05da82 100644 --- a/framework/bundles/org.eclipse.ecf.discovery.ui.model/src/org/eclipse/ecf/discovery/ui/model/IServiceInfo.java +++ b/framework/bundles/org.eclipse.ecf.discovery.ui.model/src/org/eclipse/ecf/discovery/ui/model/IServiceInfo.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2008 Versant Corp. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Versant Corp. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.discovery.ui.model; diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui.model/src/org/eclipse/ecf/discovery/ui/model/IServiceTypeID.java b/framework/bundles/org.eclipse.ecf.discovery.ui.model/src/org/eclipse/ecf/discovery/ui/model/IServiceTypeID.java index 683598d5e..5355f8020 100644 --- a/framework/bundles/org.eclipse.ecf.discovery.ui.model/src/org/eclipse/ecf/discovery/ui/model/IServiceTypeID.java +++ b/framework/bundles/org.eclipse.ecf.discovery.ui.model/src/org/eclipse/ecf/discovery/ui/model/IServiceTypeID.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2008 Versant Corp. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Versant Corp. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.discovery.ui.model; diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui.model/src/org/eclipse/ecf/discovery/ui/model/ModelFactory.java b/framework/bundles/org.eclipse.ecf.discovery.ui.model/src/org/eclipse/ecf/discovery/ui/model/ModelFactory.java index eeecd6e37..9071f8630 100644 --- a/framework/bundles/org.eclipse.ecf.discovery.ui.model/src/org/eclipse/ecf/discovery/ui/model/ModelFactory.java +++ b/framework/bundles/org.eclipse.ecf.discovery.ui.model/src/org/eclipse/ecf/discovery/ui/model/ModelFactory.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2008 Versant Corp. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Versant Corp. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.discovery.ui.model; diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui.model/src/org/eclipse/ecf/discovery/ui/model/ModelPackage.java b/framework/bundles/org.eclipse.ecf.discovery.ui.model/src/org/eclipse/ecf/discovery/ui/model/ModelPackage.java index 73da7aaaa..c130951fb 100644 --- a/framework/bundles/org.eclipse.ecf.discovery.ui.model/src/org/eclipse/ecf/discovery/ui/model/ModelPackage.java +++ b/framework/bundles/org.eclipse.ecf.discovery.ui.model/src/org/eclipse/ecf/discovery/ui/model/ModelPackage.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2008 Versant Corp. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Versant Corp. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.discovery.ui.model; diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui.model/src/org/eclipse/ecf/discovery/ui/model/ModelPlugin.java b/framework/bundles/org.eclipse.ecf.discovery.ui.model/src/org/eclipse/ecf/discovery/ui/model/ModelPlugin.java index bf1de4e4b..ab0ce0db2 100644 --- a/framework/bundles/org.eclipse.ecf.discovery.ui.model/src/org/eclipse/ecf/discovery/ui/model/ModelPlugin.java +++ b/framework/bundles/org.eclipse.ecf.discovery.ui.model/src/org/eclipse/ecf/discovery/ui/model/ModelPlugin.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2008 Versant Corp. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Versant Corp. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.discovery.ui.model; diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui.model/src/org/eclipse/ecf/discovery/ui/model/impl/IHostImpl.java b/framework/bundles/org.eclipse.ecf.discovery.ui.model/src/org/eclipse/ecf/discovery/ui/model/impl/IHostImpl.java index 1f0dd6630..3db36a4de 100644 --- a/framework/bundles/org.eclipse.ecf.discovery.ui.model/src/org/eclipse/ecf/discovery/ui/model/impl/IHostImpl.java +++ b/framework/bundles/org.eclipse.ecf.discovery.ui.model/src/org/eclipse/ecf/discovery/ui/model/impl/IHostImpl.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2008 Versant Corp. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Versant Corp. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.discovery.ui.model.impl; diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui.model/src/org/eclipse/ecf/discovery/ui/model/impl/INetworkImpl.java b/framework/bundles/org.eclipse.ecf.discovery.ui.model/src/org/eclipse/ecf/discovery/ui/model/impl/INetworkImpl.java index 2b3b94da3..3982055d1 100644 --- a/framework/bundles/org.eclipse.ecf.discovery.ui.model/src/org/eclipse/ecf/discovery/ui/model/impl/INetworkImpl.java +++ b/framework/bundles/org.eclipse.ecf.discovery.ui.model/src/org/eclipse/ecf/discovery/ui/model/impl/INetworkImpl.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2008 Versant Corp. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Versant Corp. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.discovery.ui.model.impl; diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui.model/src/org/eclipse/ecf/discovery/ui/model/impl/IServiceIDImpl.java b/framework/bundles/org.eclipse.ecf.discovery.ui.model/src/org/eclipse/ecf/discovery/ui/model/impl/IServiceIDImpl.java index 5a668ad94..d242d3ea6 100644 --- a/framework/bundles/org.eclipse.ecf.discovery.ui.model/src/org/eclipse/ecf/discovery/ui/model/impl/IServiceIDImpl.java +++ b/framework/bundles/org.eclipse.ecf.discovery.ui.model/src/org/eclipse/ecf/discovery/ui/model/impl/IServiceIDImpl.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2008 Versant Corp. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Versant Corp. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.discovery.ui.model.impl; diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui.model/src/org/eclipse/ecf/discovery/ui/model/impl/IServiceInfoImpl.java b/framework/bundles/org.eclipse.ecf.discovery.ui.model/src/org/eclipse/ecf/discovery/ui/model/impl/IServiceInfoImpl.java index 509ae1e83..a88106108 100644 --- a/framework/bundles/org.eclipse.ecf.discovery.ui.model/src/org/eclipse/ecf/discovery/ui/model/impl/IServiceInfoImpl.java +++ b/framework/bundles/org.eclipse.ecf.discovery.ui.model/src/org/eclipse/ecf/discovery/ui/model/impl/IServiceInfoImpl.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2008 Versant Corp. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Versant Corp. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.discovery.ui.model.impl; @@ -328,9 +330,9 @@ public class IServiceInfoImpl extends EObjectImpl implements IServiceInfo { case ModelPackage.ISERVICE_INFO__ECF_LOCATION: return getEcfLocation(); case ModelPackage.ISERVICE_INFO__ECF_PRIORITY: - return new Integer(getEcfPriority()); + return Integer.valueOf(getEcfPriority()); case ModelPackage.ISERVICE_INFO__ECF_WEIGHT: - return new Integer(getEcfWeight()); + return Integer.valueOf(getEcfWeight()); case ModelPackage.ISERVICE_INFO__SERVICE_ID: if (resolve) return getServiceID(); return basicGetServiceID(); diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui.model/src/org/eclipse/ecf/discovery/ui/model/impl/IServiceTypeIDImpl.java b/framework/bundles/org.eclipse.ecf.discovery.ui.model/src/org/eclipse/ecf/discovery/ui/model/impl/IServiceTypeIDImpl.java index fd134d992..0184d9253 100644 --- a/framework/bundles/org.eclipse.ecf.discovery.ui.model/src/org/eclipse/ecf/discovery/ui/model/impl/IServiceTypeIDImpl.java +++ b/framework/bundles/org.eclipse.ecf.discovery.ui.model/src/org/eclipse/ecf/discovery/ui/model/impl/IServiceTypeIDImpl.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2008 Versant Corp. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Versant Corp. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.discovery.ui.model.impl; diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui.model/src/org/eclipse/ecf/discovery/ui/model/impl/ModelFactoryImpl.java b/framework/bundles/org.eclipse.ecf.discovery.ui.model/src/org/eclipse/ecf/discovery/ui/model/impl/ModelFactoryImpl.java index 46b6df065..40b4036ef 100644 --- a/framework/bundles/org.eclipse.ecf.discovery.ui.model/src/org/eclipse/ecf/discovery/ui/model/impl/ModelFactoryImpl.java +++ b/framework/bundles/org.eclipse.ecf.discovery.ui.model/src/org/eclipse/ecf/discovery/ui/model/impl/ModelFactoryImpl.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2008 Versant Corp. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Versant Corp. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.discovery.ui.model.impl; diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui.model/src/org/eclipse/ecf/discovery/ui/model/impl/ModelPackageImpl.java b/framework/bundles/org.eclipse.ecf.discovery.ui.model/src/org/eclipse/ecf/discovery/ui/model/impl/ModelPackageImpl.java index 2b5e2c473..6c4034576 100644 --- a/framework/bundles/org.eclipse.ecf.discovery.ui.model/src/org/eclipse/ecf/discovery/ui/model/impl/ModelPackageImpl.java +++ b/framework/bundles/org.eclipse.ecf.discovery.ui.model/src/org/eclipse/ecf/discovery/ui/model/impl/ModelPackageImpl.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2008 Versant Corp. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Versant Corp. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.discovery.ui.model.impl; diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui.model/src/org/eclipse/ecf/discovery/ui/model/resource/Messages.java b/framework/bundles/org.eclipse.ecf.discovery.ui.model/src/org/eclipse/ecf/discovery/ui/model/resource/Messages.java index ac49612c5..485d1b4db 100644 --- a/framework/bundles/org.eclipse.ecf.discovery.ui.model/src/org/eclipse/ecf/discovery/ui/model/resource/Messages.java +++ b/framework/bundles/org.eclipse.ecf.discovery.ui.model/src/org/eclipse/ecf/discovery/ui/model/resource/Messages.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2008 Versant Corp. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Versant Corp. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.discovery.ui.model.resource; diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui.model/src/org/eclipse/ecf/discovery/ui/model/resource/ServiceResource.java b/framework/bundles/org.eclipse.ecf.discovery.ui.model/src/org/eclipse/ecf/discovery/ui/model/resource/ServiceResource.java index fe31f73fc..631f20487 100644 --- a/framework/bundles/org.eclipse.ecf.discovery.ui.model/src/org/eclipse/ecf/discovery/ui/model/resource/ServiceResource.java +++ b/framework/bundles/org.eclipse.ecf.discovery.ui.model/src/org/eclipse/ecf/discovery/ui/model/resource/ServiceResource.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2008 Versant Corp. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Versant Corp. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.discovery.ui.model.resource; diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui.model/src/org/eclipse/ecf/discovery/ui/model/resource/ServiceResourceFactory.java b/framework/bundles/org.eclipse.ecf.discovery.ui.model/src/org/eclipse/ecf/discovery/ui/model/resource/ServiceResourceFactory.java index d6d01df5a..1fc1ec847 100644 --- a/framework/bundles/org.eclipse.ecf.discovery.ui.model/src/org/eclipse/ecf/discovery/ui/model/resource/ServiceResourceFactory.java +++ b/framework/bundles/org.eclipse.ecf.discovery.ui.model/src/org/eclipse/ecf/discovery/ui/model/resource/ServiceResourceFactory.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2008 Versant Corp. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Versant Corp. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.discovery.ui.model.resource; diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui.model/src/org/eclipse/ecf/discovery/ui/model/util/ModelAdapterFactory.java b/framework/bundles/org.eclipse.ecf.discovery.ui.model/src/org/eclipse/ecf/discovery/ui/model/util/ModelAdapterFactory.java index bf7e40d89..2618a17af 100644 --- a/framework/bundles/org.eclipse.ecf.discovery.ui.model/src/org/eclipse/ecf/discovery/ui/model/util/ModelAdapterFactory.java +++ b/framework/bundles/org.eclipse.ecf.discovery.ui.model/src/org/eclipse/ecf/discovery/ui/model/util/ModelAdapterFactory.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2008 Versant Corp. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Versant Corp. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.discovery.ui.model.util; diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui.model/src/org/eclipse/ecf/discovery/ui/model/util/ModelSwitch.java b/framework/bundles/org.eclipse.ecf.discovery.ui.model/src/org/eclipse/ecf/discovery/ui/model/util/ModelSwitch.java index 69fb43a56..c621b3d18 100644 --- a/framework/bundles/org.eclipse.ecf.discovery.ui.model/src/org/eclipse/ecf/discovery/ui/model/util/ModelSwitch.java +++ b/framework/bundles/org.eclipse.ecf.discovery.ui.model/src/org/eclipse/ecf/discovery/ui/model/util/ModelSwitch.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2008 Versant Corp. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Versant Corp. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.discovery.ui.model.util; diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui.properties.tabbed/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.discovery.ui.properties.tabbed/META-INF/MANIFEST.MF index 95ec4c5bb..fd6b480b6 100644 --- a/framework/bundles/org.eclipse.ecf.discovery.ui.properties.tabbed/META-INF/MANIFEST.MF +++ b/framework/bundles/org.eclipse.ecf.discovery.ui.properties.tabbed/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.ecf.discovery.ui.properties.tabbed;singleton:=true Automatic-Module-Name: org.eclipse.ecf.discovery.ui.properties.tabbed -Bundle-Version: 3.0.100.qualifier +Bundle-Version: 3.0.200.qualifier Bundle-Vendor: %providerName Fragment-Host: org.eclipse.ecf.discovery.ui;bundle-version="[3.0.0,4.0.0)" Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1, diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui.properties.tabbed/about.html b/framework/bundles/org.eclipse.ecf.discovery.ui.properties.tabbed/about.html index 4c79781a5..9f1dc0dd5 100644 --- a/framework/bundles/org.eclipse.ecf.discovery.ui.properties.tabbed/about.html +++ b/framework/bundles/org.eclipse.ecf.discovery.ui.properties.tabbed/about.html @@ -22,7 +22,7 @@ being redistributed by another party ("Redistributor") and different t apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise indicated below, the terms and conditions of the EPL still apply to any source code in the Content -and such source code may be obtained at <a href="/">http://www.eclipse.org</a>.</p> +and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p> </body> </html>
\ No newline at end of file diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui.properties.tabbed/plugin.properties b/framework/bundles/org.eclipse.ecf.discovery.ui.properties.tabbed/plugin.properties index 5bd91a390..0ab18259a 100644 --- a/framework/bundles/org.eclipse.ecf.discovery.ui.properties.tabbed/plugin.properties +++ b/framework/bundles/org.eclipse.ecf.discovery.ui.properties.tabbed/plugin.properties @@ -1,11 +1,12 @@ -/**************************************************************************** -* Copyright (c) 2009 Versant Corp. and others. -* 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 -* -*****************************************************************************/ +############################################################################ +# Copyright (c) 2009 Versant Corp. and others. +# +# This program and the accompanying materials are made +# available under the terms of the Eclipse Public License 2.0 +# which is available at https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 +############################################################################ pluginName=ECF Discovery UI Tabbed Properties Fragment providerName=Eclipse.org - ECF diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui.properties.tabbed/pom.xml b/framework/bundles/org.eclipse.ecf.discovery.ui.properties.tabbed/pom.xml index de12d5613..3f034115e 100644 --- a/framework/bundles/org.eclipse.ecf.discovery.ui.properties.tabbed/pom.xml +++ b/framework/bundles/org.eclipse.ecf.discovery.ui.properties.tabbed/pom.xml @@ -10,6 +10,6 @@ </parent> <groupId>org.eclipse.ecf</groupId> <artifactId>org.eclipse.ecf.discovery.ui.properties.tabbed</artifactId> - <version>3.0.100-SNAPSHOT</version> + <version>3.0.200-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui.properties.tabbed/src/org/eclipse/ecf/internal/discovery/ui/ServicePropertiesLabelProvider.java b/framework/bundles/org.eclipse.ecf.discovery.ui.properties.tabbed/src/org/eclipse/ecf/internal/discovery/ui/ServicePropertiesLabelProvider.java index 77facaeee..a8ee17f8f 100644 --- a/framework/bundles/org.eclipse.ecf.discovery.ui.properties.tabbed/src/org/eclipse/ecf/internal/discovery/ui/ServicePropertiesLabelProvider.java +++ b/framework/bundles/org.eclipse.ecf.discovery.ui.properties.tabbed/src/org/eclipse/ecf/internal/discovery/ui/ServicePropertiesLabelProvider.java @@ -1,13 +1,15 @@ /**************************************************************************** * Copyright (c) 2008 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation * Markus Alexander Kuppe - https://bugs.eclipse.org/256603 + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.internal.discovery.ui; diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui.properties.tabbed/src/org/eclipse/ecf/internal/discovery/ui/ServicePropertiesPropertySection.java b/framework/bundles/org.eclipse.ecf.discovery.ui.properties.tabbed/src/org/eclipse/ecf/internal/discovery/ui/ServicePropertiesPropertySection.java index 0f7812620..6a08b7971 100644 --- a/framework/bundles/org.eclipse.ecf.discovery.ui.properties.tabbed/src/org/eclipse/ecf/internal/discovery/ui/ServicePropertiesPropertySection.java +++ b/framework/bundles/org.eclipse.ecf.discovery.ui.properties.tabbed/src/org/eclipse/ecf/internal/discovery/ui/ServicePropertiesPropertySection.java @@ -1,13 +1,15 @@ /**************************************************************************** * Copyright (c) 2008 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation * Markus Alexander Kuppe - https://bugs.eclipse.org/256603 + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.internal.discovery.ui; diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui.properties.tabbed/src/org/eclipse/ecf/internal/discovery/ui/ServicePropertiesPropertySource.java b/framework/bundles/org.eclipse.ecf.discovery.ui.properties.tabbed/src/org/eclipse/ecf/internal/discovery/ui/ServicePropertiesPropertySource.java index 3db8355d6..2944a848d 100644 --- a/framework/bundles/org.eclipse.ecf.discovery.ui.properties.tabbed/src/org/eclipse/ecf/internal/discovery/ui/ServicePropertiesPropertySource.java +++ b/framework/bundles/org.eclipse.ecf.discovery.ui.properties.tabbed/src/org/eclipse/ecf/internal/discovery/ui/ServicePropertiesPropertySource.java @@ -1,13 +1,15 @@ /**************************************************************************** * Copyright (c) 2008 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation * Markus Alexander Kuppe - https://bugs.eclipse.org/256603 + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.internal.discovery.ui; diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui.properties.tabbed/src/org/eclipse/ecf/internal/discovery/ui/ServicePropertySection.java b/framework/bundles/org.eclipse.ecf.discovery.ui.properties.tabbed/src/org/eclipse/ecf/internal/discovery/ui/ServicePropertySection.java index 1ba5f4672..084599b19 100644 --- a/framework/bundles/org.eclipse.ecf.discovery.ui.properties.tabbed/src/org/eclipse/ecf/internal/discovery/ui/ServicePropertySection.java +++ b/framework/bundles/org.eclipse.ecf.discovery.ui.properties.tabbed/src/org/eclipse/ecf/internal/discovery/ui/ServicePropertySection.java @@ -1,13 +1,15 @@ /**************************************************************************** * Copyright (c) 2008 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation * Markus Alexander Kuppe - https://bugs.eclipse.org/256603 + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.internal.discovery.ui; diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui.properties.tabbed/src/org/eclipse/ecf/internal/discovery/ui/ServiceTypePropertySection.java b/framework/bundles/org.eclipse.ecf.discovery.ui.properties.tabbed/src/org/eclipse/ecf/internal/discovery/ui/ServiceTypePropertySection.java index 88a9eb15d..438ace795 100644 --- a/framework/bundles/org.eclipse.ecf.discovery.ui.properties.tabbed/src/org/eclipse/ecf/internal/discovery/ui/ServiceTypePropertySection.java +++ b/framework/bundles/org.eclipse.ecf.discovery.ui.properties.tabbed/src/org/eclipse/ecf/internal/discovery/ui/ServiceTypePropertySection.java @@ -1,13 +1,15 @@ /**************************************************************************** * Copyright (c) 2008 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation * Markus Alexander Kuppe - https://bugs.eclipse.org/256603 + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.internal.discovery.ui; diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui.properties.tabbed/src/org/eclipse/ecf/internal/discovery/ui/TabbedPropertyAdapterFactory.java b/framework/bundles/org.eclipse.ecf.discovery.ui.properties.tabbed/src/org/eclipse/ecf/internal/discovery/ui/TabbedPropertyAdapterFactory.java index c1064fa7f..d98747a86 100644 --- a/framework/bundles/org.eclipse.ecf.discovery.ui.properties.tabbed/src/org/eclipse/ecf/internal/discovery/ui/TabbedPropertyAdapterFactory.java +++ b/framework/bundles/org.eclipse.ecf.discovery.ui.properties.tabbed/src/org/eclipse/ecf/internal/discovery/ui/TabbedPropertyAdapterFactory.java @@ -1,13 +1,15 @@ -/******************************************************************************* +/**************************************************************************** * Copyright (c) 2008 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Markus Alexander Kuppe - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.internal.discovery.ui; diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui.properties/.settings/org.eclipse.jdt.core.prefs b/framework/bundles/org.eclipse.ecf.discovery.ui.properties/.settings/org.eclipse.jdt.core.prefs index 1d66e2dc8..1de82f34e 100644 --- a/framework/bundles/org.eclipse.ecf.discovery.ui.properties/.settings/org.eclipse.jdt.core.prefs +++ b/framework/bundles/org.eclipse.ecf.discovery.ui.properties/.settings/org.eclipse.jdt.core.prefs @@ -16,7 +16,7 @@ org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning org.eclipse.jdt.core.compiler.problem.autoboxing=ignore org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning org.eclipse.jdt.core.compiler.problem.deadCode=warning -org.eclipse.jdt.core.compiler.problem.deprecation=warning +org.eclipse.jdt.core.compiler.problem.deprecation=ignore org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled org.eclipse.jdt.core.compiler.problem.discouragedReference=warning diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui.properties/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.discovery.ui.properties/META-INF/MANIFEST.MF index a5730f2be..76184da7e 100644 --- a/framework/bundles/org.eclipse.ecf.discovery.ui.properties/META-INF/MANIFEST.MF +++ b/framework/bundles/org.eclipse.ecf.discovery.ui.properties/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.ecf.discovery.ui.properties;singleton:=true Automatic-Module-Name: org.eclipse.ecf.discovery.ui.properties -Bundle-Version: 3.0.100.qualifier +Bundle-Version: 3.0.200.qualifier Bundle-Vendor: %providerName Fragment-Host: org.eclipse.ecf.discovery.ui;bundle-version="[3.0.0,4.0.0)" Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1, diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui.properties/about.html b/framework/bundles/org.eclipse.ecf.discovery.ui.properties/about.html index 4c79781a5..9f1dc0dd5 100644 --- a/framework/bundles/org.eclipse.ecf.discovery.ui.properties/about.html +++ b/framework/bundles/org.eclipse.ecf.discovery.ui.properties/about.html @@ -22,7 +22,7 @@ being redistributed by another party ("Redistributor") and different t apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise indicated below, the terms and conditions of the EPL still apply to any source code in the Content -and such source code may be obtained at <a href="/">http://www.eclipse.org</a>.</p> +and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p> </body> </html>
\ No newline at end of file diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui.properties/plugin.properties b/framework/bundles/org.eclipse.ecf.discovery.ui.properties/plugin.properties index 194c1049e..302eab8d1 100644 --- a/framework/bundles/org.eclipse.ecf.discovery.ui.properties/plugin.properties +++ b/framework/bundles/org.eclipse.ecf.discovery.ui.properties/plugin.properties @@ -1,11 +1,12 @@ -/**************************************************************************** -* Copyright (c) 2009 Versant Corp. and others. -* 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 -* -*****************************************************************************/ +############################################################################ +# Copyright (c) 2009 Versant Corp. and others. +# +# This program and the accompanying materials are made +# available under the terms of the Eclipse Public License 2.0 +# which is available at https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 +############################################################################ pluginName=ECF Discovery UI Properties Fragment providerName=Eclipse.org - ECF diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui.properties/pom.xml b/framework/bundles/org.eclipse.ecf.discovery.ui.properties/pom.xml index 0d8e2a9ae..23c134499 100644 --- a/framework/bundles/org.eclipse.ecf.discovery.ui.properties/pom.xml +++ b/framework/bundles/org.eclipse.ecf.discovery.ui.properties/pom.xml @@ -10,6 +10,6 @@ </parent> <groupId>org.eclipse.ecf</groupId> <artifactId>org.eclipse.ecf.discovery.ui.properties</artifactId> - <version>3.0.100-SNAPSHOT</version> + <version>3.0.200-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui.properties/src/org/eclipse/ecf/internal/discovery/ui/EObjectPropertySourceFactory.java b/framework/bundles/org.eclipse.ecf.discovery.ui.properties/src/org/eclipse/ecf/internal/discovery/ui/EObjectPropertySourceFactory.java index 02a1dff4a..f3bc30a8c 100644 --- a/framework/bundles/org.eclipse.ecf.discovery.ui.properties/src/org/eclipse/ecf/internal/discovery/ui/EObjectPropertySourceFactory.java +++ b/framework/bundles/org.eclipse.ecf.discovery.ui.properties/src/org/eclipse/ecf/internal/discovery/ui/EObjectPropertySourceFactory.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2008 Versant Corp. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Markus Alexander Kuppe - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.internal.discovery.ui; diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui.userinput/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.discovery.ui.userinput/META-INF/MANIFEST.MF index 703c8e9d1..1f7e1f8aa 100644 --- a/framework/bundles/org.eclipse.ecf.discovery.ui.userinput/META-INF/MANIFEST.MF +++ b/framework/bundles/org.eclipse.ecf.discovery.ui.userinput/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin.name Bundle-SymbolicName: org.eclipse.ecf.discovery.ui.userinput;singleton:=true Automatic-Module-Name: org.eclipse.ecf.discovery.ui.userinput -Bundle-Version: 1.0.100.qualifier +Bundle-Version: 1.0.200.qualifier Bundle-Activator: org.eclipse.ecf.discovery.ui.userinput.Activator Bundle-Vendor: %plugin.provider Bundle-RequiredExecutionEnvironment: J2SE-1.4 diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui.userinput/about.html b/framework/bundles/org.eclipse.ecf.discovery.ui.userinput/about.html index 223549920..fcd9ed672 100644 --- a/framework/bundles/org.eclipse.ecf.discovery.ui.userinput/about.html +++ b/framework/bundles/org.eclipse.ecf.discovery.ui.userinput/about.html @@ -22,6 +22,6 @@ being redistributed by another party ("Redistributor") and different t apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise indicated below, the terms and conditions of the EPL still apply to any source code in the Content -and such source code may be obtained at <a href="/">http://www.eclipse.org</a>.</p> +and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p> </body> </html> diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui.userinput/plugin.properties b/framework/bundles/org.eclipse.ecf.discovery.ui.userinput/plugin.properties index 80611e189..1a5b6bea9 100644 --- a/framework/bundles/org.eclipse.ecf.discovery.ui.userinput/plugin.properties +++ b/framework/bundles/org.eclipse.ecf.discovery.ui.userinput/plugin.properties @@ -1,10 +1,11 @@ ############################################################################ # Copyright (c) 2009 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 # +# This program and the accompanying materials are made +# available under the terms of the Eclipse Public License 2.0 +# which is available at https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 ############################################################################ plugin.name=ECF Discovery UI UserInput plugin.provider=Eclipse.org - ECF diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui.userinput/plugin.xml b/framework/bundles/org.eclipse.ecf.discovery.ui.userinput/plugin.xml index 72657b5a5..095abfc54 100644 --- a/framework/bundles/org.eclipse.ecf.discovery.ui.userinput/plugin.xml +++ b/framework/bundles/org.eclipse.ecf.discovery.ui.userinput/plugin.xml @@ -29,26 +29,6 @@ sequence="M1+L"> </key> </extension> - <extension - point="org.eclipse.ui.menus"> - <menuContribution - locationURI="menu:org.eclipse.ecf.discovery.ui.DiscoveryView?after=additions"> - <command - commandId="org.eclipse.ecf.discovery.ui.userinput.commands.manualLookupCommand" - id="org.eclipse.ecf.discovery.ui.userinput.menus.manualLookupCommand" - mnemonic="S"> - </command> - </menuContribution> - <menuContribution - locationURI="toolbar:org.eclipse.ecf.discovery.ui.DiscoveryView?after=additions"> - <command - commandId="org.eclipse.ecf.discovery.ui.userinput.commands.manualLookupCommand" - icon="icons/manual.png" - id="org.eclipse.ecf.discovery.ui.userinput.toolbars.manualLookupCommand" - tooltip="%lookup.tooltip"> - </command> - </menuContribution> - </extension> <extension point="org.eclipse.ecf.containerFactory"> <containerFactory diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui.userinput/pom.xml b/framework/bundles/org.eclipse.ecf.discovery.ui.userinput/pom.xml index 0e04513ee..8cff640ae 100644 --- a/framework/bundles/org.eclipse.ecf.discovery.ui.userinput/pom.xml +++ b/framework/bundles/org.eclipse.ecf.discovery.ui.userinput/pom.xml @@ -10,6 +10,6 @@ </parent> <groupId>org.eclipse.ecf</groupId> <artifactId>org.eclipse.ecf.discovery.ui.userinput</artifactId> - <version>1.0.100-SNAPSHOT</version> + <version>1.0.200-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui.userinput/src/org/eclipse/ecf/discovery/ui/userinput/Activator.java b/framework/bundles/org.eclipse.ecf.discovery.ui.userinput/src/org/eclipse/ecf/discovery/ui/userinput/Activator.java index 08ee42834..22a32b8b3 100644 --- a/framework/bundles/org.eclipse.ecf.discovery.ui.userinput/src/org/eclipse/ecf/discovery/ui/userinput/Activator.java +++ b/framework/bundles/org.eclipse.ecf.discovery.ui.userinput/src/org/eclipse/ecf/discovery/ui/userinput/Activator.java @@ -1,13 +1,15 @@ -/******************************************************************************* +/**************************************************************************** * Copyright (c) 2009 Versant Corp and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Markus Alexander Kuppe (ecf-dev_eclipse.org <at> lemmster <dot> de) - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.discovery.ui.userinput; import org.eclipse.ui.plugin.AbstractUIPlugin; diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui.userinput/src/org/eclipse/ecf/discovery/ui/userinput/Messages.java b/framework/bundles/org.eclipse.ecf.discovery.ui.userinput/src/org/eclipse/ecf/discovery/ui/userinput/Messages.java index ce96190da..c26c5fc3e 100644 --- a/framework/bundles/org.eclipse.ecf.discovery.ui.userinput/src/org/eclipse/ecf/discovery/ui/userinput/Messages.java +++ b/framework/bundles/org.eclipse.ecf.discovery.ui.userinput/src/org/eclipse/ecf/discovery/ui/userinput/Messages.java @@ -1,13 +1,15 @@ -/******************************************************************************* +/**************************************************************************** * Copyright (c) 2009 Versant Corp and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Markus Alexander Kuppe (ecf-dev_eclipse.org <at> lemmster <dot> de) - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.discovery.ui.userinput; import org.eclipse.osgi.util.NLS; diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui.userinput/src/org/eclipse/ecf/discovery/ui/userinput/UserInputDiscoveryContainerInstantiator.java b/framework/bundles/org.eclipse.ecf.discovery.ui.userinput/src/org/eclipse/ecf/discovery/ui/userinput/UserInputDiscoveryContainerInstantiator.java index 97ebce3f7..7d4cc0b76 100644 --- a/framework/bundles/org.eclipse.ecf.discovery.ui.userinput/src/org/eclipse/ecf/discovery/ui/userinput/UserInputDiscoveryContainerInstantiator.java +++ b/framework/bundles/org.eclipse.ecf.discovery.ui.userinput/src/org/eclipse/ecf/discovery/ui/userinput/UserInputDiscoveryContainerInstantiator.java @@ -1,13 +1,15 @@ -/******************************************************************************* +/**************************************************************************** * Copyright (c) 2009 Versant Corp and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Markus Alexander Kuppe (ecf-dev_eclipse.org <at> lemmster <dot> de) - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.discovery.ui.userinput; import org.eclipse.ecf.core.ContainerCreateException; diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui.userinput/src/org/eclipse/ecf/discovery/ui/userinput/UserInputDiscoveryLocator.java b/framework/bundles/org.eclipse.ecf.discovery.ui.userinput/src/org/eclipse/ecf/discovery/ui/userinput/UserInputDiscoveryLocator.java index 4a0e74f5c..6d209e6ea 100644 --- a/framework/bundles/org.eclipse.ecf.discovery.ui.userinput/src/org/eclipse/ecf/discovery/ui/userinput/UserInputDiscoveryLocator.java +++ b/framework/bundles/org.eclipse.ecf.discovery.ui.userinput/src/org/eclipse/ecf/discovery/ui/userinput/UserInputDiscoveryLocator.java @@ -1,13 +1,15 @@ -/******************************************************************************* +/**************************************************************************** * Copyright (c) 2009 Versant Corp and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Markus Alexander Kuppe (ecf-dev_eclipse.org <at> lemmster <dot> de) - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.discovery.ui.userinput; import java.net.URI; diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui.userinput/src/org/eclipse/ecf/discovery/ui/userinput/UserInputNamespace.java b/framework/bundles/org.eclipse.ecf.discovery.ui.userinput/src/org/eclipse/ecf/discovery/ui/userinput/UserInputNamespace.java index d6cd27318..14ebd96d2 100644 --- a/framework/bundles/org.eclipse.ecf.discovery.ui.userinput/src/org/eclipse/ecf/discovery/ui/userinput/UserInputNamespace.java +++ b/framework/bundles/org.eclipse.ecf.discovery.ui.userinput/src/org/eclipse/ecf/discovery/ui/userinput/UserInputNamespace.java @@ -1,13 +1,15 @@ -/******************************************************************************* +/**************************************************************************** * Copyright (c) 2009 Versant Corp and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Markus Alexander Kuppe (ecf-dev_eclipse.org <at> lemmster <dot> de) - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.discovery.ui.userinput; import org.eclipse.ecf.core.identity.ID; diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui.userinput/src/org/eclipse/ecf/discovery/ui/userinput/handler/InputDialogWithComboHistory.java b/framework/bundles/org.eclipse.ecf.discovery.ui.userinput/src/org/eclipse/ecf/discovery/ui/userinput/handler/InputDialogWithComboHistory.java index 7fc4e701d..5195454e4 100644 --- a/framework/bundles/org.eclipse.ecf.discovery.ui.userinput/src/org/eclipse/ecf/discovery/ui/userinput/handler/InputDialogWithComboHistory.java +++ b/framework/bundles/org.eclipse.ecf.discovery.ui.userinput/src/org/eclipse/ecf/discovery/ui/userinput/handler/InputDialogWithComboHistory.java @@ -1,15 +1,17 @@ -/******************************************************************************* +/**************************************************************************** * Copyright (c) 2000, 2008 IBM Corporation and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * IBM Corporation - initial API and implementation * Versant Corp - Additions * Markus Alexander Kuppe (ecf-dev_eclipse.org <at> lemmster <dot> de) - Additions - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.discovery.ui.userinput.handler; import org.eclipse.jface.dialogs.Dialog; diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui.userinput/src/org/eclipse/ecf/discovery/ui/userinput/handler/LookupHandler.java b/framework/bundles/org.eclipse.ecf.discovery.ui.userinput/src/org/eclipse/ecf/discovery/ui/userinput/handler/LookupHandler.java index 7c2be583d..f2571f66e 100644 --- a/framework/bundles/org.eclipse.ecf.discovery.ui.userinput/src/org/eclipse/ecf/discovery/ui/userinput/handler/LookupHandler.java +++ b/framework/bundles/org.eclipse.ecf.discovery.ui.userinput/src/org/eclipse/ecf/discovery/ui/userinput/handler/LookupHandler.java @@ -1,13 +1,15 @@ -/******************************************************************************* +/**************************************************************************** * Copyright (c) 2009 Versant Corp and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Markus Alexander Kuppe (ecf-dev_eclipse.org <at> lemmster <dot> de) - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.discovery.ui.userinput.handler; import java.net.InetAddress; diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui/.settings/org.eclipse.jdt.core.prefs b/framework/bundles/org.eclipse.ecf.discovery.ui/.settings/org.eclipse.jdt.core.prefs index 92be65e4a..c4f8bd5a3 100644 --- a/framework/bundles/org.eclipse.ecf.discovery.ui/.settings/org.eclipse.jdt.core.prefs +++ b/framework/bundles/org.eclipse.ecf.discovery.ui/.settings/org.eclipse.jdt.core.prefs @@ -20,7 +20,7 @@ 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.deprecation=ignore org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled org.eclipse.jdt.core.compiler.problem.discouragedReference=error diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.discovery.ui/META-INF/MANIFEST.MF index e35d6709b..d6ae5c263 100644 --- a/framework/bundles/org.eclipse.ecf.discovery.ui/META-INF/MANIFEST.MF +++ b/framework/bundles/org.eclipse.ecf.discovery.ui/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.ecf.discovery.ui;singleton:=true Automatic-Module-Name: org.eclipse.ecf.discovery.ui -Bundle-Version: 3.0.200.qualifier +Bundle-Version: 3.0.300.qualifier Bundle-ClassPath: . Bundle-Activator: org.eclipse.ecf.internal.discovery.ui.DiscoveryUIPlugin$Implementation Bundle-Vendor: %providerName diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui/about.html b/framework/bundles/org.eclipse.ecf.discovery.ui/about.html index 6a60a262f..7e02a356d 100644 --- a/framework/bundles/org.eclipse.ecf.discovery.ui/about.html +++ b/framework/bundles/org.eclipse.ecf.discovery.ui/about.html @@ -22,7 +22,7 @@ being redistributed by another party ("Redistributor") and different t apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise indicated below, the terms and conditions of the EPL still apply to any source code in the Content -and such source code may be obtained at <a href="/">http://www.eclipse.org</a>.</p> +and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p> </body> </html>
\ No newline at end of file diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui/plugin.properties b/framework/bundles/org.eclipse.ecf.discovery.ui/plugin.properties index 2c2856895..9e9707dcd 100644 --- a/framework/bundles/org.eclipse.ecf.discovery.ui/plugin.properties +++ b/framework/bundles/org.eclipse.ecf.discovery.ui/plugin.properties @@ -1,13 +1,14 @@ -/**************************************************************************** -* Copyright (c) 2008 Versant Corp. and others. -* 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 -* -*****************************************************************************/ +############################################################################ +# Copyright (c) 2008 Versant Corp. and others. +# +# This program and the accompanying materials are made +# available under the terms of the Eclipse Public License 2.0 +# which is available at https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 +############################################################################ pluginName=ECF Discovery UI providerName=Eclipse.org - ECF discovery.view=Service Discovery menu.showIn.label=Show In -menu.showIn.mnemonic=w
\ No newline at end of file +menu.showIn.mnemonic=w diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui/plugin.xml b/framework/bundles/org.eclipse.ecf.discovery.ui/plugin.xml index 378956a91..60eb65709 100644 --- a/framework/bundles/org.eclipse.ecf.discovery.ui/plugin.xml +++ b/framework/bundles/org.eclipse.ecf.discovery.ui/plugin.xml @@ -1,18 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <?eclipse version="3.0"?> <plugin> - <extension - point="org.eclipse.ui.views"> - <view - allowMultiple="true" - category="org.eclipse.ecf.ui.viewcategory" - class="org.eclipse.ecf.internal.discovery.ui.views.DiscoveryView" - icon="icons/full/obj16/service_browser_view.gif" - id="org.eclipse.ecf.discovery.ui.DiscoveryView" - name="%discovery.view"> - </view> - </extension> - <extension point="org.eclipse.core.expressions.propertyTesters"> <propertyTester @@ -23,24 +11,4 @@ type="org.eclipse.ecf.discovery.ui.model.IServiceInfo"> </propertyTester> </extension> - <extension - point="org.eclipse.ui.menus"> - <menuContribution - locationURI="popup:org.eclipse.ecf.discovery.ui.DiscoveryView"> - <menu - commandId="org.eclipse.ui.navigate.showInQuickMenu" - id="org.eclipse.ecf.discovery.ui.DiscoveryView.showInMenu" - label="%menu.showIn.label" - mnemonic="%menu.showIn.mnemonic"> - <dynamic - class="org.eclipse.ui.ExtensionFactory:showInContribution" - id="org.eclipse.ui.menus.dynamicShowInMenu"> - </dynamic> - </menu> - <separator - name="additions" - visible="true"> - </separator> - </menuContribution> - </extension> </plugin> diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui/pom.xml b/framework/bundles/org.eclipse.ecf.discovery.ui/pom.xml index c39eab51b..4b6eb4736 100644 --- a/framework/bundles/org.eclipse.ecf.discovery.ui/pom.xml +++ b/framework/bundles/org.eclipse.ecf.discovery.ui/pom.xml @@ -10,6 +10,6 @@ </parent> <groupId>org.eclipse.ecf</groupId> <artifactId>org.eclipse.ecf.discovery.ui</artifactId> - <version>3.0.200-SNAPSHOT</version> + <version>3.0.300-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui/src/org/eclipse/ecf/discovery/ui/DiscoveryHandlerUtil.java b/framework/bundles/org.eclipse.ecf.discovery.ui/src/org/eclipse/ecf/discovery/ui/DiscoveryHandlerUtil.java index 6135e9ba5..a9866c12f 100644 --- a/framework/bundles/org.eclipse.ecf.discovery.ui/src/org/eclipse/ecf/discovery/ui/DiscoveryHandlerUtil.java +++ b/framework/bundles/org.eclipse.ecf.discovery.ui/src/org/eclipse/ecf/discovery/ui/DiscoveryHandlerUtil.java @@ -1,13 +1,15 @@ -/******************************************************************************* +/**************************************************************************** * Copyright (c) 2008 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Markus Kuppe (mkuppe <at> versant <dot> com) - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.discovery.ui; diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui/src/org/eclipse/ecf/discovery/ui/DiscoveryPropertyTesterUtil.java b/framework/bundles/org.eclipse.ecf.discovery.ui/src/org/eclipse/ecf/discovery/ui/DiscoveryPropertyTesterUtil.java index 05287aa1f..24be97e7f 100644 --- a/framework/bundles/org.eclipse.ecf.discovery.ui/src/org/eclipse/ecf/discovery/ui/DiscoveryPropertyTesterUtil.java +++ b/framework/bundles/org.eclipse.ecf.discovery.ui/src/org/eclipse/ecf/discovery/ui/DiscoveryPropertyTesterUtil.java @@ -1,13 +1,15 @@ -/******************************************************************************* +/**************************************************************************** * Copyright (c) 2008 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Markus Kuppe (mkuppe <at> versant <dot> com) - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.discovery.ui; diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui/src/org/eclipse/ecf/internal/discovery/ui/DiscoveryUIPlugin.java b/framework/bundles/org.eclipse.ecf.discovery.ui/src/org/eclipse/ecf/internal/discovery/ui/DiscoveryUIPlugin.java index 4e67af0e3..ef4443292 100644 --- a/framework/bundles/org.eclipse.ecf.discovery.ui/src/org/eclipse/ecf/internal/discovery/ui/DiscoveryUIPlugin.java +++ b/framework/bundles/org.eclipse.ecf.discovery.ui/src/org/eclipse/ecf/internal/discovery/ui/DiscoveryUIPlugin.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2008 Versant Corp. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Versant Corp. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.internal.discovery.ui; diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui/src/org/eclipse/ecf/internal/discovery/ui/property/ServiceTypeTester.java b/framework/bundles/org.eclipse.ecf.discovery.ui/src/org/eclipse/ecf/internal/discovery/ui/property/ServiceTypeTester.java index 1ecf68a47..5e42a2c56 100644 --- a/framework/bundles/org.eclipse.ecf.discovery.ui/src/org/eclipse/ecf/internal/discovery/ui/property/ServiceTypeTester.java +++ b/framework/bundles/org.eclipse.ecf.discovery.ui/src/org/eclipse/ecf/internal/discovery/ui/property/ServiceTypeTester.java @@ -1,13 +1,15 @@ -/******************************************************************************* +/**************************************************************************** * Copyright (c) 2008 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Markus Kuppe (mkuppe <at> versant <dot> com) - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.internal.discovery.ui.property; diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui/src/org/eclipse/ecf/internal/discovery/ui/statusline/AdapterFactoryStatuslineProvider.java b/framework/bundles/org.eclipse.ecf.discovery.ui/src/org/eclipse/ecf/internal/discovery/ui/statusline/AdapterFactoryStatuslineProvider.java index ab6545378..68b193191 100644 --- a/framework/bundles/org.eclipse.ecf.discovery.ui/src/org/eclipse/ecf/internal/discovery/ui/statusline/AdapterFactoryStatuslineProvider.java +++ b/framework/bundles/org.eclipse.ecf.discovery.ui/src/org/eclipse/ecf/internal/discovery/ui/statusline/AdapterFactoryStatuslineProvider.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2008 Versant Corp. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Versant Corp. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.internal.discovery.ui.statusline; diff --git a/framework/bundles/org.eclipse.ecf.discovery.ui/src/org/eclipse/ecf/internal/discovery/ui/views/DiscoveryView.java b/framework/bundles/org.eclipse.ecf.discovery.ui/src/org/eclipse/ecf/internal/discovery/ui/views/DiscoveryView.java index 4a91542d4..672b22cc9 100644 --- a/framework/bundles/org.eclipse.ecf.discovery.ui/src/org/eclipse/ecf/internal/discovery/ui/views/DiscoveryView.java +++ b/framework/bundles/org.eclipse.ecf.discovery.ui/src/org/eclipse/ecf/internal/discovery/ui/views/DiscoveryView.java @@ -1,13 +1,15 @@ /**************************************************************************** * Copyright (c) 2010 Remain Software, Versant Corp. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Versant Corp. - initial API and implementation * Remain Software - 333137 - Show In menu implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.internal.discovery.ui.views; diff --git a/framework/bundles/org.eclipse.ecf.discovery/.classpath b/framework/bundles/org.eclipse.ecf.discovery/.classpath index 6f3b481ac..2fbb7a23e 100644 --- a/framework/bundles/org.eclipse.ecf.discovery/.classpath +++ b/framework/bundles/org.eclipse.ecf.discovery/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/CDC-1.1%Foundation-1.1"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/framework/bundles/org.eclipse.ecf.discovery/.settings/org.eclipse.jdt.core.prefs b/framework/bundles/org.eclipse.ecf.discovery/.settings/org.eclipse.jdt.core.prefs index 4f5ba28bd..64b78fc71 100644 --- a/framework/bundles/org.eclipse.ecf.discovery/.settings/org.eclipse.jdt.core.prefs +++ b/framework/bundles/org.eclipse.ecf.discovery/.settings/org.eclipse.jdt.core.prefs @@ -1,4 +1,3 @@ -#Mon May 04 17:44:33 PDT 2009 eclipse.preferences.version=1 org.eclipse.jdt.core.builder.cleanOutputFolder=clean org.eclipse.jdt.core.builder.duplicateResourceTask=warning @@ -7,21 +6,42 @@ org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore 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.mainOnlyProjectHasTestOnlyDependency=error org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled +org.eclipse.jdt.core.classpath.outputOverlappingAnotherSource=error +org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled +org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore +org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull +org.eclipse.jdt.core.compiler.annotation.nonnull.secondary= +org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault +org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary= +org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable +org.eclipse.jdt.core.compiler.annotation.nullable.secondary= +org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve org.eclipse.jdt.core.compiler.compliance=1.4 +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.maxProblemPerUnit=100 +org.eclipse.jdt.core.compiler.problem.APILeak=warning +org.eclipse.jdt.core.compiler.problem.annotatedTypeArgumentToUnannotated=info 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.comparingIdentical=warning org.eclipse.jdt.core.compiler.problem.deadCode=warning -org.eclipse.jdt.core.compiler.problem.deprecation=warning +org.eclipse.jdt.core.compiler.problem.deprecation=ignore org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning +org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore @@ -29,52 +49,82 @@ 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.includeNullInfoFromAsserts=disabled org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning +org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore +org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore +org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore +org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning +org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning +org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error org.eclipse.jdt.core.compiler.problem.nullReference=warning +org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error +org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore +org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore +org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore +org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore +org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore +org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore +org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning +org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled +org.eclipse.jdt.core.compiler.problem.suppressWarningsNotFullyAnalysed=info +org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore +org.eclipse.jdt.core.compiler.problem.terminalDeprecation=warning org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning +org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore +org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning +org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=warning +org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled +org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=info org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore +org.eclipse.jdt.core.compiler.problem.unstableAutoModuleName=warning org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled +org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedImport=warning org.eclipse.jdt.core.compiler.problem.unusedLabel=warning org.eclipse.jdt.core.compiler.problem.unusedLocal=warning +org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning +org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning +org.eclipse.jdt.core.compiler.release=disabled org.eclipse.jdt.core.compiler.source=1.3 org.eclipse.jdt.core.incompatibleJDKLevel=ignore org.eclipse.jdt.core.incompleteClasspath=error diff --git a/framework/bundles/org.eclipse.ecf.discovery/.settings/org.eclipse.jdt.launching.prefs b/framework/bundles/org.eclipse.ecf.discovery/.settings/org.eclipse.jdt.launching.prefs index 3754b86c8..d177941ee 100644 --- a/framework/bundles/org.eclipse.ecf.discovery/.settings/org.eclipse.jdt.launching.prefs +++ b/framework/bundles/org.eclipse.ecf.discovery/.settings/org.eclipse.jdt.launching.prefs @@ -1,3 +1,3 @@ -#Tue Feb 03 16:13:37 PST 2009 eclipse.preferences.version=1 +org.eclipse.jdt.launching.PREF_COMPILER_COMPLIANCE_DOES_NOT_MATCH_JRE=ignore org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=ignore diff --git a/framework/bundles/org.eclipse.ecf.discovery/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.discovery/META-INF/MANIFEST.MF index 8ed6e4035..973d6fb96 100644 --- a/framework/bundles/org.eclipse.ecf.discovery/META-INF/MANIFEST.MF +++ b/framework/bundles/org.eclipse.ecf.discovery/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin.name Bundle-SymbolicName: org.eclipse.ecf.discovery;singleton:=true Automatic-Module-Name: org.eclipse.ecf.discovery -Bundle-Version: 5.0.300.qualifier +Bundle-Version: 5.1.1.qualifier Bundle-Activator: org.eclipse.ecf.internal.discovery.DiscoveryPlugin Bundle-Vendor: %plugin.provider Bundle-Localization: plugin @@ -12,8 +12,7 @@ Export-Package: org.eclipse.ecf.discovery;version="4.1.0", org.eclipse.ecf.discovery.identity;version="3.0.0", org.eclipse.ecf.discovery.service;version="2.0.0", org.eclipse.ecf.internal.discovery;version="3.0.0";x-internal:=true -Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1, - J2SE-1.4 +Bundle-RequiredExecutionEnvironment: J2SE-1.4 Require-Bundle: org.eclipse.equinox.common;bundle-version="[3.0.0,4.0.0)", org.eclipse.ecf;bundle-version="[3.4.0,4.0.0)" Import-Package: org.eclipse.core.runtime.jobs, diff --git a/framework/bundles/org.eclipse.ecf.discovery/about.html b/framework/bundles/org.eclipse.ecf.discovery/about.html index 4c79781a5..9f1dc0dd5 100644 --- a/framework/bundles/org.eclipse.ecf.discovery/about.html +++ b/framework/bundles/org.eclipse.ecf.discovery/about.html @@ -22,7 +22,7 @@ being redistributed by another party ("Redistributor") and different t apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise indicated below, the terms and conditions of the EPL still apply to any source code in the Content -and such source code may be obtained at <a href="/">http://www.eclipse.org</a>.</p> +and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p> </body> </html>
\ No newline at end of file diff --git a/framework/bundles/org.eclipse.ecf.discovery/build.properties b/framework/bundles/org.eclipse.ecf.discovery/build.properties index d930590b8..3ba17067b 100644 --- a/framework/bundles/org.eclipse.ecf.discovery/build.properties +++ b/framework/bundles/org.eclipse.ecf.discovery/build.properties @@ -8,4 +8,3 @@ src.includes = about.html jars.compile.order = . source.. = src/ output.. = bin/ -jre.compilation.profile = J2SE-1.4 diff --git a/framework/bundles/org.eclipse.ecf.discovery/plugin.dtd b/framework/bundles/org.eclipse.ecf.discovery/plugin.dtd new file mode 100644 index 000000000..ad6c97ae2 --- /dev/null +++ b/framework/bundles/org.eclipse.ecf.discovery/plugin.dtd @@ -0,0 +1,6 @@ +<!ELEMENT plugin (extension)> +<!ELEMENT extension (namespace)> +<!ATTLIST extension point NMTOKEN #REQUIRED> +<!ELEMENT namespace (#PCDATA)> +<!ATTLIST namespace class NMTOKEN #REQUIRED> +<!ATTLIST namespace name NMTOKEN #REQUIRED>
\ No newline at end of file diff --git a/framework/bundles/org.eclipse.ecf.discovery/plugin.properties b/framework/bundles/org.eclipse.ecf.discovery/plugin.properties index 19e2b0f37..82b286bc3 100644 --- a/framework/bundles/org.eclipse.ecf.discovery/plugin.properties +++ b/framework/bundles/org.eclipse.ecf.discovery/plugin.properties @@ -1,10 +1,11 @@ ############################################################################ # Copyright (c) 2007 Composent Inc., IBM Corp. and others. -# 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 # +# This program and the accompanying materials are made +# available under the terms of the Eclipse Public License 2.0 +# which is available at https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 ############################################################################ plugin.provider = Eclipse.org - ECF plugin.name = ECF Discovery API diff --git a/framework/bundles/org.eclipse.ecf.discovery/pom.xml b/framework/bundles/org.eclipse.ecf.discovery/pom.xml index 288f39605..df803d4a8 100644 --- a/framework/bundles/org.eclipse.ecf.discovery/pom.xml +++ b/framework/bundles/org.eclipse.ecf.discovery/pom.xml @@ -10,6 +10,6 @@ </parent> <groupId>org.eclipse.ecf</groupId> <artifactId>org.eclipse.ecf.discovery</artifactId> - <version>5.0.300-SNAPSHOT</version> + <version>5.1.1-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/AbstractDiscoveryContainerAdapter.java b/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/AbstractDiscoveryContainerAdapter.java index d67ec89c2..f7cca74ab 100644 --- a/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/AbstractDiscoveryContainerAdapter.java +++ b/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/AbstractDiscoveryContainerAdapter.java @@ -1,13 +1,15 @@ -/******************************************************************************* +/**************************************************************************** * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Markus Kuppe (mkuppe <at> versant <dot> com) - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.discovery; import java.util.*; diff --git a/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/DiscoveryContainerConfig.java b/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/DiscoveryContainerConfig.java index b09bb9c13..0f85f0b5d 100644 --- a/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/DiscoveryContainerConfig.java +++ b/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/DiscoveryContainerConfig.java @@ -1,13 +1,15 @@ -/******************************************************************************* +/**************************************************************************** * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Markus Kuppe (mkuppe <at> versant <dot> com) - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.discovery; import org.eclipse.ecf.core.identity.ID; diff --git a/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/IContainerServiceInfoAdapter.java b/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/IContainerServiceInfoAdapter.java index a1928330d..b498c6a09 100644 --- a/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/IContainerServiceInfoAdapter.java +++ b/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/IContainerServiceInfoAdapter.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2008 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.discovery; diff --git a/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/IDiscoveryAdvertiser.java b/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/IDiscoveryAdvertiser.java index 939dbde95..e57399b70 100644 --- a/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/IDiscoveryAdvertiser.java +++ b/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/IDiscoveryAdvertiser.java @@ -1,13 +1,15 @@ -/******************************************************************************* +/**************************************************************************** * Copyright (c) 2009 Markus Alexander Kuppe. - * 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 - * + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: * Markus Alexander Kuppe (ecf-dev_eclipse.org <at> lemmster <dot> de) - initial API and implementation - *******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.discovery; diff --git a/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/IDiscoveryContainerAdapter.java b/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/IDiscoveryContainerAdapter.java index 0a40e3e07..835fd97e4 100644 --- a/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/IDiscoveryContainerAdapter.java +++ b/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/IDiscoveryContainerAdapter.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.discovery; diff --git a/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/IDiscoveryLocator.java b/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/IDiscoveryLocator.java index 65846f457..d9d474e88 100644 --- a/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/IDiscoveryLocator.java +++ b/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/IDiscoveryLocator.java @@ -1,13 +1,15 @@ -/******************************************************************************* +/**************************************************************************** * Copyright (c) 2009 Markus Alexander Kuppe. - * 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 - * + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: * Markus Alexander Kuppe (ecf-dev_eclipse.org <at> lemmster <dot> de) - initial API and implementation - *******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.discovery; diff --git a/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/IServiceEvent.java b/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/IServiceEvent.java index 37719aee4..68aa2a7dc 100644 --- a/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/IServiceEvent.java +++ b/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/IServiceEvent.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.discovery; diff --git a/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/IServiceInfo.java b/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/IServiceInfo.java index 9d2bfe2b1..a4ba67a75 100644 --- a/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/IServiceInfo.java +++ b/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/IServiceInfo.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.discovery; diff --git a/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/IServiceListener.java b/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/IServiceListener.java index 73b670a7e..36c522425 100644 --- a/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/IServiceListener.java +++ b/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/IServiceListener.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.discovery; diff --git a/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/IServiceProperties.java b/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/IServiceProperties.java index 1ce139608..f5dba756a 100644 --- a/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/IServiceProperties.java +++ b/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/IServiceProperties.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.discovery; diff --git a/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/IServiceTypeEvent.java b/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/IServiceTypeEvent.java index 223081961..d043cc367 100644 --- a/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/IServiceTypeEvent.java +++ b/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/IServiceTypeEvent.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2007 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.discovery; diff --git a/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/IServiceTypeListener.java b/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/IServiceTypeListener.java index bccb57e7e..77cb3721b 100644 --- a/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/IServiceTypeListener.java +++ b/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/IServiceTypeListener.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.discovery; diff --git a/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/ServiceContainerEvent.java b/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/ServiceContainerEvent.java index 8edea5cd2..8d20acbb6 100644 --- a/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/ServiceContainerEvent.java +++ b/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/ServiceContainerEvent.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.discovery; diff --git a/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/ServiceInfo.java b/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/ServiceInfo.java index 3ace71000..e5616b0a5 100644 --- a/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/ServiceInfo.java +++ b/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/ServiceInfo.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.discovery; diff --git a/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/ServiceProperties.java b/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/ServiceProperties.java index 352df0006..7e1812b57 100644 --- a/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/ServiceProperties.java +++ b/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/ServiceProperties.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2007 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2007 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.discovery; import java.io.Serializable; diff --git a/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/ServiceTypeContainerEvent.java b/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/ServiceTypeContainerEvent.java index 21d1018b6..17dd1d364 100644 --- a/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/ServiceTypeContainerEvent.java +++ b/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/ServiceTypeContainerEvent.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.discovery; diff --git a/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/identity/IServiceID.java b/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/identity/IServiceID.java index f363b2206..70d2f6bb0 100644 --- a/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/identity/IServiceID.java +++ b/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/identity/IServiceID.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.discovery.identity; diff --git a/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/identity/IServiceIDFactory.java b/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/identity/IServiceIDFactory.java index 16b213c97..dde409d94 100644 --- a/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/identity/IServiceIDFactory.java +++ b/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/identity/IServiceIDFactory.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2007 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.discovery.identity; diff --git a/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/identity/IServiceTypeID.java b/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/identity/IServiceTypeID.java index 508841de8..e2210efcd 100644 --- a/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/identity/IServiceTypeID.java +++ b/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/identity/IServiceTypeID.java @@ -1,13 +1,15 @@ -/******************************************************************************* +/**************************************************************************** * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Markus Kuppe (mkuppe <at> versant <dot> com) - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.discovery.identity; import org.eclipse.ecf.core.identity.ID; diff --git a/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/identity/ServiceID.java b/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/identity/ServiceID.java index 7466c048f..4b827b6e4 100644 --- a/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/identity/ServiceID.java +++ b/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/identity/ServiceID.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.discovery.identity; import java.net.URI; diff --git a/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/identity/ServiceIDFactory.java b/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/identity/ServiceIDFactory.java index d37bb4863..e1b7cc981 100644 --- a/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/identity/ServiceIDFactory.java +++ b/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/identity/ServiceIDFactory.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2007 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.discovery.identity; diff --git a/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/identity/ServiceTypeID.java b/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/identity/ServiceTypeID.java index 3dfecbc7b..bb0a248f7 100644 --- a/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/identity/ServiceTypeID.java +++ b/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/identity/ServiceTypeID.java @@ -1,13 +1,15 @@ -/******************************************************************************* +/**************************************************************************** * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Markus Kuppe (mkuppe <at> versant <dot> com) - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.discovery.identity; diff --git a/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/service/IDiscoveryService.java b/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/service/IDiscoveryService.java index 2ef7c2684..a1cc4ae04 100644 --- a/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/service/IDiscoveryService.java +++ b/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/service/IDiscoveryService.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.discovery.service; diff --git a/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/internal/discovery/DiscoveryDebugOption.java b/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/internal/discovery/DiscoveryDebugOption.java index 82398ade0..94f5194a6 100644 --- a/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/internal/discovery/DiscoveryDebugOption.java +++ b/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/internal/discovery/DiscoveryDebugOption.java @@ -1,13 +1,15 @@ -/******************************************************************************* +/**************************************************************************** * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Markus Kuppe (mkuppe <at> versant <dot> com) - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.internal.discovery; public class DiscoveryDebugOption { diff --git a/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/internal/discovery/DiscoveryNamespace.java b/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/internal/discovery/DiscoveryNamespace.java index 293e9d7ee..38f4cec5b 100644 --- a/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/internal/discovery/DiscoveryNamespace.java +++ b/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/internal/discovery/DiscoveryNamespace.java @@ -1,13 +1,15 @@ -/******************************************************************************* +/**************************************************************************** * Copyright (c) 2010 Markus Alexander Kuppe. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Markus Alexander Kuppe (ecf-dev_eclipse.org <at> lemmster <dot> de) - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.internal.discovery; import java.net.URI; diff --git a/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/internal/discovery/DiscoveryPlugin.java b/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/internal/discovery/DiscoveryPlugin.java index c6ff207c0..37348bb1c 100644 --- a/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/internal/discovery/DiscoveryPlugin.java +++ b/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/internal/discovery/DiscoveryPlugin.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.internal.discovery; diff --git a/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/internal/discovery/DiscoveryServiceListener.java b/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/internal/discovery/DiscoveryServiceListener.java index 7042ccf8e..51213ed8d 100644 --- a/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/internal/discovery/DiscoveryServiceListener.java +++ b/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/internal/discovery/DiscoveryServiceListener.java @@ -1,13 +1,15 @@ -/******************************************************************************* +/**************************************************************************** * Copyright (c) 2010 Markus Alexander Kuppe. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Markus Alexander Kuppe (ecf-dev_eclipse.org <at> lemmster <dot> de) - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.internal.discovery; import org.eclipse.core.runtime.IStatus; diff --git a/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/internal/discovery/IServiceInfoServiceListener.java b/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/internal/discovery/IServiceInfoServiceListener.java index 729fe197b..ac5d8de85 100644 --- a/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/internal/discovery/IServiceInfoServiceListener.java +++ b/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/internal/discovery/IServiceInfoServiceListener.java @@ -1,12 +1,15 @@ -/******************************************************************************* - * Copyright (c) 2013 Markus Alexander Kuppe and others. 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 +/**************************************************************************** + * Copyright (c) 2013 Markus Alexander Kuppe and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Markus Alexander Kuppe - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.internal.discovery; import org.eclipse.core.runtime.IStatus; diff --git a/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/internal/discovery/ServiceTypeComparator.java b/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/internal/discovery/ServiceTypeComparator.java index 8201270fe..17d768f95 100644 --- a/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/internal/discovery/ServiceTypeComparator.java +++ b/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/internal/discovery/ServiceTypeComparator.java @@ -1,13 +1,15 @@ -/******************************************************************************* +/**************************************************************************** * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Markus Kuppe (mkuppe <at> versant <dot> com) - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.internal.discovery; import java.util.Arrays; diff --git a/framework/bundles/org.eclipse.ecf.docshare/.settings/org.eclipse.jdt.core.prefs b/framework/bundles/org.eclipse.ecf.docshare/.settings/org.eclipse.jdt.core.prefs index 9d61a2f6f..d38d08091 100644 --- a/framework/bundles/org.eclipse.ecf.docshare/.settings/org.eclipse.jdt.core.prefs +++ b/framework/bundles/org.eclipse.ecf.docshare/.settings/org.eclipse.jdt.core.prefs @@ -19,7 +19,7 @@ org.eclipse.jdt.core.compiler.maxProblemPerUnit=1000 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.autoboxing=ignore -org.eclipse.jdt.core.compiler.problem.deprecation=warning +org.eclipse.jdt.core.compiler.problem.deprecation=ignore org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled org.eclipse.jdt.core.compiler.problem.discouragedReference=error diff --git a/framework/bundles/org.eclipse.ecf.docshare/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.docshare/META-INF/MANIFEST.MF index 7650ec32c..7354a6d68 100644 --- a/framework/bundles/org.eclipse.ecf.docshare/META-INF/MANIFEST.MF +++ b/framework/bundles/org.eclipse.ecf.docshare/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin.name Bundle-SymbolicName: org.eclipse.ecf.docshare;singleton:=true Automatic-Module-Name: org.eclipse.ecf.docshare -Bundle-Version: 3.0.300.qualifier +Bundle-Version: 3.0.400.qualifier Bundle-Activator: org.eclipse.ecf.internal.docshare.Activator Bundle-Vendor: %plugin.provider Bundle-Localization: plugin diff --git a/framework/bundles/org.eclipse.ecf.docshare/about.html b/framework/bundles/org.eclipse.ecf.docshare/about.html index 6a60a262f..7e02a356d 100644 --- a/framework/bundles/org.eclipse.ecf.docshare/about.html +++ b/framework/bundles/org.eclipse.ecf.docshare/about.html @@ -22,7 +22,7 @@ being redistributed by another party ("Redistributor") and different t apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise indicated below, the terms and conditions of the EPL still apply to any source code in the Content -and such source code may be obtained at <a href="/">http://www.eclipse.org</a>.</p> +and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p> </body> </html>
\ No newline at end of file diff --git a/framework/bundles/org.eclipse.ecf.docshare/plugin.properties b/framework/bundles/org.eclipse.ecf.docshare/plugin.properties index 1a05c4a6c..b9b7b7563 100644 --- a/framework/bundles/org.eclipse.ecf.docshare/plugin.properties +++ b/framework/bundles/org.eclipse.ecf.docshare/plugin.properties @@ -1,13 +1,12 @@ -################################################################################ +############################################################################ # Copyright (c) 2008 Composent, Inc. and others. -# 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: -# Composent, Inc. - initial API and implementation -################################################################################ +# +# This program and the accompanying materials are made +# available under the terms of the Eclipse Public License 2.0 +# which is available at https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 +############################################################################ plugin.provider = Eclipse.org - ECF plugin.name = ECF DocShare Real-time Shared Editor label.annotation.remote.cursor = Remote Cursor diff --git a/framework/bundles/org.eclipse.ecf.docshare/pom.xml b/framework/bundles/org.eclipse.ecf.docshare/pom.xml index c13d6a549..f72104a9c 100644 --- a/framework/bundles/org.eclipse.ecf.docshare/pom.xml +++ b/framework/bundles/org.eclipse.ecf.docshare/pom.xml @@ -10,6 +10,6 @@ </parent> <groupId>org.eclipse.ecf</groupId> <artifactId>org.eclipse.ecf.docshare</artifactId> - <version>3.0.300-SNAPSHOT</version> + <version>3.0.400-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/DocShare.java b/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/DocShare.java index ae440c0e3..b75bb9b6f 100644 --- a/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/DocShare.java +++ b/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/DocShare.java @@ -1,15 +1,17 @@ /**************************************************************************** * Copyright (c) 2007, 2009 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation * Mustafa K. Isik - conflict resolution via operational transformations * Marcelo Mayworm - Adding sync API dependence * IBM Corporation - support for certain non-text editors + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.docshare; diff --git a/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/DocShareEditorInput.java b/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/DocShareEditorInput.java index 9297b9b80..e4802a028 100644 --- a/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/DocShareEditorInput.java +++ b/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/DocShareEditorInput.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2007 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.docshare; diff --git a/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/menu/DocShareRosterMenuContributionItem.java b/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/menu/DocShareRosterMenuContributionItem.java index dd3dbbea0..90a6ff006 100644 --- a/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/menu/DocShareRosterMenuContributionItem.java +++ b/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/menu/DocShareRosterMenuContributionItem.java @@ -1,13 +1,15 @@ /**************************************************************************** * Copyright (c) 2008, 2009 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation * IBM Corporation - support for certain non-text editors + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.docshare.menu; diff --git a/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/menu/DocShareRosterMenuHandler.java b/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/menu/DocShareRosterMenuHandler.java index 8752a8b74..172870d23 100644 --- a/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/menu/DocShareRosterMenuHandler.java +++ b/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/menu/DocShareRosterMenuHandler.java @@ -1,13 +1,15 @@ /**************************************************************************** * Copyright (c) 2007, 2009 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation * IBM Corporation - support for certain non-text editors + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.docshare.menu; diff --git a/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/messages/Message.java b/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/messages/Message.java index fb17c6be6..a83f763e9 100644 --- a/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/messages/Message.java +++ b/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/messages/Message.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2007 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.docshare.messages; diff --git a/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/messages/SelectionMessage.java b/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/messages/SelectionMessage.java index 7932c8d6b..1099f0a89 100644 --- a/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/messages/SelectionMessage.java +++ b/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/messages/SelectionMessage.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2008 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.docshare.messages; diff --git a/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/messages/StartMessage.java b/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/messages/StartMessage.java index abf244289..95a73f39c 100644 --- a/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/messages/StartMessage.java +++ b/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/messages/StartMessage.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2007 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.docshare.messages; diff --git a/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/messages/StopMessage.java b/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/messages/StopMessage.java index d1050cde9..2a5bc01de 100644 --- a/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/messages/StopMessage.java +++ b/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/messages/StopMessage.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2007 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.docshare.messages; diff --git a/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/internal/docshare/Activator.java b/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/internal/docshare/Activator.java index 0448aadc4..ce5789b40 100644 --- a/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/internal/docshare/Activator.java +++ b/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/internal/docshare/Activator.java @@ -1,14 +1,16 @@ /**************************************************************************** * Copyright (c) 2008, 2009 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation * Remy Chi Jian Suen - Bug 270332 put() is called twice for DocShares due to ECF Generic group handling * IBM Corporation - Bug 270332 put() is called twice for DocShares due to ECF Generic group handling + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.internal.docshare; diff --git a/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/internal/docshare/DocshareDebugOptions.java b/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/internal/docshare/DocshareDebugOptions.java index 01d366c05..2264a0829 100644 --- a/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/internal/docshare/DocshareDebugOptions.java +++ b/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/internal/docshare/DocshareDebugOptions.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2008 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2008 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.internal.docshare; public interface DocshareDebugOptions { diff --git a/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/internal/docshare/ECFStart.java b/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/internal/docshare/ECFStart.java index e0edc2102..53e29e6eb 100644 --- a/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/internal/docshare/ECFStart.java +++ b/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/internal/docshare/ECFStart.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2007 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.internal.docshare; diff --git a/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/internal/docshare/Messages.java b/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/internal/docshare/Messages.java index 25225b901..34b0d164c 100644 --- a/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/internal/docshare/Messages.java +++ b/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/internal/docshare/Messages.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2007 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.internal.docshare; diff --git a/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/internal/docshare/messages.properties b/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/internal/docshare/messages.properties index 7b1ca4929..9402acbec 100644 --- a/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/internal/docshare/messages.properties +++ b/framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/internal/docshare/messages.properties @@ -1,13 +1,12 @@ -################################################################################ +############################################################################ # Copyright (c) 2008 Composent, Inc. and others. -# 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: -# Composent, Inc. - initial API and implementation -################################################################################ +# +# This program and the accompanying materials are made +# available under the terms of the Eclipse Public License 2.0 +# which is available at https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 +############################################################################ DocShare_EDITOR_SHARE_POPUP_MESSAGE=Editor share request from {0} for {1}.\n\nDo you want to accept and open editor? DocShare_EDITOR_SHARE_POPUP_TITLE=Editor Share DocShare_ERROR_STARTING_EDITOR_MESSAGE=Error Starting Editor Sharing {0} diff --git a/framework/bundles/org.eclipse.ecf.filetransfer.ui/.settings/org.eclipse.jdt.core.prefs b/framework/bundles/org.eclipse.ecf.filetransfer.ui/.settings/org.eclipse.jdt.core.prefs index 745cbb8ff..34bcf9aee 100644 --- a/framework/bundles/org.eclipse.ecf.filetransfer.ui/.settings/org.eclipse.jdt.core.prefs +++ b/framework/bundles/org.eclipse.ecf.filetransfer.ui/.settings/org.eclipse.jdt.core.prefs @@ -19,7 +19,7 @@ org.eclipse.jdt.core.compiler.maxProblemPerUnit=1000 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.autoboxing=ignore -org.eclipse.jdt.core.compiler.problem.deprecation=warning +org.eclipse.jdt.core.compiler.problem.deprecation=ignore org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled org.eclipse.jdt.core.compiler.problem.discouragedReference=error diff --git a/framework/bundles/org.eclipse.ecf.filetransfer.ui/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.filetransfer.ui/META-INF/MANIFEST.MF index 9f34aea2d..23f4e63e3 100644 --- a/framework/bundles/org.eclipse.ecf.filetransfer.ui/META-INF/MANIFEST.MF +++ b/framework/bundles/org.eclipse.ecf.filetransfer.ui/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.ecf.filetransfer.ui;singleton:=true Automatic-Module-Name: org.eclipse.ecf.filetransfer.ui -Bundle-Version: 1.5.100.qualifier +Bundle-Version: 1.5.200.qualifier Bundle-Activator: org.eclipse.ecf.internal.filetransfer.ui.Activator Bundle-Localization: plugin Require-Bundle: org.eclipse.ui, diff --git a/framework/bundles/org.eclipse.ecf.filetransfer.ui/build.properties b/framework/bundles/org.eclipse.ecf.filetransfer.ui/build.properties index 01dc58d46..427b2eda6 100644 --- a/framework/bundles/org.eclipse.ecf.filetransfer.ui/build.properties +++ b/framework/bundles/org.eclipse.ecf.filetransfer.ui/build.properties @@ -1,13 +1,12 @@ -################################################################################ +############################################################################ # Copyright (c) 2007 Remy Suen -# 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: -# Remy Suen <remy.suen@gmail.com> - initial API and implementation -################################################################################ +# This program and the accompanying materials are made +# available under the terms of the Eclipse Public License 2.0 +# which is available at https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 +############################################################################ source.. = src/ output.. = bin/ diff --git a/framework/bundles/org.eclipse.ecf.filetransfer.ui/plugin.properties b/framework/bundles/org.eclipse.ecf.filetransfer.ui/plugin.properties index 24cddb32b..25bf3b9af 100644 --- a/framework/bundles/org.eclipse.ecf.filetransfer.ui/plugin.properties +++ b/framework/bundles/org.eclipse.ecf.filetransfer.ui/plugin.properties @@ -1,13 +1,12 @@ -################################################################################ +############################################################################ # Copyright (c) 2007 Remy Suen, Composent, Inc. and Others. -# 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: -# Remy Suen <remy.suen@gmail.com> - initial API and implementation -################################################################################ +# This program and the accompanying materials are made +# available under the terms of the Eclipse Public License 2.0 +# which is available at https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 +############################################################################ pluginName = ECF File Transfer UI providerName = Eclipse.org - ECF diff --git a/framework/bundles/org.eclipse.ecf.filetransfer.ui/pom.xml b/framework/bundles/org.eclipse.ecf.filetransfer.ui/pom.xml index 7d14565b9..84565ccd6 100644 --- a/framework/bundles/org.eclipse.ecf.filetransfer.ui/pom.xml +++ b/framework/bundles/org.eclipse.ecf.filetransfer.ui/pom.xml @@ -10,6 +10,6 @@ </parent> <groupId>org.eclipse.ecf</groupId> <artifactId>org.eclipse.ecf.filetransfer.ui</artifactId> - <version>1.5.100-SNAPSHOT</version> + <version>1.5.200-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/framework/bundles/org.eclipse.ecf.filetransfer.ui/src/org/eclipse/ecf/filetransfer/ui/FileTransfersView.java b/framework/bundles/org.eclipse.ecf.filetransfer.ui/src/org/eclipse/ecf/filetransfer/ui/FileTransfersView.java index be6320625..eba2f0fbe 100644 --- a/framework/bundles/org.eclipse.ecf.filetransfer.ui/src/org/eclipse/ecf/filetransfer/ui/FileTransfersView.java +++ b/framework/bundles/org.eclipse.ecf.filetransfer.ui/src/org/eclipse/ecf/filetransfer/ui/FileTransfersView.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2007 Remy Suen and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Remy Suen <remy.suen@gmail.com> - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.filetransfer.ui; diff --git a/framework/bundles/org.eclipse.ecf.filetransfer.ui/src/org/eclipse/ecf/filetransfer/ui/actions/AbstractFileSendAction.java b/framework/bundles/org.eclipse.ecf.filetransfer.ui/src/org/eclipse/ecf/filetransfer/ui/actions/AbstractFileSendAction.java index 31f435556..ca52a52f8 100644 --- a/framework/bundles/org.eclipse.ecf.filetransfer.ui/src/org/eclipse/ecf/filetransfer/ui/actions/AbstractFileSendAction.java +++ b/framework/bundles/org.eclipse.ecf.filetransfer.ui/src/org/eclipse/ecf/filetransfer/ui/actions/AbstractFileSendAction.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.filetransfer.ui.actions; diff --git a/framework/bundles/org.eclipse.ecf.filetransfer.ui/src/org/eclipse/ecf/internal/filetransfer/ui/Activator.java b/framework/bundles/org.eclipse.ecf.filetransfer.ui/src/org/eclipse/ecf/internal/filetransfer/ui/Activator.java index bc01d01de..2a38ab0e1 100644 --- a/framework/bundles/org.eclipse.ecf.filetransfer.ui/src/org/eclipse/ecf/internal/filetransfer/ui/Activator.java +++ b/framework/bundles/org.eclipse.ecf.filetransfer.ui/src/org/eclipse/ecf/internal/filetransfer/ui/Activator.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2007 Remy Suen and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Remy Suen <remy.suen@gmail.com> - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.internal.filetransfer.ui; diff --git a/framework/bundles/org.eclipse.ecf.filetransfer.ui/src/org/eclipse/ecf/internal/filetransfer/ui/GetFileHandler.java b/framework/bundles/org.eclipse.ecf.filetransfer.ui/src/org/eclipse/ecf/internal/filetransfer/ui/GetFileHandler.java index a4426d3ee..fbd741356 100644 --- a/framework/bundles/org.eclipse.ecf.filetransfer.ui/src/org/eclipse/ecf/internal/filetransfer/ui/GetFileHandler.java +++ b/framework/bundles/org.eclipse.ecf.filetransfer.ui/src/org/eclipse/ecf/internal/filetransfer/ui/GetFileHandler.java @@ -1,13 +1,15 @@ -/******************************************************************************* +/**************************************************************************** * Copyright (c) 2008 IBM Corporation and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * IBM Corporation - initial API and implementation - *******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.internal.filetransfer.ui; import java.io.FileOutputStream; diff --git a/framework/bundles/org.eclipse.ecf.filetransfer.ui/src/org/eclipse/ecf/internal/filetransfer/ui/Messages.java b/framework/bundles/org.eclipse.ecf.filetransfer.ui/src/org/eclipse/ecf/internal/filetransfer/ui/Messages.java index c729aad66..20065a79a 100644 --- a/framework/bundles/org.eclipse.ecf.filetransfer.ui/src/org/eclipse/ecf/internal/filetransfer/ui/Messages.java +++ b/framework/bundles/org.eclipse.ecf.filetransfer.ui/src/org/eclipse/ecf/internal/filetransfer/ui/Messages.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.internal.filetransfer.ui; diff --git a/framework/bundles/org.eclipse.ecf.filetransfer.ui/src/org/eclipse/ecf/internal/filetransfer/ui/StartFileDownloadDialog.java b/framework/bundles/org.eclipse.ecf.filetransfer.ui/src/org/eclipse/ecf/internal/filetransfer/ui/StartFileDownloadDialog.java index df715765b..344931203 100644 --- a/framework/bundles/org.eclipse.ecf.filetransfer.ui/src/org/eclipse/ecf/internal/filetransfer/ui/StartFileDownloadDialog.java +++ b/framework/bundles/org.eclipse.ecf.filetransfer.ui/src/org/eclipse/ecf/internal/filetransfer/ui/StartFileDownloadDialog.java @@ -1,13 +1,15 @@ -/******************************************************************************* +/**************************************************************************** * Copyright (c) 2008 IBM Corporation and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * IBM Corporation - initial API and implementation - *******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.internal.filetransfer.ui; import java.io.File; diff --git a/framework/bundles/org.eclipse.ecf.filetransfer.ui/src/org/eclipse/ecf/internal/filetransfer/ui/hyperlink/SCPHyperlink.java b/framework/bundles/org.eclipse.ecf.filetransfer.ui/src/org/eclipse/ecf/internal/filetransfer/ui/hyperlink/SCPHyperlink.java index 0a464031f..d6623b893 100644 --- a/framework/bundles/org.eclipse.ecf.filetransfer.ui/src/org/eclipse/ecf/internal/filetransfer/ui/hyperlink/SCPHyperlink.java +++ b/framework/bundles/org.eclipse.ecf.filetransfer.ui/src/org/eclipse/ecf/internal/filetransfer/ui/hyperlink/SCPHyperlink.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.internal.filetransfer.ui.hyperlink; diff --git a/framework/bundles/org.eclipse.ecf.filetransfer.ui/src/org/eclipse/ecf/internal/filetransfer/ui/preferences/TransferPreferencePage.java b/framework/bundles/org.eclipse.ecf.filetransfer.ui/src/org/eclipse/ecf/internal/filetransfer/ui/preferences/TransferPreferencePage.java index 3ce6e2a42..523c70839 100644 --- a/framework/bundles/org.eclipse.ecf.filetransfer.ui/src/org/eclipse/ecf/internal/filetransfer/ui/preferences/TransferPreferencePage.java +++ b/framework/bundles/org.eclipse.ecf.filetransfer.ui/src/org/eclipse/ecf/internal/filetransfer/ui/preferences/TransferPreferencePage.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2008 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.internal.filetransfer.ui.preferences; diff --git a/framework/bundles/org.eclipse.ecf.filetransfer/.classpath b/framework/bundles/org.eclipse.ecf.filetransfer/.classpath index 64c5e31b7..eca7bdba8 100644 --- a/framework/bundles/org.eclipse.ecf.filetransfer/.classpath +++ b/framework/bundles/org.eclipse.ecf.filetransfer/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/framework/bundles/org.eclipse.ecf.filetransfer/.settings/org.eclipse.jdt.core.prefs b/framework/bundles/org.eclipse.ecf.filetransfer/.settings/org.eclipse.jdt.core.prefs index 2d0518e1f..39370f8ca 100644 --- a/framework/bundles/org.eclipse.ecf.filetransfer/.settings/org.eclipse.jdt.core.prefs +++ b/framework/bundles/org.eclipse.ecf.filetransfer/.settings/org.eclipse.jdt.core.prefs @@ -7,9 +7,10 @@ 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=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -20,11 +21,12 @@ org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.autoboxing=ignore org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning org.eclipse.jdt.core.compiler.problem.deadCode=warning -org.eclipse.jdt.core.compiler.problem.deprecation=warning +org.eclipse.jdt.core.compiler.problem.deprecation=ignore 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.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled @@ -66,6 +68,7 @@ org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=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 @@ -91,23 +94,28 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=enab org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.source=1.8 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 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_bitwise_operator=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_logical_operator=16 org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=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_string_concatenation=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 @@ -177,11 +185,12 @@ 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_additive_operator=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_bitwise_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 @@ -211,6 +220,8 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=inser 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_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=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 @@ -234,12 +245,16 @@ 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_relational_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=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_bitwise_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 @@ -285,6 +300,8 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do n 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_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=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 @@ -320,8 +337,11 @@ org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not inser 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_relational_operator=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_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=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 @@ -344,6 +364,10 @@ 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.formatter.wrap_before_additive_operator=true +org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true +org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true +org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true +org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true org.eclipse.jdt.core.incompatibleJDKLevel=ignore org.eclipse.jdt.core.incompleteClasspath=error diff --git a/framework/bundles/org.eclipse.ecf.filetransfer/.settings/org.eclipse.pde.prefs b/framework/bundles/org.eclipse.ecf.filetransfer/.settings/org.eclipse.pde.prefs index 6686ccd10..3ce384565 100644 --- a/framework/bundles/org.eclipse.ecf.filetransfer/.settings/org.eclipse.pde.prefs +++ b/framework/bundles/org.eclipse.ecf.filetransfer/.settings/org.eclipse.pde.prefs @@ -1,3 +1,36 @@ -#Thu Apr 19 20:30:05 GMT-08:00 2007 +compilers.f.unresolved-features=1 +compilers.f.unresolved-plugins=1 +compilers.incompatible-environment=2 +compilers.p.build=1 +compilers.p.build.bin.includes=1 +compilers.p.build.encodings=2 +compilers.p.build.java.compiler=2 +compilers.p.build.java.compliance=1 +compilers.p.build.missing.output=2 +compilers.p.build.output.library=1 +compilers.p.build.source.library=1 +compilers.p.build.src.includes=1 +compilers.p.deprecated=1 +compilers.p.discouraged-class=1 +compilers.p.exec-env-too-low=2 +compilers.p.internal=1 +compilers.p.missing-packages=2 +compilers.p.missing-version-export-package=2 +compilers.p.missing-version-import-package=2 +compilers.p.missing-version-require-bundle=2 +compilers.p.no-required-att=0 +compilers.p.no.automatic.module=1 +compilers.p.not-externalized-att=2 +compilers.p.service.component.without.lazyactivation=1 +compilers.p.unknown-attribute=1 +compilers.p.unknown-class=1 +compilers.p.unknown-element=1 +compilers.p.unknown-identifier=1 +compilers.p.unknown-resource=1 +compilers.p.unresolved-ex-points=0 +compilers.p.unresolved-import=0 +compilers.s.create-docs=false +compilers.s.doc-folder=doc +compilers.s.open-tags=1 compilers.use-project=true eclipse.preferences.version=1 diff --git a/framework/bundles/org.eclipse.ecf.filetransfer/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.filetransfer/META-INF/MANIFEST.MF index 0ccca9159..6159ea3f4 100644 --- a/framework/bundles/org.eclipse.ecf.filetransfer/META-INF/MANIFEST.MF +++ b/framework/bundles/org.eclipse.ecf.filetransfer/META-INF/MANIFEST.MF @@ -3,12 +3,12 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin.name Bundle-SymbolicName: org.eclipse.ecf.filetransfer;singleton:=true Automatic-Module-Name: org.eclipse.ecf.filetransfer -Bundle-Version: 5.0.100.qualifier +Bundle-Version: 5.1.102.qualifier Bundle-Activator: org.eclipse.ecf.internal.filetransfer.Activator Bundle-Vendor: %plugin.provider Eclipse-LazyStart: true Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.ecf.filetransfer;version="5.0.0", org.eclipse.ecf.filetransfer.events;version="5.0.0", org.eclipse.ecf.filetransfer.events.socket;version:="1.0";x-internal:=true, diff --git a/framework/bundles/org.eclipse.ecf.filetransfer/about.html b/framework/bundles/org.eclipse.ecf.filetransfer/about.html index 4c79781a5..9f1dc0dd5 100644 --- a/framework/bundles/org.eclipse.ecf.filetransfer/about.html +++ b/framework/bundles/org.eclipse.ecf.filetransfer/about.html @@ -22,7 +22,7 @@ being redistributed by another party ("Redistributor") and different t apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise indicated below, the terms and conditions of the EPL still apply to any source code in the Content -and such source code may be obtained at <a href="/">http://www.eclipse.org</a>.</p> +and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p> </body> </html>
\ No newline at end of file diff --git a/framework/bundles/org.eclipse.ecf.filetransfer/plugin.properties b/framework/bundles/org.eclipse.ecf.filetransfer/plugin.properties index 37bacc706..6ecb2090d 100644 --- a/framework/bundles/org.eclipse.ecf.filetransfer/plugin.properties +++ b/framework/bundles/org.eclipse.ecf.filetransfer/plugin.properties @@ -1,10 +1,11 @@ ############################################################################ # Copyright (c) 2007 Composent Inc., IBM Corp. and others. -# 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 # +# This program and the accompanying materials are made +# available under the terms of the Eclipse Public License 2.0 +# which is available at https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 ############################################################################ plugin.name=ECF Filetransfer API plugin.provider=Eclipse.org - ECF diff --git a/framework/bundles/org.eclipse.ecf.filetransfer/plugin.xml b/framework/bundles/org.eclipse.ecf.filetransfer/plugin.xml index 57736d6c2..97fee01b6 100644 --- a/framework/bundles/org.eclipse.ecf.filetransfer/plugin.xml +++ b/framework/bundles/org.eclipse.ecf.filetransfer/plugin.xml @@ -2,5 +2,4 @@ <?eclipse version="3.2"?> <plugin> <extension-point id="urlStreamHandlerService" name="URL Stream Handler Service" schema="schema/urlStreamHandlerService.exsd"/> - </plugin> diff --git a/framework/bundles/org.eclipse.ecf.filetransfer/pom.xml b/framework/bundles/org.eclipse.ecf.filetransfer/pom.xml index d92237fae..ebce3c55b 100644 --- a/framework/bundles/org.eclipse.ecf.filetransfer/pom.xml +++ b/framework/bundles/org.eclipse.ecf.filetransfer/pom.xml @@ -8,8 +8,7 @@ <version>1.0.0-SNAPSHOT</version> <relativePath>../../../</relativePath> </parent> - <groupId>org.eclipse.ecf</groupId> <artifactId>org.eclipse.ecf.filetransfer</artifactId> - <version>5.0.100-SNAPSHOT</version> + <version>5.1.102-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/framework/bundles/org.eclipse.ecf.filetransfer/schema/urlStreamHandlerService.exsd b/framework/bundles/org.eclipse.ecf.filetransfer/schema/urlStreamHandlerService.exsd index fd1672e33..8a97130c3 100644 --- a/framework/bundles/org.eclipse.ecf.filetransfer/schema/urlStreamHandlerService.exsd +++ b/framework/bundles/org.eclipse.ecf.filetransfer/schema/urlStreamHandlerService.exsd @@ -1,6 +1,6 @@ <?xml version='1.0' encoding='UTF-8'?> <!-- Schema file written by PDE --> -<schema targetNamespace="org.eclipse.ecf.filetransfer"> +<schema targetNamespace="org.eclipse.ecf.filetransfer" xmlns="http://www.w3.org/2001/XMLSchema"> <annotation> <appInfo> <meta.schema plugin="org.eclipse.ecf.filetransfer" id="urlStreamHandlerService" name="URL Stream Handler Service"/> @@ -53,6 +53,11 @@ Note that the class <code>org.eclipse.ecf.tests.filetransfer.TestURLStream </annotation> <element name="extension"> + <annotation> + <appInfo> + <meta.element /> + </appInfo> + </annotation> <complexType> <sequence minOccurs="1" maxOccurs="unbounded"> <element ref="urlStreamHandlerService"/> @@ -290,7 +295,13 @@ public abstract class AbstractURLStreamHandlerService extends URLStreamHandler </appInfo> <documentation> Copyright (c) 2004 Composent, Inc. and others. -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: Composent, Inc. - initial API and implementation + +This program and the accompanying materials are made +available under the terms of the Eclipse Public License 2.0 +which is available at https://www.eclipse.org/legal/epl-2.0/ + +SPDX-License-Identifier: EPL-2.0 + </documentation> </annotation> diff --git a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/BrowseFileTransferException.java b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/BrowseFileTransferException.java index d64e5d725..324321f04 100644 --- a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/BrowseFileTransferException.java +++ b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/BrowseFileTransferException.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2009 EclipseSource, Inc. 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 - * +/**************************************************************************** + * Copyright (c) 2009 EclipseSource, Inc. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: EclilpseSource, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.filetransfer; import org.eclipse.core.runtime.IStatus; diff --git a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/FileTransferInfo.java b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/FileTransferInfo.java index 6a713e90d..c3cc88e73 100644 --- a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/FileTransferInfo.java +++ b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/FileTransferInfo.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.filetransfer; import java.io.File; @@ -86,7 +89,7 @@ public class FileTransferInfo implements IFileTransferInfo, Serializable { * * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class) */ - public Object getAdapter(Class adapter) { + public <T> T getAdapter(Class<T> adapter) { return null; } diff --git a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/FileTransferJob.java b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/FileTransferJob.java index 259af1fa2..0c2d68666 100644 --- a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/FileTransferJob.java +++ b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/FileTransferJob.java @@ -1,11 +1,13 @@ /**************************************************************************** * Copyright (c) 2008 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: Contributors: Cloudsmith, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.filetransfer; diff --git a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IFileRangeSpecification.java b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IFileRangeSpecification.java index 2a55a5b3f..4a0447c17 100644 --- a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IFileRangeSpecification.java +++ b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IFileRangeSpecification.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2007 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.filetransfer; diff --git a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IFileTransfer.java b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IFileTransfer.java index a1be76d95..30eb41ea5 100644 --- a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IFileTransfer.java +++ b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IFileTransfer.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.filetransfer; import org.eclipse.core.runtime.IAdaptable; diff --git a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IFileTransferInfo.java b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IFileTransferInfo.java index cda42bd31..e08c9a13e 100644 --- a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IFileTransferInfo.java +++ b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IFileTransferInfo.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.filetransfer; import java.io.File; diff --git a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IFileTransferListener.java b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IFileTransferListener.java index 3687b9ab4..7e9961a0f 100644 --- a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IFileTransferListener.java +++ b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IFileTransferListener.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.filetransfer; import org.eclipse.ecf.filetransfer.events.IFileTransferEvent; diff --git a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IFileTransferPausable.java b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IFileTransferPausable.java index f1d573746..3e9b55348 100644 --- a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IFileTransferPausable.java +++ b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IFileTransferPausable.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.filetransfer; /** diff --git a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IFileTransferRateControl.java b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IFileTransferRateControl.java index df48ece75..dfd6e5f31 100644 --- a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IFileTransferRateControl.java +++ b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IFileTransferRateControl.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.filetransfer; /** diff --git a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IFileTransferRunnable.java b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IFileTransferRunnable.java index c0869c685..9770501ce 100644 --- a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IFileTransferRunnable.java +++ b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IFileTransferRunnable.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2008 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.filetransfer; diff --git a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IIncomingFileTransfer.java b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IIncomingFileTransfer.java index 6a9cf088a..ee46d4dab 100644 --- a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IIncomingFileTransfer.java +++ b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IIncomingFileTransfer.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.filetransfer; import java.util.Date; diff --git a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IIncomingFileTransferRequestListener.java b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IIncomingFileTransferRequestListener.java index 1f913ae11..72439428f 100644 --- a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IIncomingFileTransferRequestListener.java +++ b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IIncomingFileTransferRequestListener.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.filetransfer; import org.eclipse.ecf.filetransfer.events.IFileTransferRequestEvent; diff --git a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IOutgoingFileTransfer.java b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IOutgoingFileTransfer.java index c87c61eb2..3595a575e 100644 --- a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IOutgoingFileTransfer.java +++ b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IOutgoingFileTransfer.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.filetransfer; /** diff --git a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IRemoteFile.java b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IRemoteFile.java index bf8a29517..9f949d730 100644 --- a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IRemoteFile.java +++ b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IRemoteFile.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2007 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.filetransfer; diff --git a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IRemoteFileAttributes.java b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IRemoteFileAttributes.java index ebad2974f..1981f0514 100644 --- a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IRemoteFileAttributes.java +++ b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IRemoteFileAttributes.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2007 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.filetransfer; diff --git a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IRemoteFileInfo.java b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IRemoteFileInfo.java index 1826dde0c..1f489a9e3 100644 --- a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IRemoteFileInfo.java +++ b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IRemoteFileInfo.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2007 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.filetransfer; diff --git a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IRemoteFileSystemBrowserContainerAdapter.java b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IRemoteFileSystemBrowserContainerAdapter.java index 057ee3d0d..802c7d908 100644 --- a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IRemoteFileSystemBrowserContainerAdapter.java +++ b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IRemoteFileSystemBrowserContainerAdapter.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2007 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.filetransfer; diff --git a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IRemoteFileSystemListener.java b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IRemoteFileSystemListener.java index 57bd8e779..305e758dc 100644 --- a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IRemoteFileSystemListener.java +++ b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IRemoteFileSystemListener.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2007 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.filetransfer; diff --git a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IRemoteFileSystemRequest.java b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IRemoteFileSystemRequest.java index 77e8e624e..6a3526967 100644 --- a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IRemoteFileSystemRequest.java +++ b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IRemoteFileSystemRequest.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2007 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.filetransfer; diff --git a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IRetrieveFileTransferContainerAdapter.java b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IRetrieveFileTransferContainerAdapter.java index 917556954..eec9d8c91 100644 --- a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IRetrieveFileTransferContainerAdapter.java +++ b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IRetrieveFileTransferContainerAdapter.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.filetransfer; import java.util.Map; diff --git a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IRetrieveFileTransferOptions.java b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IRetrieveFileTransferOptions.java index 68426f2fc..58eb2c579 100644 --- a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IRetrieveFileTransferOptions.java +++ b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IRetrieveFileTransferOptions.java @@ -1,12 +1,15 @@ -/******************************************************************************* -* Copyright (c) 2009 Composent, Inc. and others. 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: -* Composent, Inc. - initial API and implementation -******************************************************************************/ +/**************************************************************************** + * Copyright (c) 2009 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * Contributors: + * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.filetransfer; import java.util.Map; diff --git a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/ISendFileTransferContainerAdapter.java b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/ISendFileTransferContainerAdapter.java index e8041e50c..4d97ccaa1 100644 --- a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/ISendFileTransferContainerAdapter.java +++ b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/ISendFileTransferContainerAdapter.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.filetransfer; import java.io.File; diff --git a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/ISendFileTransferOptions.java b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/ISendFileTransferOptions.java index 344eb0d41..09a4c4d39 100644 --- a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/ISendFileTransferOptions.java +++ b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/ISendFileTransferOptions.java @@ -1,12 +1,15 @@ -/******************************************************************************* -* Copyright (c) 2009 Composent, Inc. and others. 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: -* Composent, Inc. - initial API and implementation -******************************************************************************/ +/**************************************************************************** + * Copyright (c) 2009 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * Contributors: + * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.filetransfer; /** diff --git a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IncomingFileTransferException.java b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IncomingFileTransferException.java index 9655ae9fb..ff1beb114 100644 --- a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IncomingFileTransferException.java +++ b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IncomingFileTransferException.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.filetransfer; import java.util.Map; diff --git a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/InvalidFileRangeSpecificationException.java b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/InvalidFileRangeSpecificationException.java index b67cb44bc..bda248d97 100644 --- a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/InvalidFileRangeSpecificationException.java +++ b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/InvalidFileRangeSpecificationException.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2007 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.filetransfer; diff --git a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/RemoteFileSystemException.java b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/RemoteFileSystemException.java index 492672659..b52d5b4ea 100644 --- a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/RemoteFileSystemException.java +++ b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/RemoteFileSystemException.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2007 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.filetransfer; diff --git a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/SendFileTransferException.java b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/SendFileTransferException.java index 40ed44cf5..5e0534d34 100644 --- a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/SendFileTransferException.java +++ b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/SendFileTransferException.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.filetransfer; import org.eclipse.core.runtime.IStatus; diff --git a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/UserCancelledException.java b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/UserCancelledException.java index 49289db3d..a5359052f 100644 --- a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/UserCancelledException.java +++ b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/UserCancelledException.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc., Peter Nehrer, Boris Bokowski. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc., Peter Nehrer, Boris Bokowski. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.filetransfer; import org.eclipse.core.runtime.IStatus; diff --git a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/IFileTransferConnectStartEvent.java b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/IFileTransferConnectStartEvent.java index 36d8292a1..c931182f6 100644 --- a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/IFileTransferConnectStartEvent.java +++ b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/IFileTransferConnectStartEvent.java @@ -1,13 +1,15 @@ -/******************************************************************************* - * Copyright (c) 2009 IBM, and others. - * 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 +/**************************************************************************** + * Copyright (c) 2009 IBM, and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * IBM Corporation - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.filetransfer.events; diff --git a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/IFileTransferEvent.java b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/IFileTransferEvent.java index bb8437dc2..90aa6687f 100644 --- a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/IFileTransferEvent.java +++ b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/IFileTransferEvent.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.filetransfer.events; import org.eclipse.ecf.core.util.Event; diff --git a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/IFileTransferRequestEvent.java b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/IFileTransferRequestEvent.java index c5e6e55b4..65cca8b35 100644 --- a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/IFileTransferRequestEvent.java +++ b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/IFileTransferRequestEvent.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.filetransfer.events; import java.io.File; diff --git a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/IIncomingFileTransferEvent.java b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/IIncomingFileTransferEvent.java index 8d682344a..d7a9fc8d2 100644 --- a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/IIncomingFileTransferEvent.java +++ b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/IIncomingFileTransferEvent.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.filetransfer.events; import org.eclipse.ecf.filetransfer.IIncomingFileTransfer; diff --git a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/IIncomingFileTransferReceiveDataEvent.java b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/IIncomingFileTransferReceiveDataEvent.java index a9dc75040..9361ebf49 100644 --- a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/IIncomingFileTransferReceiveDataEvent.java +++ b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/IIncomingFileTransferReceiveDataEvent.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.filetransfer.events; import org.eclipse.ecf.filetransfer.IFileTransferListener; diff --git a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/IIncomingFileTransferReceiveDoneEvent.java b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/IIncomingFileTransferReceiveDoneEvent.java index f9124485f..8943b30bf 100644 --- a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/IIncomingFileTransferReceiveDoneEvent.java +++ b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/IIncomingFileTransferReceiveDoneEvent.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.filetransfer.events; import org.eclipse.ecf.filetransfer.UserCancelledException; diff --git a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/IIncomingFileTransferReceivePausedEvent.java b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/IIncomingFileTransferReceivePausedEvent.java index c5b311ee7..b6eae4088 100644 --- a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/IIncomingFileTransferReceivePausedEvent.java +++ b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/IIncomingFileTransferReceivePausedEvent.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.filetransfer.events; /** diff --git a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/IIncomingFileTransferReceiveResumedEvent.java b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/IIncomingFileTransferReceiveResumedEvent.java index 749a2a20f..56b9c3220 100644 --- a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/IIncomingFileTransferReceiveResumedEvent.java +++ b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/IIncomingFileTransferReceiveResumedEvent.java @@ -1,12 +1,15 @@ -/******************************************************************************* - * Copyright (c) 2008 Composent, Inc. 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 - * +/**************************************************************************** + * Copyright (c) 2008 Composent, Inc. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation * Cloudsmith, Inc. - additional API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.filetransfer.events; import java.io.*; diff --git a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/IIncomingFileTransferReceiveStartEvent.java b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/IIncomingFileTransferReceiveStartEvent.java index 60ce0d182..94d854385 100644 --- a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/IIncomingFileTransferReceiveStartEvent.java +++ b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/IIncomingFileTransferReceiveStartEvent.java @@ -1,12 +1,15 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation * Cloudsmith, Inc. - additional API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.filetransfer.events; import java.io.*; diff --git a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/IOutgoingFileTransferEvent.java b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/IOutgoingFileTransferEvent.java index 6636d4f62..6fc9de3d6 100644 --- a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/IOutgoingFileTransferEvent.java +++ b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/IOutgoingFileTransferEvent.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.filetransfer.events; import org.eclipse.ecf.filetransfer.IOutgoingFileTransfer; diff --git a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/IOutgoingFileTransferResponseEvent.java b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/IOutgoingFileTransferResponseEvent.java index 367ca4fc1..6d2ee807e 100644 --- a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/IOutgoingFileTransferResponseEvent.java +++ b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/IOutgoingFileTransferResponseEvent.java @@ -1,12 +1,15 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation * Cloudsmith, Inc. - additional API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.filetransfer.events; import org.eclipse.ecf.filetransfer.*; diff --git a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/IOutgoingFileTransferSendDataEvent.java b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/IOutgoingFileTransferSendDataEvent.java index 130157bc7..534da60a0 100644 --- a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/IOutgoingFileTransferSendDataEvent.java +++ b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/IOutgoingFileTransferSendDataEvent.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.filetransfer.events; import org.eclipse.ecf.filetransfer.IFileTransferListener; diff --git a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/IOutgoingFileTransferSendDoneEvent.java b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/IOutgoingFileTransferSendDoneEvent.java index 86a652e97..0c5aff454 100644 --- a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/IOutgoingFileTransferSendDoneEvent.java +++ b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/IOutgoingFileTransferSendDoneEvent.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.filetransfer.events; import org.eclipse.ecf.filetransfer.IFileTransferListener; diff --git a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/IOutgoingFileTransferSendPausedEvent.java b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/IOutgoingFileTransferSendPausedEvent.java index b556d043a..8db171472 100644 --- a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/IOutgoingFileTransferSendPausedEvent.java +++ b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/IOutgoingFileTransferSendPausedEvent.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2007 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.filetransfer.events; diff --git a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/IOutgoingFileTransferSendResumedEvent.java b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/IOutgoingFileTransferSendResumedEvent.java index 09e9a5d8e..8f426aff3 100644 --- a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/IOutgoingFileTransferSendResumedEvent.java +++ b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/IOutgoingFileTransferSendResumedEvent.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2007 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.filetransfer.events; diff --git a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/IRemoteFileSystemBrowseEvent.java b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/IRemoteFileSystemBrowseEvent.java index 6a4b598d1..8c0a695dc 100644 --- a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/IRemoteFileSystemBrowseEvent.java +++ b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/IRemoteFileSystemBrowseEvent.java @@ -1,13 +1,15 @@ /**************************************************************************** * Copyright (c) 2007, 2009 Composent, Inc., IBM and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation * Henrich Kraemer - bug 263613, [transport] Update site contacting / downloading is not cancelable + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.filetransfer.events; diff --git a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/IRemoteFileSystemEvent.java b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/IRemoteFileSystemEvent.java index 5f5ae6a30..9200089c4 100644 --- a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/IRemoteFileSystemEvent.java +++ b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/IRemoteFileSystemEvent.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2007 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.filetransfer.events; diff --git a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/socket/ISocketClosedEvent.java b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/socket/ISocketClosedEvent.java index 98a90eb3e..9553ee4ff 100644 --- a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/socket/ISocketClosedEvent.java +++ b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/socket/ISocketClosedEvent.java @@ -1,13 +1,15 @@ -/******************************************************************************* +/**************************************************************************** * Copyright (c) 2009 IBM Corporation and others. - * 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 - * + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: * IBM Corporation - initial API and implementation - *******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.filetransfer.events.socket; diff --git a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/socket/ISocketConnectedEvent.java b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/socket/ISocketConnectedEvent.java index 2b421a5ec..8d0e0f017 100644 --- a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/socket/ISocketConnectedEvent.java +++ b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/socket/ISocketConnectedEvent.java @@ -1,13 +1,15 @@ -/******************************************************************************* +/**************************************************************************** * Copyright (c) 2009 IBM Corporation and others. - * 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 - * + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: * IBM Corporation - initial API and implementation - *******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.filetransfer.events.socket; import java.net.Socket; diff --git a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/socket/ISocketCreatedEvent.java b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/socket/ISocketCreatedEvent.java index 869dc9ca7..451660584 100644 --- a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/socket/ISocketCreatedEvent.java +++ b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/socket/ISocketCreatedEvent.java @@ -1,13 +1,15 @@ -/******************************************************************************* +/**************************************************************************** * Copyright (c) 2009 IBM Corporation and others. - * 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 - * + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: * IBM Corporation - initial API and implementation - *******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.filetransfer.events.socket; /** diff --git a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/socket/ISocketEvent.java b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/socket/ISocketEvent.java index cad455ed9..20f0806cd 100644 --- a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/socket/ISocketEvent.java +++ b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/socket/ISocketEvent.java @@ -1,13 +1,15 @@ -/******************************************************************************* +/**************************************************************************** * Copyright (c) 2009 IBM Corporation and others. - * 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 - * + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: * IBM Corporation - initial API and implementation - *******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.filetransfer.events.socket; import java.net.Socket; diff --git a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/socket/ISocketEventSource.java b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/socket/ISocketEventSource.java index 6d8759bcc..6da114d9a 100644 --- a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/socket/ISocketEventSource.java +++ b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/socket/ISocketEventSource.java @@ -1,13 +1,15 @@ -/******************************************************************************* -* Copyright (c) 2009 IBM, and others. -* 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: -* IBM Corporation - initial API and implementation -******************************************************************************/ +/**************************************************************************** + * Copyright (c) 2009 IBM, and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * Contributors: + * IBM Corporation - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.filetransfer.events.socket; diff --git a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/socket/ISocketListener.java b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/socket/ISocketListener.java index 2c802781c..efcc1725d 100644 --- a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/socket/ISocketListener.java +++ b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/socket/ISocketListener.java @@ -1,13 +1,15 @@ -/******************************************************************************* -* Copyright (c) 2009 IBM, and others. -* 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: -* IBM Corporation - initial API and implementation -******************************************************************************/ +/**************************************************************************** + * Copyright (c) 2009 IBM, and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * Contributors: + * IBM Corporation - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.filetransfer.events.socket; diff --git a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/socketfactory/INonconnectedSocketFactory.java b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/socketfactory/INonconnectedSocketFactory.java index 5d88216e2..0aea06995 100644 --- a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/socketfactory/INonconnectedSocketFactory.java +++ b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/socketfactory/INonconnectedSocketFactory.java @@ -1,13 +1,15 @@ -/******************************************************************************* -* Copyright (c) 2009 IBM, and others. -* 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: -* IBM Corporation - initial API and implementation -******************************************************************************/ +/**************************************************************************** + * Copyright (c) 2009 IBM, and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * Contributors: + * IBM Corporation - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.filetransfer.events.socketfactory; diff --git a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/identity/FileCreateException.java b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/identity/FileCreateException.java index d4fc07e2f..f0e767195 100644 --- a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/identity/FileCreateException.java +++ b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/identity/FileCreateException.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.filetransfer.identity; import org.eclipse.core.runtime.IStatus; diff --git a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/identity/FileIDFactory.java b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/identity/FileIDFactory.java index 107c51721..959b78345 100644 --- a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/identity/FileIDFactory.java +++ b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/identity/FileIDFactory.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.filetransfer.identity; import java.net.URI; diff --git a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/identity/IFileID.java b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/identity/IFileID.java index b70aa8d09..16eb5ffcf 100644 --- a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/identity/IFileID.java +++ b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/identity/IFileID.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.filetransfer.identity; import java.net.*; diff --git a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/identity/IFileIDFactory.java b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/identity/IFileIDFactory.java index 917c7d82b..240e68e4f 100644 --- a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/identity/IFileIDFactory.java +++ b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/identity/IFileIDFactory.java @@ -1,12 +1,15 @@ -/******************************************************************************* -* Copyright (c) 2010 Composent, Inc. and others. 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: -* Composent, Inc. - initial API and implementation -******************************************************************************/ +/**************************************************************************** + * Copyright (c) 2010 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * Contributors: + * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.filetransfer.identity; import java.net.URI; diff --git a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/service/IRemoteFileSystemBrowser.java b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/service/IRemoteFileSystemBrowser.java index 77dbbf1e8..ffa3ddbcf 100644 --- a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/service/IRemoteFileSystemBrowser.java +++ b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/service/IRemoteFileSystemBrowser.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2007 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.filetransfer.service; diff --git a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/service/IRemoteFileSystemBrowserFactory.java b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/service/IRemoteFileSystemBrowserFactory.java index d6bd41d90..edfa47c21 100644 --- a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/service/IRemoteFileSystemBrowserFactory.java +++ b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/service/IRemoteFileSystemBrowserFactory.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.filetransfer.service; diff --git a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/service/IRetrieveFileTransfer.java b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/service/IRetrieveFileTransfer.java index 61193af1a..a0f7cd418 100644 --- a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/service/IRetrieveFileTransfer.java +++ b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/service/IRetrieveFileTransfer.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.filetransfer.service; diff --git a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/service/IRetrieveFileTransferFactory.java b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/service/IRetrieveFileTransferFactory.java index 73da79b72..50c0b6648 100644 --- a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/service/IRetrieveFileTransferFactory.java +++ b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/service/IRetrieveFileTransferFactory.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.filetransfer.service; diff --git a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/service/ISendFileTransfer.java b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/service/ISendFileTransfer.java index 260b48c1a..b9cd2cb3b 100644 --- a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/service/ISendFileTransfer.java +++ b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/service/ISendFileTransfer.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.filetransfer.service; diff --git a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/service/ISendFileTransferFactory.java b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/service/ISendFileTransferFactory.java index f2be5ee7d..e5b510848 100644 --- a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/service/ISendFileTransferFactory.java +++ b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/service/ISendFileTransferFactory.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.filetransfer.service; diff --git a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/internal/filetransfer/Activator.java b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/internal/filetransfer/Activator.java index 928c8fb82..98046025f 100644 --- a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/internal/filetransfer/Activator.java +++ b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/internal/filetransfer/Activator.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.internal.filetransfer; import java.util.Hashtable; @@ -91,13 +94,13 @@ public class Activator implements BundleActivator { } IConfigurationElement[] configurationElements = extensionPoint.getConfigurationElements(); - for (int i = 0; i < configurationElements.length; i++) { + for (IConfigurationElement configurationElement : configurationElements) { AbstractURLStreamHandlerService svc = null; String protocol = null; try { - svc = (AbstractURLStreamHandlerService) configurationElements[i].createExecutableExtension(SERVICE_CLASS_ATTRIBUTE); - protocol = configurationElements[i].getAttribute(PROTOCOL_ATTRIBUTE); - } catch (CoreException e) { + svc = (AbstractURLStreamHandlerService) configurationElement.createExecutableExtension(SERVICE_CLASS_ATTRIBUTE); + protocol = configurationElement.getAttribute(PROTOCOL_ATTRIBUTE); + }catch (CoreException e) { log(e.getStatus()); } if (svc != null && protocol != null) { diff --git a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/internal/filetransfer/FileTransferDebugOptions.java b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/internal/filetransfer/FileTransferDebugOptions.java index af8a54690..5ce1a228a 100644 --- a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/internal/filetransfer/FileTransferDebugOptions.java +++ b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/internal/filetransfer/FileTransferDebugOptions.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.internal.filetransfer; public interface FileTransferDebugOptions { diff --git a/framework/bundles/org.eclipse.ecf.identity/.settings/.api_filters b/framework/bundles/org.eclipse.ecf.identity/.settings/.api_filters deleted file mode 100644 index c27d72407..000000000 --- a/framework/bundles/org.eclipse.ecf.identity/.settings/.api_filters +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<component id="org.eclipse.ecf.identity" version="2"> - <resource path="src_r7stubs/org/osgi/service/log/Logger.java" type="org.osgi.service.log.Logger"> - <filter comment="Logger only for backward compatibility. No @since needed" id="1110441988"> - <message_arguments> - <message_argument value="org.osgi.service.log.Logger"/> - </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 9917f9f36..b04c5b4a6 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,3 +1,4 @@ +ANNOTATION_ELEMENT_TYPE_ADDED_FIELD=Error ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error @@ -10,6 +11,7 @@ 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_FIELD=Error CLASS_ELEMENT_TYPE_ADDED_METHOD=Error CLASS_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error @@ -49,6 +51,7 @@ ILLEGAL_IMPLEMENT=Warning ILLEGAL_INSTANTIATE=Warning ILLEGAL_OVERRIDE=Warning ILLEGAL_REFERENCE=Warning +INTERFACE_ELEMENT_TYPE_ADDED_DEFAULT_METHOD=Error INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Error INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error INTERFACE_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error @@ -60,11 +63,12 @@ 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_ANNOTATION=Ignore INVALID_JAVADOC_TAG=Ignore INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Error LEAK_EXTEND=Warning LEAK_FIELD_DECL=Warning -LEAK_IMPLEMENT=Warning +LEAK_IMPLEMENT=Ignore LEAK_METHOD_PARAM=Warning LEAK_METHOD_RETURN_TYPE=Warning METHOD_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error @@ -86,10 +90,13 @@ 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 +changed_execution_env=Error 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 +incompatible_api_component_version_report_major_without_breaking_change=Warning +incompatible_api_component_version_report_minor_without_api_change=Warning invalid_since_tag_version=Error malformed_since_tag=Error missing_since_tag=Error diff --git a/framework/bundles/org.eclipse.ecf.identity/.settings/org.eclipse.pde.prefs b/framework/bundles/org.eclipse.ecf.identity/.settings/org.eclipse.pde.prefs new file mode 100644 index 000000000..3fceff740 --- /dev/null +++ b/framework/bundles/org.eclipse.ecf.identity/.settings/org.eclipse.pde.prefs @@ -0,0 +1,35 @@ +compilers.f.unresolved-features=1 +compilers.f.unresolved-plugins=1 +compilers.incompatible-environment=1 +compilers.p.build=1 +compilers.p.build.bin.includes=1 +compilers.p.build.encodings=2 +compilers.p.build.java.compiler=2 +compilers.p.build.java.compliance=1 +compilers.p.build.missing.output=2 +compilers.p.build.output.library=1 +compilers.p.build.source.library=2 +compilers.p.build.src.includes=1 +compilers.p.deprecated=1 +compilers.p.discouraged-class=1 +compilers.p.exec-env-too-low=2 +compilers.p.internal=1 +compilers.p.missing-packages=2 +compilers.p.missing-version-export-package=2 +compilers.p.missing-version-import-package=2 +compilers.p.missing-version-require-bundle=2 +compilers.p.no-required-att=0 +compilers.p.no.automatic.module=1 +compilers.p.not-externalized-att=2 +compilers.p.service.component.without.lazyactivation=1 +compilers.p.unknown-attribute=1 +compilers.p.unknown-class=1 +compilers.p.unknown-element=1 +compilers.p.unknown-identifier=1 +compilers.p.unknown-resource=1 +compilers.p.unresolved-ex-points=0 +compilers.p.unresolved-import=0 +compilers.s.create-docs=false +compilers.s.doc-folder=doc +compilers.s.open-tags=1 +eclipse.preferences.version=1 diff --git a/framework/bundles/org.eclipse.ecf.identity/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.identity/META-INF/MANIFEST.MF index 261068879..8671baec9 100644 --- a/framework/bundles/org.eclipse.ecf.identity/META-INF/MANIFEST.MF +++ b/framework/bundles/org.eclipse.ecf.identity/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin.name Bundle-SymbolicName: org.eclipse.ecf.identity;singleton:=true Automatic-Module-Name: org.eclipse.ecf.identity -Bundle-Version: 3.9.1.qualifier +Bundle-Version: 3.9.402.qualifier Bundle-Activator: org.eclipse.ecf.internal.core.identity.Activator Bundle-Localization: plugin Bundle-Vendor: %plugin.provider diff --git a/framework/bundles/org.eclipse.ecf.identity/about.html b/framework/bundles/org.eclipse.ecf.identity/about.html index 4c79781a5..9f1dc0dd5 100644 --- a/framework/bundles/org.eclipse.ecf.identity/about.html +++ b/framework/bundles/org.eclipse.ecf.identity/about.html @@ -22,7 +22,7 @@ being redistributed by another party ("Redistributor") and different t apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise indicated below, the terms and conditions of the EPL still apply to any source code in the Content -and such source code may be obtained at <a href="/">http://www.eclipse.org</a>.</p> +and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p> </body> </html>
\ No newline at end of file diff --git a/framework/bundles/org.eclipse.ecf.identity/build.properties b/framework/bundles/org.eclipse.ecf.identity/build.properties index 48b7df20c..a03b689c7 100644 --- a/framework/bundles/org.eclipse.ecf.identity/build.properties +++ b/framework/bundles/org.eclipse.ecf.identity/build.properties @@ -1,13 +1,12 @@ -############################################################################### +############################################################################ # Copyright (c) 2004, 2006. Composent, Inc. and others. -# 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: -# Composent Inc. - initial API and implementation -############################################################################### +# +# This program and the accompanying materials are made +# available under the terms of the Eclipse Public License 2.0 +# which is available at https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 +############################################################################ source.. = src/ source.r7stubs.jar = src_r7stubs/ output.. = bin/ diff --git a/framework/bundles/org.eclipse.ecf.identity/plugin.properties b/framework/bundles/org.eclipse.ecf.identity/plugin.properties index ee9c0bc8c..b74244cd2 100644 --- a/framework/bundles/org.eclipse.ecf.identity/plugin.properties +++ b/framework/bundles/org.eclipse.ecf.identity/plugin.properties @@ -1,10 +1,11 @@ ############################################################################ # Copyright (c) 2007 Composent Inc., IBM Corp. and others. -# 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 # +# This program and the accompanying materials are made +# available under the terms of the Eclipse Public License 2.0 +# which is available at https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 ############################################################################ plugin.name=ECF Identity Core API plugin.provider=Eclipse.org - ECF diff --git a/framework/bundles/org.eclipse.ecf.identity/pom.xml b/framework/bundles/org.eclipse.ecf.identity/pom.xml index 4deca35e3..15202adf1 100644 --- a/framework/bundles/org.eclipse.ecf.identity/pom.xml +++ b/framework/bundles/org.eclipse.ecf.identity/pom.xml @@ -10,6 +10,6 @@ </parent> <groupId>org.eclipse.ecf</groupId> <artifactId>org.eclipse.ecf.identity</artifactId> - <version>3.9.1-SNAPSHOT</version> + <version>3.9.402-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/framework/bundles/org.eclipse.ecf.identity/schema/namespace.exsd b/framework/bundles/org.eclipse.ecf.identity/schema/namespace.exsd index 02564e3cc..5e271dd0a 100644 --- a/framework/bundles/org.eclipse.ecf.identity/schema/namespace.exsd +++ b/framework/bundles/org.eclipse.ecf.identity/schema/namespace.exsd @@ -1,6 +1,6 @@ <?xml version='1.0' encoding='UTF-8'?> <!-- Schema file written by PDE --> -<schema targetNamespace="org.eclipse.ecf.identity"> +<schema targetNamespace="org.eclipse.ecf.identity" xmlns="http://www.w3.org/2001/XMLSchema"> <annotation> <appInfo> <meta.schema plugin="org.eclipse.ecf.identity" id="namespace" name="ECF Namespace"/> @@ -13,6 +13,11 @@ Plugins implementing this extension point must define a Namespace class that ext </annotation> <element name="extension"> + <annotation> + <appInfo> + <meta.element /> + </appInfo> + </annotation> <complexType> <sequence> <element ref="namespace" minOccurs="1" maxOccurs="unbounded"/> @@ -180,7 +185,13 @@ ID newID = org.eclipse.ecf.core.identity.IDFactory.createGUID(16); </appInfo> <documentation> Copyright (c) 2004 Composent, Inc. and others. -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: Composent, Inc. - initial API and implementation + +This program and the accompanying materials are made +available under the terms of the Eclipse Public License 2.0 +which is available at https://www.eclipse.org/legal/epl-2.0/ + +SPDX-License-Identifier: EPL-2.0 + </documentation> </annotation> diff --git a/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/BaseID.java b/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/BaseID.java index 1630a79b3..c7b5ce56f 100644 --- a/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/BaseID.java +++ b/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/BaseID.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.identity; import org.eclipse.core.runtime.Assert; diff --git a/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/GUID.java b/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/GUID.java index 666ea7239..ea91de606 100644 --- a/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/GUID.java +++ b/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/GUID.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.identity; import java.security.SecureRandom; @@ -154,7 +157,7 @@ public class GUID extends StringID { } public String toString() { - StringBuffer sb = new StringBuffer("GUID["); //$NON-NLS-1$ + StringBuilder sb = new StringBuilder("GUID["); //$NON-NLS-1$ sb.append(value).append("]"); //$NON-NLS-1$ return sb.toString(); } diff --git a/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/ID.java b/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/ID.java index 6704290a6..d23fcba4e 100644 --- a/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/ID.java +++ b/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/ID.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.identity; import org.eclipse.core.runtime.IAdaptable; diff --git a/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/IDCreateException.java b/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/IDCreateException.java index 0b70f22a3..60979f638 100644 --- a/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/IDCreateException.java +++ b/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/IDCreateException.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.identity; import org.eclipse.core.runtime.IStatus; diff --git a/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/IDFactory.java b/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/IDFactory.java index 1ff885d4f..d4eb482c3 100644 --- a/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/IDFactory.java +++ b/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/IDFactory.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.identity; import java.net.URI; @@ -20,8 +23,7 @@ import org.eclipse.ecf.internal.core.identity.Activator; * */ public class IDFactory implements IIDFactory { - public static final String SECURITY_PROPERTY = IDFactory.class.getName() - + ".security"; //$NON-NLS-1$ + public static final String SECURITY_PROPERTY = IDFactory.class.getName() + ".security"; //$NON-NLS-1$ private static Hashtable<String, Namespace> namespaces = new Hashtable<String, Namespace>(); @@ -74,8 +76,7 @@ public class IDFactory implements IIDFactory { return (Namespace) namespaces.put(namespace.getName(), namespace); } - protected final static void checkPermission( - NamespacePermission namespacepermission) throws SecurityException { + protected final static void checkPermission(NamespacePermission namespacepermission) throws SecurityException { } /* @@ -85,8 +86,7 @@ public class IDFactory implements IIDFactory { * org.eclipse.ecf.core.identity.IIDFactory#containsNamespace(org.eclipse * .ecf.core.identity.Namespace) */ - public boolean containsNamespace(Namespace namespace) - throws SecurityException { + public boolean containsNamespace(Namespace namespace) throws SecurityException { if (namespace == null) return false; initialize(); @@ -162,12 +162,10 @@ public class IDFactory implements IIDFactory { * @see org.eclipse.ecf.core.identity.IIDFactory#createGUID(int) */ public ID createGUID(int length) throws IDCreateException { - return createID(new GUID.GUIDNamespace(), new Integer[] { new Integer( - length) }); + return createID(new GUID.GUIDNamespace(), new Integer[] { Integer.valueOf(length) }); } - protected static void logAndThrow(String s, Throwable t) - throws IDCreateException { + protected static void logAndThrow(String s, Throwable t) throws IDCreateException { IDCreateException e = null; if (t != null) { e = new IDCreateException(s + ": " + t.getClass().getName() + ": " //$NON-NLS-1$ //$NON-NLS-2$ @@ -175,9 +173,7 @@ public class IDFactory implements IIDFactory { } else { e = new IDCreateException(s); } - Activator.getDefault().log( - new Status(IStatus.ERROR, Activator.PLUGIN_ID, IStatus.ERROR, - s, e)); + Activator.getDefault().log(new Status(IStatus.ERROR, Activator.PLUGIN_ID, IStatus.ERROR, s, e)); throw e; } @@ -207,17 +203,14 @@ public class IDFactory implements IIDFactory { * @see org.eclipse.ecf.core.identity.IIDFactory#createID(java.lang.String, * java.lang.Object[]) */ - public ID createID(String namespaceName, Object[] args) - throws IDCreateException { + public ID createID(String namespaceName, Object[] args) throws IDCreateException { Namespace n = getNamespaceByName(namespaceName); if (n == null) - throw new IDCreateException( - "Namespace " + namespaceName + " not found"); //$NON-NLS-1$ + throw new IDCreateException("Namespace " + namespaceName + " not found"); //$NON-NLS-1$ return createID(n, args); } - public ID createID(Namespace namespace, String uri) - throws IDCreateException { + public ID createID(Namespace namespace, String uri) throws IDCreateException { return createID(namespace, new Object[] { uri }); } @@ -234,8 +227,7 @@ public class IDFactory implements IIDFactory { public ID createStringID(String idstring) throws IDCreateException { if (idstring == null) throw new IDCreateException("StringID cannot be null"); //$NON-NLS-1$ - return createID(new StringID.StringIDNamespace(), - new String[] { idstring }); + return createID(new StringID.StringIDNamespace(), new String[] { idstring }); } /* @@ -244,7 +236,7 @@ public class IDFactory implements IIDFactory { * @see org.eclipse.ecf.core.identity.IIDFactory#createLongID(long) */ public ID createLongID(long l) throws IDCreateException { - return createID(new LongID.LongNamespace(), new Long[] { new Long(l) }); + return createID(new LongID.LongNamespace(), new Long[] { Long.valueOf(l) }); } /* @@ -311,4 +303,4 @@ public class IDFactory implements IIDFactory { public ID createUuID() throws IDCreateException { return createID(new UuID.UuIDNamespace(), (Object[]) null); } -}
\ No newline at end of file +} diff --git a/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/IIDFactory.java b/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/IIDFactory.java index 7619e2901..23543a8e6 100644 --- a/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/IIDFactory.java +++ b/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/IIDFactory.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.identity; import java.net.URI; diff --git a/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/IIdentifiable.java b/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/IIdentifiable.java index 288ae937f..8cb4a4d8a 100644 --- a/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/IIdentifiable.java +++ b/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/IIdentifiable.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.identity; /** diff --git a/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/IResourceID.java b/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/IResourceID.java index d86ad1c97..0f5d6ac61 100644 --- a/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/IResourceID.java +++ b/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/IResourceID.java @@ -1,12 +1,15 @@ -/******************************************************************************* - * Copyright (c) 2009 EclipseSource and others. 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 +/**************************************************************************** + * Copyright (c) 2009 EclipseSource and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * EclipseSource - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.identity; import java.net.URI; diff --git a/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/LongID.java b/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/LongID.java index 52271c18e..08c078a4e 100644 --- a/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/LongID.java +++ b/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/LongID.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.identity; /** @@ -25,11 +28,9 @@ public class LongID extends BaseID { } /** - * @param args - * must not be <code>null></code> + * @param args must not be <code>null></code> * @return ID created. Will not be <code>null</code>. - * @throws IDCreateException - * never thrown + * @throws IDCreateException never thrown */ public ID createInstance(Object[] args) throws IDCreateException { try { @@ -71,7 +72,7 @@ public class LongID extends BaseID { protected LongID(Namespace n, long v) { super(n); - value = new Long(v); + value = Long.valueOf(v); } protected int namespaceCompareTo(BaseID o) { @@ -99,7 +100,7 @@ public class LongID extends BaseID { } public String toString() { - StringBuffer sb = new StringBuffer("LongID["); //$NON-NLS-1$ + StringBuilder sb = new StringBuilder("LongID["); //$NON-NLS-1$ sb.append(value).append("]"); //$NON-NLS-1$ return sb.toString(); diff --git a/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/Namespace.java b/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/Namespace.java index f13ba0e97..71221c75b 100644 --- a/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/Namespace.java +++ b/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/Namespace.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.identity; import java.io.Serializable; @@ -316,7 +319,7 @@ public abstract class Namespace implements Serializable, IAdaptable { } public String toString() { - StringBuffer b = new StringBuffer("Namespace["); //$NON-NLS-1$ + StringBuilder b = new StringBuilder("Namespace["); //$NON-NLS-1$ b.append("name=").append(name).append(";"); //$NON-NLS-1$ //$NON-NLS-2$ b.append("scheme=").append(getScheme()).append(";"); //$NON-NLS-1$ //$NON-NLS-2$ b.append("description=").append("]"); //$NON-NLS-1$ //$NON-NLS-2$ diff --git a/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/NamespacePermission.java b/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/NamespacePermission.java index b93dcacac..e2f4d6f82 100644 --- a/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/NamespacePermission.java +++ b/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/NamespacePermission.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.identity; import java.security.BasicPermission; diff --git a/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/StringID.java b/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/StringID.java index e5e1d8220..3996a5516 100644 --- a/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/StringID.java +++ b/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/StringID.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.identity; /** @@ -108,7 +111,7 @@ public class StringID extends BaseID { public String toString() { setEmptyNamespace(); int strlen = value.length(); - StringBuffer sb = new StringBuffer(strlen + 10); + StringBuilder sb = new StringBuilder(strlen + 10); sb.insert(0, "StringID[").insert(9, value).insert(strlen + 9, ']'); //$NON-NLS-1$ return sb.toString(); } diff --git a/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/URIID.java b/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/URIID.java index ea19005e3..7acda187c 100644 --- a/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/URIID.java +++ b/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/URIID.java @@ -1,12 +1,15 @@ -/******************************************************************************* - * Copyright (c) 2011 Composent and others. 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 +/**************************************************************************** + * Copyright (c) 2011 Composent and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * EclipseSource - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.identity; import java.net.URI; diff --git a/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/UuID.java b/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/UuID.java index 8ce1b6559..26fefee15 100644 --- a/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/UuID.java +++ b/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/UuID.java @@ -1,12 +1,15 @@ -/******************************************************************************* - * Copyright (c) 2015 Composent and others. 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 +/**************************************************************************** + * Copyright (c) 2015 Composent and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Scott Lewis - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.identity; import java.net.URI; diff --git a/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/util/AbstractFactory.java b/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/util/AbstractFactory.java index 4f3f1756c..2d458b23f 100644 --- a/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/util/AbstractFactory.java +++ b/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/util/AbstractFactory.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.util; public class AbstractFactory { diff --git a/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/util/AdapterManagerTracker.java b/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/util/AdapterManagerTracker.java index d9148e5b1..ab39e8249 100644 --- a/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/util/AdapterManagerTracker.java +++ b/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/util/AdapterManagerTracker.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2014 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2014 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.util; import org.eclipse.core.runtime.IAdapterManager; diff --git a/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/util/Base64.java b/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/util/Base64.java index 253192b8e..05a1f1518 100644 --- a/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/util/Base64.java +++ b/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/util/Base64.java @@ -1,14 +1,16 @@ -/******************************************************************************* +/**************************************************************************** * Copyright (c) 2008 IBM Corporation and others. - * 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 - * + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: * IBM Corporation - initial API and implementation * Composent, Inc. - enhanced API - *******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.util; import java.io.UnsupportedEncodingException; diff --git a/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/util/BundleStarter.java b/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/util/BundleStarter.java index aea2fbdc4..93bdf42f8 100644 --- a/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/util/BundleStarter.java +++ b/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/util/BundleStarter.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2018 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2018 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.util; import java.util.Arrays; diff --git a/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/util/ECFException.java b/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/util/ECFException.java index 74550a2b4..2f82fda9c 100644 --- a/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/util/ECFException.java +++ b/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/util/ECFException.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.util; import org.eclipse.core.runtime.CoreException; diff --git a/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/util/ECFRuntimeException.java b/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/util/ECFRuntimeException.java index 6ef0a7e6d..c6055eaab 100644 --- a/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/util/ECFRuntimeException.java +++ b/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/util/ECFRuntimeException.java @@ -1,13 +1,15 @@ -/******************************************************************************* +/**************************************************************************** * Copyright (c) 2008 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Markus Kuppe (mkuppe <at> versant <dot> com) - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.util; diff --git a/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/util/ExtensionRegistryRunnable.java b/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/util/ExtensionRegistryRunnable.java index 9f3942d8e..194924817 100644 --- a/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/util/ExtensionRegistryRunnable.java +++ b/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/util/ExtensionRegistryRunnable.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2014 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2014 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.util; import org.eclipse.core.runtime.*; diff --git a/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/util/IDFactoryTracker.java b/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/util/IDFactoryTracker.java index dd329f369..333c9fa72 100644 --- a/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/util/IDFactoryTracker.java +++ b/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/util/IDFactoryTracker.java @@ -1,12 +1,15 @@ -/******************************************************************************* - * Copyright (c) 2009 EclipseSource and others. 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 +/**************************************************************************** + * Copyright (c) 2009 EclipseSource and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * EclipseSource - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.util; import org.eclipse.ecf.core.identity.IIDFactory; diff --git a/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/util/LogHelper.java b/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/util/LogHelper.java index a612db6d3..c08b945d9 100644 --- a/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/util/LogHelper.java +++ b/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/util/LogHelper.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.core.util; @@ -42,7 +44,7 @@ public class LogHelper { public static String getLogMessage(IStatus status) { if (status == null) return ""; //$NON-NLS-1$ - StringBuffer buf = new StringBuffer(status.getClass().getName() + '['); + StringBuilder buf = new StringBuilder(status.getClass().getName() + '['); buf.append("plugin=").append(status.getPlugin()); //$NON-NLS-1$ buf.append(";code=").append(status.getCode()); //$NON-NLS-1$ buf.append(";message=").append(status.getMessage()); //$NON-NLS-1$ diff --git a/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/util/PlatformHelper.java b/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/util/PlatformHelper.java index 1e0e4dcee..b6b8998bd 100644 --- a/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/util/PlatformHelper.java +++ b/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/util/PlatformHelper.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.core.util; @@ -41,12 +43,13 @@ public class PlatformHelper { if (c != null) { Bundle[] bundles = c.getBundles(); Bundle coreRuntime = null; - for (int i = 0; i < bundles.length; i++) - if (bundles[i].getSymbolicName().equals("org.eclipse.core.runtime")) { //$NON-NLS-1$ - coreRuntime = bundles[i]; + for (Bundle bundle : bundles) { + if (bundle.getSymbolicName().equals("org.eclipse.core.runtime")) { //$NON-NLS-1$ + coreRuntime = bundle; platformClass = coreRuntime.loadClass("org.eclipse.core.runtime.Platform"); //$NON-NLS-1$ break; } + } } } catch (Exception e) { // Platform not available...just leave platformClass == null and diff --git a/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/util/StringUtils.java b/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/util/StringUtils.java index d8f4a5ff2..0da7507c4 100644 --- a/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/util/StringUtils.java +++ b/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/util/StringUtils.java @@ -1,13 +1,15 @@ -/******************************************************************************* +/**************************************************************************** * Copyright (c) 2005, 2007 Remy Suen - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Remy Suen <remy.suen@gmail.com> - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.util; import java.util.ArrayList; @@ -221,7 +223,7 @@ public final class StringUtils { * @return true if the target is contained within the string. */ public static boolean contains(String string, String target) { - return (string.indexOf(target) != -1); + return (string.contains(target)); } /** diff --git a/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/util/SystemLogService.java b/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/util/SystemLogService.java index 33eb9c568..636ffbe65 100644 --- a/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/util/SystemLogService.java +++ b/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/util/SystemLogService.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2007, 2018 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.core.util; diff --git a/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/util/Trace.java b/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/util/Trace.java index 397601788..f4612dabf 100644 --- a/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/util/Trace.java +++ b/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/util/Trace.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.util; import java.text.SimpleDateFormat; @@ -20,23 +23,20 @@ import org.eclipse.osgi.service.debug.DebugOptions; */ public class Trace { - private static final boolean TRACEALL = new Boolean(System.getProperty( - "org.eclipse.ecf.core.util.traceAll", "false")); + private static final boolean TRACEALL = Boolean + .getBoolean(System.getProperty("org.eclipse.ecf.core.util.traceAll", "false")); private static final List<String> TRACE_BUNDLES = new ArrayList<String>(); static { if (!TRACEALL) { - String tracePlugins = System - .getProperty("org.eclipse.ecf.core.util.traceBundles"); + String tracePlugins = System.getProperty("org.eclipse.ecf.core.util.traceBundles"); if (tracePlugins != null) try { String[] plugins = tracePlugins.split(","); - for (String s : plugins) - TRACE_BUNDLES.add(s); + TRACE_BUNDLES.addAll(Arrays.asList(plugins)); } catch (Exception e) { - System.err - .println("Unexpected exception in Trace class static initializer"); + System.err.println("Unexpected exception in Trace class static initializer"); e.printStackTrace(System.err); } } @@ -149,9 +149,8 @@ public class Trace { * specified plug-in. * * @return Whether tracing is enabled for the plug-in. - * @param pluginId - * The symbolic plugin id for which to determine trace - * enablement. + * @param pluginId The symbolic plugin id for which to determine trace + * enablement. * */ protected static boolean shouldTrace(String pluginId) { @@ -176,10 +175,8 @@ public class Trace { * specified debug option of the specified plug-in. * * @return Whether tracing is enabled for the debug option of the plug-in. - * @param pluginId - * The plug-in for which to determine trace enablement. - * @param option - * The debug option for which to determine trace enablement. + * @param pluginId The plug-in for which to determine trace enablement. + * @param option The debug option for which to determine trace enablement. * */ public static boolean shouldTrace(String pluginId, String option) { @@ -208,8 +205,8 @@ public class Trace { * Retrieves a textual representation of the specified argument. * * @return A textual representation of the specified argument. - * @param argument - * The argument for which to retrieve a textual representation. + * @param argument The argument for which to retrieve a textual + * representation. * */ public static String getArgumentString(Object argument) { @@ -223,7 +220,7 @@ public class Trace { } private static String getStringFromByteArray(byte[] bytes) { - StringBuffer buf = new StringBuffer("["); //$NON-NLS-1$ + StringBuilder buf = new StringBuilder("["); //$NON-NLS-1$ for (int i = 0; i < bytes.length; i++) { buf.append(bytes[i]); if (i == (bytes.length - 1)) @@ -238,14 +235,14 @@ public class Trace { * Retrieves a textual representation of the specified arguments. * * @return A textual representation of the specified arguments. - * @param arguments - * The arguments for which to retrieve a textual representation. + * @param arguments The arguments for which to retrieve a textual + * representation. * */ public static String getArgumentsString(Object[] arguments) { if (arguments == null) return "[]"; //$NON-NLS-1$ - StringBuffer buffer = new StringBuffer("["); //$NON-NLS-1$ + StringBuilder buffer = new StringBuilder("["); //$NON-NLS-1$ for (int i = 0; i < arguments.length; i++) { buffer.append(getArgumentString(arguments[i])); @@ -260,14 +257,12 @@ public class Trace { /** * Traces the specified message. * - * @param message - * The message to be traced. + * @param message The message to be traced. * */ protected static void trace(String message) { - StringBuffer buf = new StringBuffer(PARENTHESIS_OPEN); - buf.append(TRACE_STR).append(PARENTHESIS_CLOSE).append(getTimeString()) - .append(message).append(SEPARATOR_SPACE); + StringBuilder buf = new StringBuilder(PARENTHESIS_OPEN); + buf.append(TRACE_STR).append(PARENTHESIS_CLOSE).append(getTimeString()).append(message).append(SEPARATOR_SPACE); System.out.println(buf.toString()); } @@ -285,10 +280,8 @@ public class Trace { /** * Traces the specified message from the specified plug-in. * - * @param pluginId - * The plug-in from which to trace. - * @param message - * The message to be traced. + * @param pluginId The plug-in from which to trace. + * @param message The message to be traced. * */ public static void trace(String pluginId, String message) { @@ -300,12 +293,9 @@ public class Trace { * Traces the specified message from the specified plug-in for the specified * debug option. * - * @param pluginId - * The plug-in from which to trace. - * @param option - * The debug option for which to trace. - * @param message - * The message to be traced. + * @param pluginId The plug-in from which to trace. + * @param option The debug option for which to trace. + * @param message The message to be traced. * */ public static void trace(String pluginId, String option, String message) { @@ -317,27 +307,19 @@ public class Trace { * Traces the specified message from the specified plug-in for the specified * debug option. * - * @param pluginId - * The plug-in from which to trace. - * @param option - * The debug option for which to trace. - * @param clazz - * The class whose method is being entered. - * @param methodName - * The name of method that is being entered. - * @param message - * The message to be traced. - * - */ - public static void trace(String pluginId, String option, - @SuppressWarnings("rawtypes") Class clazz, String methodName, - String message) { + * @param pluginId The plug-in from which to trace. + * @param option The debug option for which to trace. + * @param clazz The class whose method is being entered. + * @param methodName The name of method that is being entered. + * @param message The message to be traced. + * + */ + public static void trace(String pluginId, String option, @SuppressWarnings("rawtypes") Class clazz, + String methodName, String message) { if (shouldTrace(pluginId, option)) { - StringBuffer buf = new StringBuffer(PREFIX_TRACING).append(clazz - .getName()); + StringBuffer buf = new StringBuffer(PREFIX_TRACING).append(clazz.getName()); buf.append(SEPARATOR_METHOD).append(methodName); - buf.append(PARENTHESIS_OPEN).append(message) - .append(PARENTHESIS_CLOSE); + buf.append(PARENTHESIS_OPEN).append(message).append(PARENTHESIS_CLOSE); trace(buf.toString()); } } @@ -345,60 +327,42 @@ public class Trace { /** * Traces the changing of a value. * - * @param pluginId - * The plug-in from which to trace. - * @param option - * The debug option for which to trace. - * @param valueDescription - * The description of the value which is changing. - * @param oldValue - * The old value. - * @param newValue - * The new value. + * @param pluginId The plug-in from which to trace. + * @param option The debug option for which to trace. + * @param valueDescription The description of the value which is changing. + * @param oldValue The old value. + * @param newValue The new value. */ - public static void changing(String pluginId, String option, - String valueDescription, Object oldValue, Object newValue) { + public static void changing(String pluginId, String option, String valueDescription, Object oldValue, + Object newValue) { if (shouldTrace(pluginId, option)) { - StringBuffer buf = new StringBuffer(PREFIX_CHANGING); - buf.append(valueDescription).append(SEPARATOR_SPACE) - .append(LABEL_OLD_VALUE) + StringBuilder buf = new StringBuilder(PREFIX_CHANGING); + buf.append(valueDescription).append(SEPARATOR_SPACE).append(LABEL_OLD_VALUE) .append(getArgumentString(oldValue)); - buf.append(SEPARATOR_PARAMETER).append(LABEL_NEW_VALUE) - .append(getArgumentString(newValue)); + buf.append(SEPARATOR_PARAMETER).append(LABEL_NEW_VALUE).append(getArgumentString(newValue)); trace(buf.toString()); } } /** * - * @param pluginId - * The plug-in from which to trace. - * @param option - * The debug option for which to trace. - * @param clazz - * The class in which the value is changing. - * @param methodName - * The name of the method in which the value is changing. - * @param valueDescription - * The description of the value which is changing. - * @param oldValue - * The old value. - * @param newValue - * The new value. - */ - public static void changing(String pluginId, String option, - @SuppressWarnings("rawtypes") Class clazz, String methodName, - String valueDescription, Object oldValue, Object newValue) { + * @param pluginId The plug-in from which to trace. + * @param option The debug option for which to trace. + * @param clazz The class in which the value is changing. + * @param methodName The name of the method in which the value is changing. + * @param valueDescription The description of the value which is changing. + * @param oldValue The old value. + * @param newValue The new value. + */ + public static void changing(String pluginId, String option, @SuppressWarnings("rawtypes") Class clazz, + String methodName, String valueDescription, Object oldValue, Object newValue) { if (shouldTrace(pluginId, option)) { - StringBuffer buf = new StringBuffer(PREFIX_CHANGING); - buf.append(valueDescription).append(SEPARATOR_SPACE) - .append(LABEL_OLD_VALUE) + StringBuilder buf = new StringBuilder(PREFIX_CHANGING); + buf.append(valueDescription).append(SEPARATOR_SPACE).append(LABEL_OLD_VALUE) .append(getArgumentString(oldValue)); - buf.append(SEPARATOR_PARAMETER).append(LABEL_NEW_VALUE) - .append(getArgumentString(newValue)); - buf.append(SEPARATOR_SPACE).append(PARENTHESIS_OPEN) - .append(clazz.getName()).append(SEPARATOR_METHOD); + buf.append(SEPARATOR_PARAMETER).append(LABEL_NEW_VALUE).append(getArgumentString(newValue)); + buf.append(SEPARATOR_SPACE).append(PARENTHESIS_OPEN).append(clazz.getName()).append(SEPARATOR_METHOD); buf.append(methodName).append(PARENTHESIS_CLOSE); trace(buf.toString()); } @@ -408,31 +372,25 @@ public class Trace { * Traces the catching of the specified throwable in the specified method of * the specified class. * - * @param pluginId - * The plug-in from which to trace. - * @param option - * The debug option for which to trace. - * @param clazz - * The class in which the throwable is being caught. - * @param methodName - * The name of the method in which the throwable is being caught. - * @param throwable - * The throwable that is being caught. + * @param pluginId The plug-in from which to trace. + * @param option The debug option for which to trace. + * @param clazz The class in which the throwable is being caught. + * @param methodName The name of the method in which the throwable is being + * caught. + * @param throwable The throwable that is being caught. * */ - public static void catching(String pluginId, String option, - @SuppressWarnings("rawtypes") Class clazz, String methodName, - Throwable throwable) { + public static void catching(String pluginId, String option, @SuppressWarnings("rawtypes") Class clazz, + String methodName, Throwable throwable) { if (shouldTrace(pluginId, option)) { - StringBuffer buf = new StringBuffer(PREFIX_CATCHING); + StringBuilder buf = new StringBuilder(PREFIX_CATCHING); if (throwable != null) { String message = throwable.getMessage(); if (message != null) buf.append(message).append(SEPARATOR_SPACE); } - buf.append(PARENTHESIS_OPEN).append(clazz.getName()) - .append(SEPARATOR_METHOD); + buf.append(PARENTHESIS_OPEN).append(clazz.getName()).append(SEPARATOR_METHOD); buf.append(methodName).append(PARENTHESIS_CLOSE); trace(buf.toString()); if (throwable != null) { @@ -445,32 +403,25 @@ public class Trace { * Traces the throwing of the specified throwable from the specified method * of the specified class. * - * @param pluginId - * The plug-in from which to trace. - * @param option - * The debug option for which to trace. - * @param clazz - * The class from which the throwable is being thrown. - * @param methodName - * The name of the method from which the throwable is being - * thrown. - * @param throwable - * The throwable that is being thrown. + * @param pluginId The plug-in from which to trace. + * @param option The debug option for which to trace. + * @param clazz The class from which the throwable is being thrown. + * @param methodName The name of the method from which the throwable is + * being thrown. + * @param throwable The throwable that is being thrown. * */ - public static void throwing(String pluginId, String option, - @SuppressWarnings("rawtypes") Class clazz, String methodName, - Throwable throwable) { + public static void throwing(String pluginId, String option, @SuppressWarnings("rawtypes") Class clazz, + String methodName, Throwable throwable) { if (shouldTrace(pluginId, option)) { - StringBuffer buf = new StringBuffer(PREFIX_THROWING); + StringBuilder buf = new StringBuilder(PREFIX_THROWING); if (throwable != null) { String message = throwable.getMessage(); if (message != null) buf.append(message).append(SEPARATOR_SPACE); } - buf.append(PARENTHESIS_OPEN).append(clazz.getName()) - .append(SEPARATOR_METHOD); + buf.append(PARENTHESIS_OPEN).append(clazz.getName()).append(SEPARATOR_METHOD); buf.append(methodName).append(PARENTHESIS_CLOSE); trace(buf.toString()); throwable.printStackTrace(System.err); @@ -480,24 +431,18 @@ public class Trace { /** * Traces the entering into the specified method of the specified class. * - * @param pluginId - * The plug-in from which to trace. - * @param option - * The debug option for which to trace. - * @param clazz - * The class whose method is being entered. - * @param methodName - * The name of method that is being entered. + * @param pluginId The plug-in from which to trace. + * @param option The debug option for which to trace. + * @param clazz The class whose method is being entered. + * @param methodName The name of method that is being entered. * */ - public static void entering(String pluginId, String option, - @SuppressWarnings("rawtypes") Class clazz, String methodName) { + public static void entering(String pluginId, String option, @SuppressWarnings("rawtypes") Class clazz, + String methodName) { if (shouldTrace(pluginId, option)) { - StringBuffer buf = new StringBuffer(PREFIX_ENTERING).append(clazz - .getName()); - buf.append(SEPARATOR_METHOD).append(methodName) - .append(PARENTHESIS_OPEN).append(PARENTHESIS_CLOSE); + StringBuffer buf = new StringBuffer(PREFIX_ENTERING).append(clazz.getName()); + buf.append(SEPARATOR_METHOD).append(methodName).append(PARENTHESIS_OPEN).append(PARENTHESIS_CLOSE); trace(buf.toString()); } } @@ -506,28 +451,20 @@ public class Trace { * Traces the entering into the specified method of the specified class, * with the specified parameter. * - * @param pluginId - * The plug-in from which to trace. - * @param option - * The debug option for which to trace. - * @param clazz - * The class whose method is being entered. - * @param methodName - * The name of method that is being entered. - * @param parameter - * The parameter to the method being entered. + * @param pluginId The plug-in from which to trace. + * @param option The debug option for which to trace. + * @param clazz The class whose method is being entered. + * @param methodName The name of method that is being entered. + * @param parameter The parameter to the method being entered. * */ - public static void entering(String pluginId, String option, - @SuppressWarnings("rawtypes") Class clazz, String methodName, - Object parameter) { + public static void entering(String pluginId, String option, @SuppressWarnings("rawtypes") Class clazz, + String methodName, Object parameter) { if (shouldTrace(pluginId, option)) { - StringBuffer buf = new StringBuffer(PREFIX_ENTERING).append(clazz - .getName()); + StringBuffer buf = new StringBuffer(PREFIX_ENTERING).append(clazz.getName()); buf.append(SEPARATOR_METHOD).append(methodName); - buf.append(PARENTHESIS_OPEN).append(getArgumentString(parameter)) - .append(PARENTHESIS_CLOSE); + buf.append(PARENTHESIS_OPEN).append(getArgumentString(parameter)).append(PARENTHESIS_CLOSE); trace(buf.toString()); } @@ -537,28 +474,20 @@ public class Trace { * Traces the entering into the specified method of the specified class, * with the specified parameters. * - * @param pluginId - * The plug-in from which to trace. - * @param option - * The debug option for which to trace. - * @param clazz - * The class whose method is being entered. - * @param methodName - * The name of method that is being entered. - * @param parameters - * The parameters to the method being entered. + * @param pluginId The plug-in from which to trace. + * @param option The debug option for which to trace. + * @param clazz The class whose method is being entered. + * @param methodName The name of method that is being entered. + * @param parameters The parameters to the method being entered. * */ - public static void entering(String pluginId, String option, - @SuppressWarnings("rawtypes") Class clazz, String methodName, - Object[] parameters) { + public static void entering(String pluginId, String option, @SuppressWarnings("rawtypes") Class clazz, + String methodName, Object[] parameters) { if (shouldTrace(pluginId, option)) { - StringBuffer buf = new StringBuffer(PREFIX_ENTERING).append(clazz - .getName()); + StringBuffer buf = new StringBuffer(PREFIX_ENTERING).append(clazz.getName()); buf.append(SEPARATOR_METHOD).append(methodName); - buf.append(PARENTHESIS_OPEN).append(getArgumentString(parameters)) - .append(PARENTHESIS_CLOSE); + buf.append(PARENTHESIS_OPEN).append(getArgumentString(parameters)).append(PARENTHESIS_CLOSE); trace(buf.toString()); } @@ -567,22 +496,17 @@ public class Trace { /** * Traces the exiting from the specified method of the specified class. * - * @param pluginId - * The plug-in from which to trace. - * @param option - * The debug option for which to trace. - * @param clazz - * The class whose method is being exited. - * @param methodName - * The name of method that is being exited. + * @param pluginId The plug-in from which to trace. + * @param option The debug option for which to trace. + * @param clazz The class whose method is being exited. + * @param methodName The name of method that is being exited. * */ - public static void exiting(String pluginId, String option, - @SuppressWarnings("rawtypes") Class clazz, String methodName) { + public static void exiting(String pluginId, String option, @SuppressWarnings("rawtypes") Class clazz, + String methodName) { if (shouldTrace(pluginId, option)) { - StringBuffer buf = new StringBuffer(PREFIX_EXITING).append(clazz - .getName()); + StringBuffer buf = new StringBuffer(PREFIX_EXITING).append(clazz.getName()); buf.append(SEPARATOR_METHOD).append(methodName); trace(buf.toString()); } @@ -592,28 +516,20 @@ public class Trace { * Traces the exiting from the specified method of the specified class, with * the specified return value. * - * @param pluginId - * The plug-in from which to trace. - * @param option - * The debug option for which to trace. - * @param clazz - * The class whose method is being exited. - * @param methodName - * The name of method that is being exited. - * @param returnValue - * The return value of the method being exited. + * @param pluginId The plug-in from which to trace. + * @param option The debug option for which to trace. + * @param clazz The class whose method is being exited. + * @param methodName The name of method that is being exited. + * @param returnValue The return value of the method being exited. * */ - public static void exiting(String pluginId, String option, - @SuppressWarnings("rawtypes") Class clazz, String methodName, - Object returnValue) { + public static void exiting(String pluginId, String option, @SuppressWarnings("rawtypes") Class clazz, + String methodName, Object returnValue) { if (shouldTrace(pluginId, option)) { - StringBuffer buf = new StringBuffer(PREFIX_EXITING).append(clazz - .getName()); + StringBuffer buf = new StringBuffer(PREFIX_EXITING).append(clazz.getName()); buf.append(SEPARATOR_METHOD).append(methodName); - buf.append(PARENTHESIS_OPEN).append(getArgumentString(returnValue)) - .append(PARENTHESIS_CLOSE); + buf.append(PARENTHESIS_OPEN).append(getArgumentString(returnValue)).append(PARENTHESIS_CLOSE); trace(buf.toString()); } diff --git a/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/internal/core/identity/Activator.java b/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/internal/core/identity/Activator.java index 486d55872..6214f9f8c 100644 --- a/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/internal/core/identity/Activator.java +++ b/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/internal/core/identity/Activator.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.internal.core.identity; import org.eclipse.core.runtime.*; @@ -132,37 +135,35 @@ public class Activator implements BundleActivator { registryManager = new IRegistryChangeListener() { public void registryChanged(IRegistryChangeEvent event) { final IExtensionDelta delta[] = event.getExtensionDeltas(PLUGIN_ID, NAMESPACE_NAME); - for (int i = 0; i < delta.length; i++) { - switch (delta[i].getKind()) { - case IExtensionDelta.ADDED: - addNamespaceExtensions(delta[i].getExtension().getConfigurationElements()); - break; - case IExtensionDelta.REMOVED: - IConfigurationElement[] members = delta[i].getExtension() - .getConfigurationElements(); - for (int m = 0; m < members.length; m++) { - final IConfigurationElement member = members[m]; - String name = null; - try { - name = member.getAttribute(NAME_ATTRIBUTE); - if (name == null) { - name = member.getAttribute(CLASS_ATTRIBUTE); + for (IExtensionDelta d : delta) { + switch (d.getKind()) { + case IExtensionDelta.ADDED: + addNamespaceExtensions(d.getExtension().getConfigurationElements()); + break; + case IExtensionDelta.REMOVED: + IConfigurationElement[] members = d.getExtension().getConfigurationElements(); + for (IConfigurationElement member : members) { + String name = null; + try { + name = member.getAttribute(NAME_ATTRIBUTE); + if (name == null) { + name = member.getAttribute(CLASS_ATTRIBUTE); + } + if (name == null) + continue; + final IIDFactory factory = IDFactory.getDefault(); + final Namespace n = factory.getNamespaceByName(name); + if (n == null || !factory.containsNamespace(n)) { + continue; + } + // remove + factory.removeNamespace(n); + } catch (final Exception e) { + getDefault().log(new Status(IStatus.ERROR, Activator.PLUGIN_ID, + IStatus.ERROR, "Exception removing namespace", e)); //$NON-NLS-1$ } - if (name == null) - continue; - final IIDFactory factory = IDFactory.getDefault(); - final Namespace n = factory.getNamespaceByName(name); - if (n == null || !factory.containsNamespace(n)) { - continue; - } - // remove - factory.removeNamespace(n); - } catch (final Exception e) { - getDefault().log(new Status(IStatus.ERROR, Activator.PLUGIN_ID, - IStatus.ERROR, "Exception removing namespace", e)); //$NON-NLS-1$ } - } - break; + break; } } } @@ -216,8 +217,7 @@ public class Activator implements BundleActivator { */ void addNamespaceExtensions(IConfigurationElement[] members) { final String bundleName = getDefault().getBundle().getSymbolicName(); - for (int m = 0; m < members.length; m++) { - final IConfigurationElement member = members[m]; + for (IConfigurationElement member : members) { // Get the label of the extender plugin and the ID of the // extension. final IExtension extension = member.getDeclaringExtension(); diff --git a/framework/bundles/org.eclipse.ecf.identity/src_r7stubs/org/osgi/service/log/Logger.java b/framework/bundles/org.eclipse.ecf.identity/src_r7stubs/org/osgi/service/log/Logger.java index e1829d881..6dac53911 100644 --- a/framework/bundles/org.eclipse.ecf.identity/src_r7stubs/org/osgi/service/log/Logger.java +++ b/framework/bundles/org.eclipse.ecf.identity/src_r7stubs/org/osgi/service/log/Logger.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2018 Red Hat, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Red Hat, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.osgi.service.log; diff --git a/framework/bundles/org.eclipse.ecf.presence.bot/.settings/org.eclipse.jdt.core.prefs b/framework/bundles/org.eclipse.ecf.presence.bot/.settings/org.eclipse.jdt.core.prefs index 87b213616..0657cc585 100644 --- a/framework/bundles/org.eclipse.ecf.presence.bot/.settings/org.eclipse.jdt.core.prefs +++ b/framework/bundles/org.eclipse.ecf.presence.bot/.settings/org.eclipse.jdt.core.prefs @@ -21,7 +21,7 @@ org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning org.eclipse.jdt.core.compiler.problem.autoboxing=ignore org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning org.eclipse.jdt.core.compiler.problem.deadCode=warning -org.eclipse.jdt.core.compiler.problem.deprecation=warning +org.eclipse.jdt.core.compiler.problem.deprecation=ignore org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled org.eclipse.jdt.core.compiler.problem.discouragedReference=warning diff --git a/framework/bundles/org.eclipse.ecf.presence.bot/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.presence.bot/META-INF/MANIFEST.MF index 01bc48e5b..622087996 100644 --- a/framework/bundles/org.eclipse.ecf.presence.bot/META-INF/MANIFEST.MF +++ b/framework/bundles/org.eclipse.ecf.presence.bot/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin.name Bundle-SymbolicName: org.eclipse.ecf.presence.bot;singleton:=true Automatic-Module-Name: org.eclipse.ecf.presence.bot -Bundle-Version: 1.3.200.qualifier +Bundle-Version: 1.3.300.qualifier Bundle-Activator: org.eclipse.ecf.internal.presence.bot.Activator Bundle-Vendor: %plugin.provider Bundle-Localization: plugin diff --git a/framework/bundles/org.eclipse.ecf.presence.bot/about.html b/framework/bundles/org.eclipse.ecf.presence.bot/about.html index 4c79781a5..9f1dc0dd5 100644 --- a/framework/bundles/org.eclipse.ecf.presence.bot/about.html +++ b/framework/bundles/org.eclipse.ecf.presence.bot/about.html @@ -22,7 +22,7 @@ being redistributed by another party ("Redistributor") and different t apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise indicated below, the terms and conditions of the EPL still apply to any source code in the Content -and such source code may be obtained at <a href="/">http://www.eclipse.org</a>.</p> +and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p> </body> </html>
\ No newline at end of file diff --git a/framework/bundles/org.eclipse.ecf.presence.bot/plugin.properties b/framework/bundles/org.eclipse.ecf.presence.bot/plugin.properties index b598e011c..b2eb729a2 100644 --- a/framework/bundles/org.eclipse.ecf.presence.bot/plugin.properties +++ b/framework/bundles/org.eclipse.ecf.presence.bot/plugin.properties @@ -1,10 +1,11 @@ ############################################################################ # Copyright (c) 2007 Composent Inc., IBM Corp. and others. -# 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 # +# This program and the accompanying materials are made +# available under the terms of the Eclipse Public License 2.0 +# which is available at https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 ############################################################################ plugin.name=ECF Presence Bot API plugin.provider=Eclipse.org - ECF diff --git a/framework/bundles/org.eclipse.ecf.presence.bot/pom.xml b/framework/bundles/org.eclipse.ecf.presence.bot/pom.xml index bc3748e0b..fa4be97e0 100644 --- a/framework/bundles/org.eclipse.ecf.presence.bot/pom.xml +++ b/framework/bundles/org.eclipse.ecf.presence.bot/pom.xml @@ -10,6 +10,6 @@ </parent> <groupId>org.eclipse.ecf</groupId> <artifactId>org.eclipse.ecf.presence.bot</artifactId> - <version>1.3.200-SNAPSHOT</version> + <version>1.3.300-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/framework/bundles/org.eclipse.ecf.presence.bot/schema/chatRoomMessageHandler.exsd b/framework/bundles/org.eclipse.ecf.presence.bot/schema/chatRoomMessageHandler.exsd index 319ce4983..592dee9f7 100644 --- a/framework/bundles/org.eclipse.ecf.presence.bot/schema/chatRoomMessageHandler.exsd +++ b/framework/bundles/org.eclipse.ecf.presence.bot/schema/chatRoomMessageHandler.exsd @@ -1,18 +1,21 @@ <?xml version='1.0' encoding='UTF-8'?> <!-- Schema file written by PDE --> -<schema targetNamespace="org.eclipse.ecf.presence.bot"> +<schema targetNamespace="org.eclipse.ecf.presence.bot" xmlns="http://www.w3.org/2001/XMLSchema"> <annotation> <appInfo> <meta.schema plugin="org.eclipse.ecf.presence.bot" id="chatRoomMessageHandler" name="Chat Room Message Handler"/> </appInfo> <documentation> This extension point allows message handlers to be associated with a given chatroomrobot (via chatroomrobotid attribute). Note that the chatroomrobotid must exist or the handler will not be called. - - </documentation> </annotation> <element name="extension"> + <annotation> + <appInfo> + <meta.element /> + </appInfo> + </annotation> <complexType> <sequence minOccurs="1" maxOccurs="unbounded"> <element ref="handler"/> @@ -116,8 +119,6 @@ Note that the given chatroomrobotid=<b>org.eclipse.ecf.presence.bot.defaul </chatRoomRobot> </extension> </pre> - - </documentation> </annotation> @@ -131,20 +132,19 @@ Note that the given chatroomrobotid=<b>org.eclipse.ecf.presence.bot.defaul <pre> public interface IChatRoomMessageHandler extends IChatRoomContainerAdvisor { - /** - * This method is called when a {@link IChatRoomMessage} is received. - * - * @param message - * the {@link IChatRoomMessage} received. Will not be - * <code>null</code>. Implementers should not block the - * calling thread. Any methods on the given <code>message</code> - * parameter may be called. - */ - public void handleRoomMessage(IChatRoomMessage message); + /** + * This method is called when a {@link IChatRoomMessage} is received. + * + * @param message + * the {@link IChatRoomMessage} received. Will not be + * <code>null</code>. Implementers should not block the + * calling thread. Any methods on the given <code>message</code> + * parameter may be called. + */ + public void handleRoomMessage(IChatRoomMessage message); } </pre> - </documentation> </annotation> @@ -162,7 +162,13 @@ public interface IChatRoomMessageHandler extends IChatRoomContainerAdvisor { <meta.section type="copyright"/> </appInfo> <documentation> - Copyright (c) 2007 IBM Corporation and others. 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 + Copyright (c) 2007 IBM Corporation and others. + +This program and the accompanying materials are made +available under the terms of the Eclipse Public License 2.0 +which is available at https://www.eclipse.org/legal/epl-2.0/ + +SPDX-License-Identifier: EPL-2.0 </documentation> </annotation> diff --git a/framework/bundles/org.eclipse.ecf.presence.bot/schema/chatRoomRobot.exsd b/framework/bundles/org.eclipse.ecf.presence.bot/schema/chatRoomRobot.exsd index 93e681629..5fbd9c2c7 100644 --- a/framework/bundles/org.eclipse.ecf.presence.bot/schema/chatRoomRobot.exsd +++ b/framework/bundles/org.eclipse.ecf.presence.bot/schema/chatRoomRobot.exsd @@ -1,6 +1,6 @@ <?xml version='1.0' encoding='UTF-8'?> <!-- Schema file written by PDE --> -<schema targetNamespace="org.eclipse.ecf.presence.bot"> +<schema targetNamespace="org.eclipse.ecf.presence.bot" xmlns="http://www.w3.org/2001/XMLSchema"> <annotation> <appInfo> <meta.schema plugin="org.eclipse.ecf.presence.bot" id="chatRoomRobot" name="Chat Room Robot"/> @@ -11,6 +11,11 @@ </annotation> <element name="extension"> + <annotation> + <appInfo> + <meta.element /> + </appInfo> + </annotation> <complexType> <sequence minOccurs="1" maxOccurs="unbounded"> <element ref="chatRoomRobot"/> @@ -184,7 +189,14 @@ using the id for the chatRoomRobot given above. For example: <meta.section type="copyright"/> </appInfo> <documentation> - Copyright (c) 2007 IBM Corporation and others. 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 + Copyright (c) 2007 IBM Corporation and others. + +This program and the accompanying materials are made +available under the terms of the Eclipse Public License 2.0 +which is available at https://www.eclipse.org/legal/epl-2.0/ + +SPDX-License-Identifier: EPL-2.0 + </documentation> </annotation> diff --git a/framework/bundles/org.eclipse.ecf.presence.bot/schema/imMessageHandler.exsd b/framework/bundles/org.eclipse.ecf.presence.bot/schema/imMessageHandler.exsd index 297d07dbe..19795421a 100644 --- a/framework/bundles/org.eclipse.ecf.presence.bot/schema/imMessageHandler.exsd +++ b/framework/bundles/org.eclipse.ecf.presence.bot/schema/imMessageHandler.exsd @@ -1,6 +1,6 @@ <?xml version='1.0' encoding='UTF-8'?> <!-- Schema file written by PDE --> -<schema targetNamespace="org.eclipse.ecf.presence.bot"> +<schema targetNamespace="org.eclipse.ecf.presence.bot" xmlns="http://www.w3.org/2001/XMLSchema"> <annotation> <appInfo> <meta.schema plugin="org.eclipse.ecf.presence.bot" id="imMessageHandler" name="IM Message Handler"/> @@ -12,6 +12,11 @@ with imrobot instances. </annotation> <element name="extension"> + <annotation> + <appInfo> + <meta.element /> + </appInfo> + </annotation> <complexType> <sequence> <element ref="handler" minOccurs="1" maxOccurs="unbounded"/> @@ -156,7 +161,14 @@ public interface IIMMessageHandler extends IContainerAdvisor { <meta.section type="copyright"/> </appInfo> <documentation> - Copyright (c) 2007 IBM Corporation and others. 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 + Copyright (c) 2007 IBM Corporation and others. + +This program and the accompanying materials are made +available under the terms of the Eclipse Public License 2.0 +which is available at https://www.eclipse.org/legal/epl-2.0/ + +SPDX-License-Identifier: EPL-2.0 + </documentation> </annotation> diff --git a/framework/bundles/org.eclipse.ecf.presence.bot/schema/imRobot.exsd b/framework/bundles/org.eclipse.ecf.presence.bot/schema/imRobot.exsd index 7ddb7f1b1..6de50d42c 100644 --- a/framework/bundles/org.eclipse.ecf.presence.bot/schema/imRobot.exsd +++ b/framework/bundles/org.eclipse.ecf.presence.bot/schema/imRobot.exsd @@ -1,6 +1,6 @@ <?xml version='1.0' encoding='UTF-8'?> <!-- Schema file written by PDE --> -<schema targetNamespace="org.eclipse.ecf.presence.bot"> +<schema targetNamespace="org.eclipse.ecf.presence.bot" xmlns="http://www.w3.org/2001/XMLSchema"> <annotation> <appInfo> <meta.schema plugin="org.eclipse.ecf.presence.bot" id="imRobot" name="IM Robot"/> @@ -11,6 +11,11 @@ </annotation> <element name="extension"> + <annotation> + <appInfo> + <meta.element /> + </appInfo> + </annotation> <complexType> <sequence minOccurs="1" maxOccurs="unbounded"> <element ref="imRobot"/> @@ -155,7 +160,14 @@ using the id for the imrobot given above. For example: <meta.section type="copyright"/> </appInfo> <documentation> - Copyright (c) 2007 IBM Corporation and others. 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 + Copyright (c) 2007 IBM Corporation and others. + +This program and the accompanying materials are made +available under the terms of the Eclipse Public License 2.0 +which is available at https://www.eclipse.org/legal/epl-2.0/ + +SPDX-License-Identifier: EPL-2.0 + </documentation> </annotation> diff --git a/framework/bundles/org.eclipse.ecf.presence.bot/src/org/eclipse/ecf/internal/presence/bot/Activator.java b/framework/bundles/org.eclipse.ecf.presence.bot/src/org/eclipse/ecf/internal/presence/bot/Activator.java index b0334980d..4e030f7d9 100644 --- a/framework/bundles/org.eclipse.ecf.presence.bot/src/org/eclipse/ecf/internal/presence/bot/Activator.java +++ b/framework/bundles/org.eclipse.ecf.presence.bot/src/org/eclipse/ecf/internal/presence/bot/Activator.java @@ -1,13 +1,15 @@ -/******************************************************************************* +/**************************************************************************** * Copyright (c) 2007 IBM Corporation and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * IBM Corporation - initial API and implementation - *******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.internal.presence.bot; import java.util.ArrayList; diff --git a/framework/bundles/org.eclipse.ecf.presence.bot/src/org/eclipse/ecf/internal/presence/bot/ChatRoomBotEntry.java b/framework/bundles/org.eclipse.ecf.presence.bot/src/org/eclipse/ecf/internal/presence/bot/ChatRoomBotEntry.java index 0715ee0f0..1a4e509fa 100644 --- a/framework/bundles/org.eclipse.ecf.presence.bot/src/org/eclipse/ecf/internal/presence/bot/ChatRoomBotEntry.java +++ b/framework/bundles/org.eclipse.ecf.presence.bot/src/org/eclipse/ecf/internal/presence/bot/ChatRoomBotEntry.java @@ -1,13 +1,15 @@ -/******************************************************************************* +/**************************************************************************** * Copyright (c) 2007 IBM Corporation and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * IBM Corporation - initial API and implementation - *******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.internal.presence.bot; import java.util.List; diff --git a/framework/bundles/org.eclipse.ecf.presence.bot/src/org/eclipse/ecf/internal/presence/bot/ChatRoomMessageHandlerEntry.java b/framework/bundles/org.eclipse.ecf.presence.bot/src/org/eclipse/ecf/internal/presence/bot/ChatRoomMessageHandlerEntry.java index e88f536b2..5a269c9db 100644 --- a/framework/bundles/org.eclipse.ecf.presence.bot/src/org/eclipse/ecf/internal/presence/bot/ChatRoomMessageHandlerEntry.java +++ b/framework/bundles/org.eclipse.ecf.presence.bot/src/org/eclipse/ecf/internal/presence/bot/ChatRoomMessageHandlerEntry.java @@ -1,13 +1,15 @@ -/******************************************************************************* +/**************************************************************************** * Copyright (c) 2007 IBM Corporation and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * IBM Corporation - initial API and implementation - *******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.internal.presence.bot; import java.util.regex.Matcher; diff --git a/framework/bundles/org.eclipse.ecf.presence.bot/src/org/eclipse/ecf/internal/presence/bot/IMBotEntry.java b/framework/bundles/org.eclipse.ecf.presence.bot/src/org/eclipse/ecf/internal/presence/bot/IMBotEntry.java index b8aa6c83a..e46ad40ad 100644 --- a/framework/bundles/org.eclipse.ecf.presence.bot/src/org/eclipse/ecf/internal/presence/bot/IMBotEntry.java +++ b/framework/bundles/org.eclipse.ecf.presence.bot/src/org/eclipse/ecf/internal/presence/bot/IMBotEntry.java @@ -1,13 +1,15 @@ -/******************************************************************************* +/**************************************************************************** * Copyright (c) 2007 IBM Corporation and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * IBM Corporation - initial API and implementation - *******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.internal.presence.bot; import java.util.List; diff --git a/framework/bundles/org.eclipse.ecf.presence.bot/src/org/eclipse/ecf/internal/presence/bot/IMMessageHandlerEntry.java b/framework/bundles/org.eclipse.ecf.presence.bot/src/org/eclipse/ecf/internal/presence/bot/IMMessageHandlerEntry.java index 6f36cc8cf..82e5f9150 100644 --- a/framework/bundles/org.eclipse.ecf.presence.bot/src/org/eclipse/ecf/internal/presence/bot/IMMessageHandlerEntry.java +++ b/framework/bundles/org.eclipse.ecf.presence.bot/src/org/eclipse/ecf/internal/presence/bot/IMMessageHandlerEntry.java @@ -1,13 +1,15 @@ -/******************************************************************************* +/**************************************************************************** * Copyright (c) 2007 IBM Corporation and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * IBM Corporation - initial API and implementation - *******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.internal.presence.bot; import java.util.regex.Matcher; diff --git a/framework/bundles/org.eclipse.ecf.presence.bot/src/org/eclipse/ecf/presence/bot/IChatRoomBotEntry.java b/framework/bundles/org.eclipse.ecf.presence.bot/src/org/eclipse/ecf/presence/bot/IChatRoomBotEntry.java index 529bb0d24..cbdd05cae 100644 --- a/framework/bundles/org.eclipse.ecf.presence.bot/src/org/eclipse/ecf/presence/bot/IChatRoomBotEntry.java +++ b/framework/bundles/org.eclipse.ecf.presence.bot/src/org/eclipse/ecf/presence/bot/IChatRoomBotEntry.java @@ -1,13 +1,15 @@ -/******************************************************************************* +/**************************************************************************** * Copyright (c) 2007 IBM Corporation and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * IBM Corporation - initial API and implementation - *******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.presence.bot; import java.util.List; diff --git a/framework/bundles/org.eclipse.ecf.presence.bot/src/org/eclipse/ecf/presence/bot/IChatRoomContainerAdvisor.java b/framework/bundles/org.eclipse.ecf.presence.bot/src/org/eclipse/ecf/presence/bot/IChatRoomContainerAdvisor.java index 4a25e4fb7..8c6006c0d 100644 --- a/framework/bundles/org.eclipse.ecf.presence.bot/src/org/eclipse/ecf/presence/bot/IChatRoomContainerAdvisor.java +++ b/framework/bundles/org.eclipse.ecf.presence.bot/src/org/eclipse/ecf/presence/bot/IChatRoomContainerAdvisor.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.presence.bot; diff --git a/framework/bundles/org.eclipse.ecf.presence.bot/src/org/eclipse/ecf/presence/bot/IChatRoomMessageHandler.java b/framework/bundles/org.eclipse.ecf.presence.bot/src/org/eclipse/ecf/presence/bot/IChatRoomMessageHandler.java index 6d4efd48f..3c1d3ad81 100644 --- a/framework/bundles/org.eclipse.ecf.presence.bot/src/org/eclipse/ecf/presence/bot/IChatRoomMessageHandler.java +++ b/framework/bundles/org.eclipse.ecf.presence.bot/src/org/eclipse/ecf/presence/bot/IChatRoomMessageHandler.java @@ -1,13 +1,15 @@ -/******************************************************************************* +/**************************************************************************** * Copyright (c) 2007 IBM Corporation and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * IBM Corporation - initial API and implementation - *******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.presence.bot; import org.eclipse.ecf.presence.chatroom.IChatRoomMessage; diff --git a/framework/bundles/org.eclipse.ecf.presence.bot/src/org/eclipse/ecf/presence/bot/IChatRoomMessageHandlerEntry.java b/framework/bundles/org.eclipse.ecf.presence.bot/src/org/eclipse/ecf/presence/bot/IChatRoomMessageHandlerEntry.java index 2063a4a72..aa76e4936 100644 --- a/framework/bundles/org.eclipse.ecf.presence.bot/src/org/eclipse/ecf/presence/bot/IChatRoomMessageHandlerEntry.java +++ b/framework/bundles/org.eclipse.ecf.presence.bot/src/org/eclipse/ecf/presence/bot/IChatRoomMessageHandlerEntry.java @@ -1,13 +1,15 @@ -/******************************************************************************* +/**************************************************************************** * Copyright (c) 2007 IBM Corporation and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * IBM Corporation - initial API and implementation - *******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.presence.bot; import org.eclipse.ecf.presence.chatroom.IChatRoomMessage; diff --git a/framework/bundles/org.eclipse.ecf.presence.bot/src/org/eclipse/ecf/presence/bot/IContainerAdvisor.java b/framework/bundles/org.eclipse.ecf.presence.bot/src/org/eclipse/ecf/presence/bot/IContainerAdvisor.java index ac303afc3..7be604234 100644 --- a/framework/bundles/org.eclipse.ecf.presence.bot/src/org/eclipse/ecf/presence/bot/IContainerAdvisor.java +++ b/framework/bundles/org.eclipse.ecf.presence.bot/src/org/eclipse/ecf/presence/bot/IContainerAdvisor.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.presence.bot; diff --git a/framework/bundles/org.eclipse.ecf.presence.bot/src/org/eclipse/ecf/presence/bot/IIMBotEntry.java b/framework/bundles/org.eclipse.ecf.presence.bot/src/org/eclipse/ecf/presence/bot/IIMBotEntry.java index 17b388732..3d48ea480 100644 --- a/framework/bundles/org.eclipse.ecf.presence.bot/src/org/eclipse/ecf/presence/bot/IIMBotEntry.java +++ b/framework/bundles/org.eclipse.ecf.presence.bot/src/org/eclipse/ecf/presence/bot/IIMBotEntry.java @@ -1,13 +1,15 @@ -/******************************************************************************* +/**************************************************************************** * Copyright (c) 2007 IBM Corporation and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * IBM Corporation - initial API and implementation - *******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.presence.bot; import java.util.List; diff --git a/framework/bundles/org.eclipse.ecf.presence.bot/src/org/eclipse/ecf/presence/bot/IIMMessageHandler.java b/framework/bundles/org.eclipse.ecf.presence.bot/src/org/eclipse/ecf/presence/bot/IIMMessageHandler.java index 32cf655f8..9f88be918 100644 --- a/framework/bundles/org.eclipse.ecf.presence.bot/src/org/eclipse/ecf/presence/bot/IIMMessageHandler.java +++ b/framework/bundles/org.eclipse.ecf.presence.bot/src/org/eclipse/ecf/presence/bot/IIMMessageHandler.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.presence.bot; diff --git a/framework/bundles/org.eclipse.ecf.presence.bot/src/org/eclipse/ecf/presence/bot/IIMMessageHandlerEntry.java b/framework/bundles/org.eclipse.ecf.presence.bot/src/org/eclipse/ecf/presence/bot/IIMMessageHandlerEntry.java index b7936eb5d..92c8503c0 100644 --- a/framework/bundles/org.eclipse.ecf.presence.bot/src/org/eclipse/ecf/presence/bot/IIMMessageHandlerEntry.java +++ b/framework/bundles/org.eclipse.ecf.presence.bot/src/org/eclipse/ecf/presence/bot/IIMMessageHandlerEntry.java @@ -1,13 +1,15 @@ -/******************************************************************************* +/**************************************************************************** * Copyright (c) 2007 IBM Corporation and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * IBM Corporation - initial API and implementation - *******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.presence.bot; import org.eclipse.ecf.presence.im.IChatMessage; diff --git a/framework/bundles/org.eclipse.ecf.presence.bot/src/org/eclipse/ecf/presence/bot/application/ChatRoomBotApplication.java b/framework/bundles/org.eclipse.ecf.presence.bot/src/org/eclipse/ecf/presence/bot/application/ChatRoomBotApplication.java index 33090b6b4..1cc89dba9 100644 --- a/framework/bundles/org.eclipse.ecf.presence.bot/src/org/eclipse/ecf/presence/bot/application/ChatRoomBotApplication.java +++ b/framework/bundles/org.eclipse.ecf.presence.bot/src/org/eclipse/ecf/presence/bot/application/ChatRoomBotApplication.java @@ -1,13 +1,15 @@ -/******************************************************************************* +/**************************************************************************** * Copyright (c) 2007 IBM Corporation and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * IBM Corporation - initial API and implementation - *******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.presence.bot.application; import java.util.Iterator; diff --git a/framework/bundles/org.eclipse.ecf.presence.bot/src/org/eclipse/ecf/presence/bot/application/IMBotApplication.java b/framework/bundles/org.eclipse.ecf.presence.bot/src/org/eclipse/ecf/presence/bot/application/IMBotApplication.java index 90c5e679d..44bca984b 100644 --- a/framework/bundles/org.eclipse.ecf.presence.bot/src/org/eclipse/ecf/presence/bot/application/IMBotApplication.java +++ b/framework/bundles/org.eclipse.ecf.presence.bot/src/org/eclipse/ecf/presence/bot/application/IMBotApplication.java @@ -1,13 +1,15 @@ -/******************************************************************************* +/**************************************************************************** * Copyright (c) 2007 IBM Corporation and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * IBM Corporation - initial API and implementation - *******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.presence.bot.application; import java.util.Iterator; diff --git a/framework/bundles/org.eclipse.ecf.presence.bot/src/org/eclipse/ecf/presence/bot/impl/ChatRoomBot.java b/framework/bundles/org.eclipse.ecf.presence.bot/src/org/eclipse/ecf/presence/bot/impl/ChatRoomBot.java index 51cbc7d33..4589a00ff 100644 --- a/framework/bundles/org.eclipse.ecf.presence.bot/src/org/eclipse/ecf/presence/bot/impl/ChatRoomBot.java +++ b/framework/bundles/org.eclipse.ecf.presence.bot/src/org/eclipse/ecf/presence/bot/impl/ChatRoomBot.java @@ -1,13 +1,15 @@ -/******************************************************************************* +/**************************************************************************** * Copyright (c) 2007 IBM Corporation and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * IBM Corporation - initial API and implementation - *******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.presence.bot.impl; import java.util.List; diff --git a/framework/bundles/org.eclipse.ecf.presence.bot/src/org/eclipse/ecf/presence/bot/impl/EmptyChatRoomMessageHandler.java b/framework/bundles/org.eclipse.ecf.presence.bot/src/org/eclipse/ecf/presence/bot/impl/EmptyChatRoomMessageHandler.java index a182d7b5d..6ffc155a5 100644 --- a/framework/bundles/org.eclipse.ecf.presence.bot/src/org/eclipse/ecf/presence/bot/impl/EmptyChatRoomMessageHandler.java +++ b/framework/bundles/org.eclipse.ecf.presence.bot/src/org/eclipse/ecf/presence/bot/impl/EmptyChatRoomMessageHandler.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.presence.bot.impl; diff --git a/framework/bundles/org.eclipse.ecf.presence.bot/src/org/eclipse/ecf/presence/bot/impl/EmptyIMMessageHandler.java b/framework/bundles/org.eclipse.ecf.presence.bot/src/org/eclipse/ecf/presence/bot/impl/EmptyIMMessageHandler.java index 6d558cadf..c7884654c 100644 --- a/framework/bundles/org.eclipse.ecf.presence.bot/src/org/eclipse/ecf/presence/bot/impl/EmptyIMMessageHandler.java +++ b/framework/bundles/org.eclipse.ecf.presence.bot/src/org/eclipse/ecf/presence/bot/impl/EmptyIMMessageHandler.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.presence.bot.impl; diff --git a/framework/bundles/org.eclipse.ecf.presence.bot/src/org/eclipse/ecf/presence/bot/impl/IMBot.java b/framework/bundles/org.eclipse.ecf.presence.bot/src/org/eclipse/ecf/presence/bot/impl/IMBot.java index 523612880..26cd829c5 100644 --- a/framework/bundles/org.eclipse.ecf.presence.bot/src/org/eclipse/ecf/presence/bot/impl/IMBot.java +++ b/framework/bundles/org.eclipse.ecf.presence.bot/src/org/eclipse/ecf/presence/bot/impl/IMBot.java @@ -1,13 +1,15 @@ -/******************************************************************************* +/**************************************************************************** * Copyright (c) 2007 IBM Corporation and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * IBM Corporation - initial API and implementation - *******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.presence.bot.impl; import java.util.List; diff --git a/framework/bundles/org.eclipse.ecf.presence.collab.ui/.settings/org.eclipse.jdt.core.prefs b/framework/bundles/org.eclipse.ecf.presence.collab.ui/.settings/org.eclipse.jdt.core.prefs index 9e641e220..8cf016021 100644 --- a/framework/bundles/org.eclipse.ecf.presence.collab.ui/.settings/org.eclipse.jdt.core.prefs +++ b/framework/bundles/org.eclipse.ecf.presence.collab.ui/.settings/org.eclipse.jdt.core.prefs @@ -22,7 +22,7 @@ org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.autoboxing=ignore org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning org.eclipse.jdt.core.compiler.problem.deadCode=warning -org.eclipse.jdt.core.compiler.problem.deprecation=warning +org.eclipse.jdt.core.compiler.problem.deprecation=ignore org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled org.eclipse.jdt.core.compiler.problem.discouragedReference=error diff --git a/framework/bundles/org.eclipse.ecf.presence.collab.ui/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.presence.collab.ui/META-INF/MANIFEST.MF index ef3f96800..f9ee58962 100644 --- a/framework/bundles/org.eclipse.ecf.presence.collab.ui/META-INF/MANIFEST.MF +++ b/framework/bundles/org.eclipse.ecf.presence.collab.ui/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin.name Bundle-SymbolicName: org.eclipse.ecf.presence.collab.ui;singleton:=true Automatic-Module-Name: org.eclipse.ecf.presence.collab.ui -Bundle-Version: 1.3.100.qualifier +Bundle-Version: 1.3.101.qualifier Bundle-Activator: org.eclipse.ecf.internal.presence.collab.ui.Activator Bundle-Vendor: %plugin.provider Bundle-Localization: plugin diff --git a/framework/bundles/org.eclipse.ecf.presence.collab.ui/about.html b/framework/bundles/org.eclipse.ecf.presence.collab.ui/about.html index 4c79781a5..9f1dc0dd5 100644 --- a/framework/bundles/org.eclipse.ecf.presence.collab.ui/about.html +++ b/framework/bundles/org.eclipse.ecf.presence.collab.ui/about.html @@ -22,7 +22,7 @@ being redistributed by another party ("Redistributor") and different t apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise indicated below, the terms and conditions of the EPL still apply to any source code in the Content -and such source code may be obtained at <a href="/">http://www.eclipse.org</a>.</p> +and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p> </body> </html>
\ No newline at end of file diff --git a/framework/bundles/org.eclipse.ecf.presence.collab.ui/plugin.properties b/framework/bundles/org.eclipse.ecf.presence.collab.ui/plugin.properties index 35a37e735..8e0bf9c43 100644 --- a/framework/bundles/org.eclipse.ecf.presence.collab.ui/plugin.properties +++ b/framework/bundles/org.eclipse.ecf.presence.collab.ui/plugin.properties @@ -1,10 +1,11 @@ ############################################################################ # Copyright (c) 2007 Composent Inc., IBM Corp. and others. -# 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 # +# This program and the accompanying materials are made +# available under the terms of the Eclipse Public License 2.0 +# which is available at https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 ############################################################################ plugin.name=ECF Presence Collaboration UI plugin.provider=Eclipse.org - ECF diff --git a/framework/bundles/org.eclipse.ecf.presence.collab.ui/pom.xml b/framework/bundles/org.eclipse.ecf.presence.collab.ui/pom.xml index d682a96d3..79711e929 100644 --- a/framework/bundles/org.eclipse.ecf.presence.collab.ui/pom.xml +++ b/framework/bundles/org.eclipse.ecf.presence.collab.ui/pom.xml @@ -10,6 +10,6 @@ </parent> <groupId>org.eclipse.ecf</groupId> <artifactId>org.eclipse.ecf.presence.collab.ui</artifactId> - <version>1.3.100-SNAPSHOT</version> + <version>1.3.101-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/internal/presence/collab/ui/Activator.java b/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/internal/presence/collab/ui/Activator.java index 0b5031e5d..2209e883c 100644 --- a/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/internal/presence/collab/ui/Activator.java +++ b/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/internal/presence/collab/ui/Activator.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2007 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.internal.presence.collab.ui; diff --git a/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/internal/presence/collab/ui/Messages.java b/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/internal/presence/collab/ui/Messages.java index e120efb0f..f33ad5269 100644 --- a/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/internal/presence/collab/ui/Messages.java +++ b/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/internal/presence/collab/ui/Messages.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.internal.presence.collab.ui; diff --git a/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/internal/presence/collab/ui/ShareReceiversECFStart.java b/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/internal/presence/collab/ui/ShareReceiversECFStart.java index 57d356b38..0ff1f8db8 100644 --- a/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/internal/presence/collab/ui/ShareReceiversECFStart.java +++ b/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/internal/presence/collab/ui/ShareReceiversECFStart.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 20047 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.internal.presence.collab.ui; diff --git a/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/internal/presence/collab/ui/messages.properties b/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/internal/presence/collab/ui/messages.properties index 7a0c0f9b6..fbe7babf5 100644 --- a/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/internal/presence/collab/ui/messages.properties +++ b/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/internal/presence/collab/ui/messages.properties @@ -1,13 +1,12 @@ -################################################################################ +############################################################################ # Copyright (c) 2007 Composent, Inc. and others. -# 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: -# Composent, Inc. - initial API and implementation -################################################################################ +# This program and the accompanying materials are made +# available under the terms of the Eclipse Public License 2.0 +# which is available at https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 +############################################################################ URLShareRosterContributionItem_ADD_URL_SHARE_MENU_TEXT=Add URL Share Listener URLShareRosterContributionItem_BROWSER_ICON=icons/internal_browser.gif diff --git a/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/internal/presence/collab/ui/view/ShowViewDialogLabelProvider.java b/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/internal/presence/collab/ui/view/ShowViewDialogLabelProvider.java index 3a6219e3a..d1ade19b7 100644 --- a/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/internal/presence/collab/ui/view/ShowViewDialogLabelProvider.java +++ b/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/internal/presence/collab/ui/view/ShowViewDialogLabelProvider.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2007 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.internal.presence.collab.ui.view; diff --git a/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/internal/presence/collab/ui/view/ShowViewDialogTreeContentProvider.java b/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/internal/presence/collab/ui/view/ShowViewDialogTreeContentProvider.java index 771482227..d4784a0c1 100644 --- a/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/internal/presence/collab/ui/view/ShowViewDialogTreeContentProvider.java +++ b/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/internal/presence/collab/ui/view/ShowViewDialogTreeContentProvider.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2007 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.internal.presence.collab.ui.view; diff --git a/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/internal/presence/collab/ui/view/ShowViewDialogViewerFilter.java b/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/internal/presence/collab/ui/view/ShowViewDialogViewerFilter.java index 829ca7be3..38fa1cead 100644 --- a/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/internal/presence/collab/ui/view/ShowViewDialogViewerFilter.java +++ b/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/internal/presence/collab/ui/view/ShowViewDialogViewerFilter.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2007 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.internal.presence.collab.ui.view; diff --git a/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/presence/collab/ui/AbstractCollabShare.java b/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/presence/collab/ui/AbstractCollabShare.java index 94837e2cd..dfebcf0cf 100644 --- a/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/presence/collab/ui/AbstractCollabShare.java +++ b/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/presence/collab/ui/AbstractCollabShare.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2007 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.presence.collab.ui; diff --git a/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/presence/collab/ui/console/ConsoleRosterMenuContributionItem.java b/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/presence/collab/ui/console/ConsoleRosterMenuContributionItem.java index 999423322..afa898abf 100644 --- a/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/presence/collab/ui/console/ConsoleRosterMenuContributionItem.java +++ b/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/presence/collab/ui/console/ConsoleRosterMenuContributionItem.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2007 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.presence.collab.ui.console; diff --git a/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/presence/collab/ui/console/ConsoleShare.java b/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/presence/collab/ui/console/ConsoleShare.java index bae297d6d..74d3e7ab3 100644 --- a/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/presence/collab/ui/console/ConsoleShare.java +++ b/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/presence/collab/ui/console/ConsoleShare.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2007 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.presence.collab.ui.console; diff --git a/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/presence/collab/ui/console/ConsoleShareRosterEntryContributionItem.java b/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/presence/collab/ui/console/ConsoleShareRosterEntryContributionItem.java index 78f785817..afe1e1900 100644 --- a/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/presence/collab/ui/console/ConsoleShareRosterEntryContributionItem.java +++ b/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/presence/collab/ui/console/ConsoleShareRosterEntryContributionItem.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2007 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.presence.collab.ui.console; diff --git a/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/presence/collab/ui/screencapture/ScreenCaptureDataMessage.java b/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/presence/collab/ui/screencapture/ScreenCaptureDataMessage.java index 70e4e925c..6e40c194e 100644 --- a/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/presence/collab/ui/screencapture/ScreenCaptureDataMessage.java +++ b/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/presence/collab/ui/screencapture/ScreenCaptureDataMessage.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2007 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.presence.collab.ui.screencapture; diff --git a/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/presence/collab/ui/screencapture/ScreenCaptureShare.java b/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/presence/collab/ui/screencapture/ScreenCaptureShare.java index c120a0ea5..ef74e9340 100644 --- a/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/presence/collab/ui/screencapture/ScreenCaptureShare.java +++ b/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/presence/collab/ui/screencapture/ScreenCaptureShare.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.presence.collab.ui.screencapture; diff --git a/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/presence/collab/ui/screencapture/ScreenCaptureShareRosterContributionItem.java b/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/presence/collab/ui/screencapture/ScreenCaptureShareRosterContributionItem.java index e74b64426..4c8831aab 100644 --- a/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/presence/collab/ui/screencapture/ScreenCaptureShareRosterContributionItem.java +++ b/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/presence/collab/ui/screencapture/ScreenCaptureShareRosterContributionItem.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2007 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.presence.collab.ui.screencapture; diff --git a/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/presence/collab/ui/screencapture/ScreenCaptureShareRosterEntryContributionItem.java b/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/presence/collab/ui/screencapture/ScreenCaptureShareRosterEntryContributionItem.java index 8c8a9bee2..d7832beab 100644 --- a/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/presence/collab/ui/screencapture/ScreenCaptureShareRosterEntryContributionItem.java +++ b/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/presence/collab/ui/screencapture/ScreenCaptureShareRosterEntryContributionItem.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2007 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.presence.collab.ui.screencapture; diff --git a/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/presence/collab/ui/screencapture/ScreenCaptureStartMessage.java b/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/presence/collab/ui/screencapture/ScreenCaptureStartMessage.java index e568c97e1..da5601af9 100644 --- a/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/presence/collab/ui/screencapture/ScreenCaptureStartMessage.java +++ b/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/presence/collab/ui/screencapture/ScreenCaptureStartMessage.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2007 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.presence.collab.ui.screencapture; diff --git a/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/presence/collab/ui/url/URLShare.java b/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/presence/collab/ui/url/URLShare.java index a2292331f..497c45c1d 100644 --- a/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/presence/collab/ui/url/URLShare.java +++ b/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/presence/collab/ui/url/URLShare.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 20047 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.presence.collab.ui.url; diff --git a/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/presence/collab/ui/url/URLShareRosterContributionItem.java b/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/presence/collab/ui/url/URLShareRosterContributionItem.java index e6a4899ff..46ddc315f 100644 --- a/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/presence/collab/ui/url/URLShareRosterContributionItem.java +++ b/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/presence/collab/ui/url/URLShareRosterContributionItem.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2007 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.presence.collab.ui.url; diff --git a/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/presence/collab/ui/url/URLShareRosterEntryContributionItem.java b/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/presence/collab/ui/url/URLShareRosterEntryContributionItem.java index 2e286b820..0e4eadd14 100644 --- a/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/presence/collab/ui/url/URLShareRosterEntryContributionItem.java +++ b/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/presence/collab/ui/url/URLShareRosterEntryContributionItem.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2007 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.presence.collab.ui.url; diff --git a/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/presence/collab/ui/view/ViewShare.java b/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/presence/collab/ui/view/ViewShare.java index 7e9b833e3..2aa050b20 100644 --- a/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/presence/collab/ui/view/ViewShare.java +++ b/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/presence/collab/ui/view/ViewShare.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.presence.collab.ui.view; diff --git a/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/presence/collab/ui/view/ViewShareRosterContributionItem.java b/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/presence/collab/ui/view/ViewShareRosterContributionItem.java index 9ab62b613..9d18651b2 100644 --- a/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/presence/collab/ui/view/ViewShareRosterContributionItem.java +++ b/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/presence/collab/ui/view/ViewShareRosterContributionItem.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2007 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.presence.collab.ui.view; diff --git a/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/presence/collab/ui/view/ViewShareRosterEntryContributionItem.java b/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/presence/collab/ui/view/ViewShareRosterEntryContributionItem.java index 1863c1b1c..75d704f38 100644 --- a/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/presence/collab/ui/view/ViewShareRosterEntryContributionItem.java +++ b/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/presence/collab/ui/view/ViewShareRosterEntryContributionItem.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2007 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.presence.collab.ui.view; diff --git a/framework/bundles/org.eclipse.ecf.presence.ui/.settings/org.eclipse.jdt.core.prefs b/framework/bundles/org.eclipse.ecf.presence.ui/.settings/org.eclipse.jdt.core.prefs index aa0004e5a..501995227 100644 --- a/framework/bundles/org.eclipse.ecf.presence.ui/.settings/org.eclipse.jdt.core.prefs +++ b/framework/bundles/org.eclipse.ecf.presence.ui/.settings/org.eclipse.jdt.core.prefs @@ -7,10 +7,14 @@ 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.annotation.inheritNullAnnotations=disabled org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull +org.eclipse.jdt.core.compiler.annotation.nonnull.secondary= org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault +org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary= org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable +org.eclipse.jdt.core.compiler.annotation.nullable.secondary= org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 @@ -21,12 +25,14 @@ 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.APILeak=warning +org.eclipse.jdt.core.compiler.problem.annotatedTypeArgumentToUnannotated=info org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.autoboxing=ignore org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning org.eclipse.jdt.core.compiler.problem.deadCode=warning -org.eclipse.jdt.core.compiler.problem.deprecation=warning +org.eclipse.jdt.core.compiler.problem.deprecation=ignore org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore @@ -65,12 +71,15 @@ org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignor 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.nonnullParameterAnnotationDropped=warning +org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error org.eclipse.jdt.core.compiler.problem.nullReference=warning org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore +org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore @@ -85,20 +94,28 @@ org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled +org.eclipse.jdt.core.compiler.problem.suppressWarningsNotFullyAnalysed=info +org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore +org.eclipse.jdt.core.compiler.problem.terminalDeprecation=warning org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning +org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=warning +org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled +org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=info org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning -org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning +org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore +org.eclipse.jdt.core.compiler.problem.unstableAutoModuleName=warning org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=enabled +org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedImport=error org.eclipse.jdt.core.compiler.problem.unusedLabel=warning org.eclipse.jdt.core.compiler.problem.unusedLocal=warning @@ -108,6 +125,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference= 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.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.source=1.5 diff --git a/framework/bundles/org.eclipse.ecf.presence.ui/.settings/org.eclipse.pde.prefs b/framework/bundles/org.eclipse.ecf.presence.ui/.settings/org.eclipse.pde.prefs index 674d76971..e4753971e 100644 --- a/framework/bundles/org.eclipse.ecf.presence.ui/.settings/org.eclipse.pde.prefs +++ b/framework/bundles/org.eclipse.ecf.presence.ui/.settings/org.eclipse.pde.prefs @@ -1,23 +1,27 @@ -#Fri Apr 23 11:10:55 PDT 2010 compilers.f.unresolved-features=1 compilers.f.unresolved-plugins=1 compilers.incompatible-environment=1 compilers.p.build=1 compilers.p.build.bin.includes=1 +compilers.p.build.encodings=2 +compilers.p.build.java.compiler=2 compilers.p.build.java.compliance=1 compilers.p.build.missing.output=2 compilers.p.build.output.library=1 compilers.p.build.source.library=1 compilers.p.build.src.includes=1 -compilers.p.deprecated=1 +compilers.p.deprecated=2 compilers.p.discouraged-class=2 +compilers.p.exec-env-too-low=2 compilers.p.internal=1 compilers.p.missing-packages=2 compilers.p.missing-version-export-package=2 compilers.p.missing-version-import-package=2 compilers.p.missing-version-require-bundle=2 compilers.p.no-required-att=0 +compilers.p.no.automatic.module=1 compilers.p.not-externalized-att=2 +compilers.p.service.component.without.lazyactivation=1 compilers.p.unknown-attribute=1 compilers.p.unknown-class=1 compilers.p.unknown-element=1 diff --git a/framework/bundles/org.eclipse.ecf.presence.ui/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.presence.ui/META-INF/MANIFEST.MF index ca9f8c995..d2f639e49 100644 --- a/framework/bundles/org.eclipse.ecf.presence.ui/META-INF/MANIFEST.MF +++ b/framework/bundles/org.eclipse.ecf.presence.ui/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin.name Bundle-SymbolicName: org.eclipse.ecf.presence.ui;singleton:=true Automatic-Module-Name: org.eclipse.ecf.presence.ui -Bundle-Version: 2.4.100.qualifier +Bundle-Version: 2.4.200.qualifier Bundle-Activator: org.eclipse.ecf.internal.presence.ui.Activator Bundle-Vendor: %plugin.provider Bundle-Localization: plugin diff --git a/framework/bundles/org.eclipse.ecf.presence.ui/about.html b/framework/bundles/org.eclipse.ecf.presence.ui/about.html index 4c79781a5..9f1dc0dd5 100644 --- a/framework/bundles/org.eclipse.ecf.presence.ui/about.html +++ b/framework/bundles/org.eclipse.ecf.presence.ui/about.html @@ -22,7 +22,7 @@ being redistributed by another party ("Redistributor") and different t apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise indicated below, the terms and conditions of the EPL still apply to any source code in the Content -and such source code may be obtained at <a href="/">http://www.eclipse.org</a>.</p> +and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p> </body> </html>
\ No newline at end of file diff --git a/framework/bundles/org.eclipse.ecf.presence.ui/plugin.properties b/framework/bundles/org.eclipse.ecf.presence.ui/plugin.properties index fb3bccaa7..e2d066ea3 100644 --- a/framework/bundles/org.eclipse.ecf.presence.ui/plugin.properties +++ b/framework/bundles/org.eclipse.ecf.presence.ui/plugin.properties @@ -1,14 +1,12 @@ -################################################################################ +############################################################################ # Copyright (c) 2007 Composent, Inc. and others. -# 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: -# Composent, Inc. - initial API and implementation -# Jacek Pospychala <jacek.pospychala@pl.ibm.com> - bug 190851 -################################################################################ +# This program and the accompanying materials are made +# available under the terms of the Eclipse Public License 2.0 +# which is available at https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 +############################################################################ plugin.name=ECF Presence UI plugin.provider=Eclipse.org - ECF diff --git a/framework/bundles/org.eclipse.ecf.presence.ui/pom.xml b/framework/bundles/org.eclipse.ecf.presence.ui/pom.xml index 1a18f3150..f36a75551 100644 --- a/framework/bundles/org.eclipse.ecf.presence.ui/pom.xml +++ b/framework/bundles/org.eclipse.ecf.presence.ui/pom.xml @@ -10,6 +10,6 @@ </parent> <groupId>org.eclipse.ecf</groupId> <artifactId>org.eclipse.ecf.presence.ui</artifactId> - <version>2.4.100-SNAPSHOT</version> + <version>2.4.200-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/framework/bundles/org.eclipse.ecf.presence.ui/schema/rosterViewerDropTarget.exsd b/framework/bundles/org.eclipse.ecf.presence.ui/schema/rosterViewerDropTarget.exsd index f17944e31..22e2e32ba 100644 --- a/framework/bundles/org.eclipse.ecf.presence.ui/schema/rosterViewerDropTarget.exsd +++ b/framework/bundles/org.eclipse.ecf.presence.ui/schema/rosterViewerDropTarget.exsd @@ -1,6 +1,6 @@ <?xml version='1.0' encoding='UTF-8'?> <!-- Schema file written by PDE --> -<schema targetNamespace="org.eclipse.ecf.presence.ui"> +<schema targetNamespace="org.eclipse.ecf.presence.ui" xmlns="http://www.w3.org/2001/XMLSchema"> <annotation> <appInfo> <meta.schema plugin="org.eclipse.ecf.presence.ui" id="rosterViewerDropTarget" name="Roster Viewer Drop Target"/> @@ -11,6 +11,11 @@ </annotation> <element name="extension"> + <annotation> + <appInfo> + <meta.element /> + </appInfo> + </annotation> <complexType> <sequence> <element ref="dropTarget" minOccurs="1" maxOccurs="unbounded"/> @@ -145,7 +150,13 @@ public interface IRosterViewerDropTarget { </appInfo> <documentation> Copyright (c) 2004 Composent, Inc. and others. -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: Composent, Inc. - initial API and implementation + +This program and the accompanying materials are made +available under the terms of the Eclipse Public License 2.0 +which is available at https://www.eclipse.org/legal/epl-2.0/ + +SPDX-License-Identifier: EPL-2.0 + </documentation> </annotation> diff --git a/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/internal/presence/ui/Activator.java b/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/internal/presence/ui/Activator.java index 3b16b8f21..6d55d8044 100644 --- a/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/internal/presence/ui/Activator.java +++ b/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/internal/presence/ui/Activator.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2007 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.internal.presence.ui; diff --git a/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/internal/presence/ui/ChatLine.java b/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/internal/presence/ui/ChatLine.java index d04b88057..ab512e322 100644 --- a/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/internal/presence/ui/ChatLine.java +++ b/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/internal/presence/ui/ChatLine.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.internal.presence.ui; diff --git a/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/internal/presence/ui/Messages.java b/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/internal/presence/ui/Messages.java index c9168453a..09265df1d 100644 --- a/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/internal/presence/ui/Messages.java +++ b/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/internal/presence/ui/Messages.java @@ -1,13 +1,15 @@ /**************************************************************************** * Copyright (c) 2007, 2009 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation * Jacek Pospychala <jacek.pospychala@pl.ibm.com> - bug 197329 + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.internal.presence.ui; diff --git a/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/internal/presence/ui/dialogs/AddContactDialog.java b/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/internal/presence/ui/dialogs/AddContactDialog.java index 383374ad4..324dd7989 100644 --- a/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/internal/presence/ui/dialogs/AddContactDialog.java +++ b/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/internal/presence/ui/dialogs/AddContactDialog.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2007 Remy Suen and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Remy Suen <remy.suen@gmail.com> - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.internal.presence.ui.dialogs; diff --git a/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/internal/presence/ui/dialogs/ChangePasswordDialog.java b/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/internal/presence/ui/dialogs/ChangePasswordDialog.java index fc9a13d24..0a2e14166 100644 --- a/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/internal/presence/ui/dialogs/ChangePasswordDialog.java +++ b/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/internal/presence/ui/dialogs/ChangePasswordDialog.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.internal.presence.ui.dialogs; diff --git a/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/internal/presence/ui/dialogs/ChatRoomSelectionDialog.java b/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/internal/presence/ui/dialogs/ChatRoomSelectionDialog.java index 3683e1c77..f8c60537a 100644 --- a/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/internal/presence/ui/dialogs/ChatRoomSelectionDialog.java +++ b/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/internal/presence/ui/dialogs/ChatRoomSelectionDialog.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.internal.presence.ui.dialogs; diff --git a/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/internal/presence/ui/dialogs/ReceiveAuthorizeRequestDialog.java b/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/internal/presence/ui/dialogs/ReceiveAuthorizeRequestDialog.java index bdfe96c73..4a1e6d0da 100644 --- a/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/internal/presence/ui/dialogs/ReceiveAuthorizeRequestDialog.java +++ b/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/internal/presence/ui/dialogs/ReceiveAuthorizeRequestDialog.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.internal.presence.ui.dialogs; diff --git a/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/internal/presence/ui/dialogs/SearchContactDialog.java b/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/internal/presence/ui/dialogs/SearchContactDialog.java index 98681b648..e53ddc0a3 100644 --- a/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/internal/presence/ui/dialogs/SearchContactDialog.java +++ b/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/internal/presence/ui/dialogs/SearchContactDialog.java @@ -1,12 +1,15 @@ -/******************************************************************************* - * Copyright (c) 2008 Marcelo Mayworm. 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 - * +/**************************************************************************** + * Copyright (c) 2008 Marcelo Mayworm. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Marcelo Mayworm - initial API and implementation + * * - ******************************************************************************/ + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.internal.presence.ui.dialogs; import java.util.Iterator; diff --git a/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/internal/presence/ui/handlers/BrowseDialog.java b/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/internal/presence/ui/handlers/BrowseDialog.java index 7ce2aafc0..69733f11d 100644 --- a/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/internal/presence/ui/handlers/BrowseDialog.java +++ b/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/internal/presence/ui/handlers/BrowseDialog.java @@ -1,13 +1,15 @@ -/******************************************************************************* +/**************************************************************************** * Copyright (c) 2007 Chris Aniszczyk and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Chris Aniszczyk <caniszczyk@gmail.com> - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.internal.presence.ui.handlers; import java.text.Collator; diff --git a/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/internal/presence/ui/handlers/BrowseHandler.java b/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/internal/presence/ui/handlers/BrowseHandler.java index 9e328edd8..276151d17 100644 --- a/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/internal/presence/ui/handlers/BrowseHandler.java +++ b/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/internal/presence/ui/handlers/BrowseHandler.java @@ -1,13 +1,15 @@ -/******************************************************************************* +/**************************************************************************** * Copyright (c) 2007 Chris Aniszczyk and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Chris Aniszczyk <caniszczyk@gmail.com> - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.internal.presence.ui.handlers; import org.eclipse.core.commands.*; diff --git a/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/internal/presence/ui/messages.properties b/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/internal/presence/ui/messages.properties index 5b88fd0f8..05a30a50c 100644 --- a/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/internal/presence/ui/messages.properties +++ b/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/internal/presence/ui/messages.properties @@ -1,14 +1,12 @@ -################################################################################ +############################################################################ # Copyright (c) 2007, 2009 Composent, Inc. and others. -# 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: -# Composent, Inc. - initial API and implementation -# Jacek Pospychala <jacek.pospychala@pl.ibm.com> - bug 197329 -################################################################################ +# This program and the accompanying materials are made +# available under the terms of the Eclipse Public License 2.0 +# which is available at https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 +############################################################################ ########################## # Messages for EN locale # diff --git a/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/internal/presence/ui/preferences/ChatRoomPreferencePage.java b/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/internal/presence/ui/preferences/ChatRoomPreferencePage.java index ac0b0a6b2..61483494a 100644 --- a/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/internal/presence/ui/preferences/ChatRoomPreferencePage.java +++ b/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/internal/presence/ui/preferences/ChatRoomPreferencePage.java @@ -1,14 +1,16 @@ -/******************************************************************************* +/**************************************************************************** * Copyright (c) 2007 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation * Abner Ballardo <modlost@modlost.net> - bug 192756 - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.internal.presence.ui.preferences; import org.eclipse.ecf.internal.presence.ui.Activator; diff --git a/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/internal/presence/ui/preferences/PreferenceConstants.java b/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/internal/presence/ui/preferences/PreferenceConstants.java index 2104f0496..3a9cc51d1 100644 --- a/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/internal/presence/ui/preferences/PreferenceConstants.java +++ b/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/internal/presence/ui/preferences/PreferenceConstants.java @@ -1,14 +1,16 @@ -/******************************************************************************* +/**************************************************************************** * Copyright (c) 2007 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation * Abner Ballardo <modlost@modlost.net> - bug 192756 - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.internal.presence.ui.preferences; /** diff --git a/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/internal/presence/ui/preferences/PreferenceInitializer.java b/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/internal/presence/ui/preferences/PreferenceInitializer.java index 7152c7d12..ca32bb56b 100644 --- a/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/internal/presence/ui/preferences/PreferenceInitializer.java +++ b/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/internal/presence/ui/preferences/PreferenceInitializer.java @@ -1,14 +1,16 @@ -/******************************************************************************* +/**************************************************************************** * Copyright (c) 2007 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation * Abner Ballardo <modlost@modlost.net> - bug 192756 - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.internal.presence.ui.preferences; import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer; diff --git a/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/IMultiRosterViewPart.java b/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/IMultiRosterViewPart.java index 1e71da180..21c901715 100644 --- a/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/IMultiRosterViewPart.java +++ b/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/IMultiRosterViewPart.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.presence.ui; diff --git a/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/MessageNotificationPopup.java b/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/MessageNotificationPopup.java index cfcbc09a4..759d99d5f 100644 --- a/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/MessageNotificationPopup.java +++ b/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/MessageNotificationPopup.java @@ -1,14 +1,16 @@ -/******************************************************************************* +/**************************************************************************** * Copyright (c) 2004 - 2006 University Of British Columbia and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * University Of British Columbia - initial API and implementation * Rob Elves - creator of the original TaskListNotificationPopup class - *******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.presence.ui; diff --git a/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/MessagesView.java b/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/MessagesView.java index a9b8f2646..6f3d02408 100644 --- a/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/MessagesView.java +++ b/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/MessagesView.java @@ -1,13 +1,15 @@ /**************************************************************************** * Copyright (c) 2007, 2009 Remy Suen, Composent, Inc., and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Remy Suen <remy.suen@gmail.com> - initial API and implementation * Hiroyuki Inaba <hiroyuki.inaba@gmail.com> - Bug 259856 The error message when the chat message cannot be sent is not correct. + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.presence.ui; diff --git a/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/MultiRosterAccount.java b/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/MultiRosterAccount.java index 7f3cefec8..81e56eb89 100644 --- a/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/MultiRosterAccount.java +++ b/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/MultiRosterAccount.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.presence.ui; diff --git a/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/MultiRosterContentProvider.java b/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/MultiRosterContentProvider.java index 03b01c6be..98a9697ce 100644 --- a/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/MultiRosterContentProvider.java +++ b/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/MultiRosterContentProvider.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004, 2007 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.presence.ui; diff --git a/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/MultiRosterLabelProvider.java b/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/MultiRosterLabelProvider.java index 110e1d68f..97f519d2f 100644 --- a/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/MultiRosterLabelProvider.java +++ b/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/MultiRosterLabelProvider.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004, 2007 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.presence.ui; diff --git a/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/MultiRosterView.java b/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/MultiRosterView.java index fb21b46d9..2e1a92527 100644 --- a/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/MultiRosterView.java +++ b/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/MultiRosterView.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004, 2007 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.presence.ui; diff --git a/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/RosterWorkbenchAdapter2Factory.java b/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/RosterWorkbenchAdapter2Factory.java index 3c9e16d77..5c1b50114 100644 --- a/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/RosterWorkbenchAdapter2Factory.java +++ b/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/RosterWorkbenchAdapter2Factory.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.presence.ui; diff --git a/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/RosterWorkbenchAdapterFactory.java b/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/RosterWorkbenchAdapterFactory.java index 1e95fe1d1..3b670f323 100644 --- a/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/RosterWorkbenchAdapterFactory.java +++ b/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/RosterWorkbenchAdapterFactory.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.presence.ui; diff --git a/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/UserSearchContentProvider.java b/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/UserSearchContentProvider.java index dabcb07c9..535769537 100644 --- a/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/UserSearchContentProvider.java +++ b/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/UserSearchContentProvider.java @@ -1,12 +1,15 @@ -/******************************************************************************* - * Copyright (c) 2008 Marcelo Mayworm. 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 - * +/**************************************************************************** + * Copyright (c) 2008 Marcelo Mayworm. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Marcelo Mayworm - initial API and implementation + * * - ******************************************************************************/ + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.presence.ui; import java.util.List; diff --git a/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/UserSearchLabelProvider.java b/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/UserSearchLabelProvider.java index 8da20b560..ac669151f 100644 --- a/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/UserSearchLabelProvider.java +++ b/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/UserSearchLabelProvider.java @@ -1,12 +1,15 @@ -/******************************************************************************* - * Copyright (c) 2008 Marcelo Mayworm. 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 - * +/**************************************************************************** + * Copyright (c) 2008 Marcelo Mayworm. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Marcelo Mayworm - initial API and implementation + * * - ******************************************************************************/ + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.presence.ui; import org.eclipse.ecf.internal.presence.ui.Messages; diff --git a/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/UserSearchView.java b/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/UserSearchView.java index 2fb2a2e7e..2d6c8fff5 100644 --- a/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/UserSearchView.java +++ b/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/UserSearchView.java @@ -1,12 +1,15 @@ -/******************************************************************************* - * Copyright (c) 2008 Marcelo Mayworm. 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 - * +/**************************************************************************** + * Copyright (c) 2008 Marcelo Mayworm. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Marcelo Mayworm - initial API and implementation + * * - ******************************************************************************/ + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.presence.ui; import java.util.ArrayList; diff --git a/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/chatroom/ChatRoomManagerUI.java b/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/chatroom/ChatRoomManagerUI.java index 6d6707345..b318b4846 100644 --- a/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/chatroom/ChatRoomManagerUI.java +++ b/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/chatroom/ChatRoomManagerUI.java @@ -1,14 +1,16 @@ /**************************************************************************** * Copyright (c) 2004, 2007 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation * Jacek Pospychala <jacek.pospychala@pl.ibm.com> - bug 197329 * Abner Ballardo <modlost@modlost.net> - bug 200630 + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.presence.ui.chatroom; diff --git a/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/chatroom/ChatRoomManagerView.java b/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/chatroom/ChatRoomManagerView.java index 1d56b59e3..1703db5ce 100644 --- a/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/chatroom/ChatRoomManagerView.java +++ b/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/chatroom/ChatRoomManagerView.java @@ -1,9 +1,9 @@ -/******************************************************************************* +/**************************************************************************** * Copyright (c) 2004, 2008 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation @@ -11,7 +11,9 @@ * Abner Ballardo <modlost@modlost.net> - bug 192756, 199336, 200630 * Jakub Jurkiewicz <jakub.jurkiewicz@pl.ibm.com> - bug 197332 * Hiroyuki Inaba <Hiroyuki <hiroyuki.inaba@gmail.com> - bug 222253 - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.presence.ui.chatroom; import java.net.URI; diff --git a/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/chatroom/IChatRoomCommandListener.java b/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/chatroom/IChatRoomCommandListener.java index 792b7632c..8decb0534 100644 --- a/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/chatroom/IChatRoomCommandListener.java +++ b/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/chatroom/IChatRoomCommandListener.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.presence.ui.chatroom; diff --git a/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/chatroom/IChatRoomViewCloseListener.java b/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/chatroom/IChatRoomViewCloseListener.java index d3c68a329..0de3f0aa5 100644 --- a/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/chatroom/IChatRoomViewCloseListener.java +++ b/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/chatroom/IChatRoomViewCloseListener.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.presence.ui.chatroom; diff --git a/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/chatroom/IMessageRenderer.java b/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/chatroom/IMessageRenderer.java index 6fc4330ea..94bb9993c 100644 --- a/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/chatroom/IMessageRenderer.java +++ b/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/chatroom/IMessageRenderer.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2007 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Jacek Pospychala <jacek.pospychala@pl.ibm.com> - bug 197329 + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.presence.ui.chatroom; diff --git a/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/chatroom/MessageRenderer.java b/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/chatroom/MessageRenderer.java index 9b4fe5765..08ae2de5b 100644 --- a/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/chatroom/MessageRenderer.java +++ b/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/chatroom/MessageRenderer.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2007 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Jacek Pospychala <jacek.pospychala@pl.ibm.com> - bug 197329, 190851 + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.presence.ui.chatroom; diff --git a/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/dnd/IRosterViewerDropTarget.java b/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/dnd/IRosterViewerDropTarget.java index 55869ed33..15b2d9690 100644 --- a/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/dnd/IRosterViewerDropTarget.java +++ b/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/dnd/IRosterViewerDropTarget.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.presence.ui.dnd; diff --git a/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/menu/AbstractRosterMenuContributionItem.java b/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/menu/AbstractRosterMenuContributionItem.java index 937a3e1a6..2ba296259 100644 --- a/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/menu/AbstractRosterMenuContributionItem.java +++ b/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/menu/AbstractRosterMenuContributionItem.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2007 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.presence.ui.menu; diff --git a/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/menu/AbstractRosterMenuHandler.java b/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/menu/AbstractRosterMenuHandler.java index 6db7b9edc..46c99b48c 100644 --- a/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/menu/AbstractRosterMenuHandler.java +++ b/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/menu/AbstractRosterMenuHandler.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2007 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.presence.ui.menu; diff --git a/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/menu/NoopRosterMenuContributionItem.java b/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/menu/NoopRosterMenuContributionItem.java index d835e7645..71b7ad69b 100644 --- a/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/menu/NoopRosterMenuContributionItem.java +++ b/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/menu/NoopRosterMenuContributionItem.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2007 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.presence.ui.menu; diff --git a/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/roster/AbstractPresenceContributionItem.java b/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/roster/AbstractPresenceContributionItem.java index 57dc4a2b4..4e8639b35 100644 --- a/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/roster/AbstractPresenceContributionItem.java +++ b/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/roster/AbstractPresenceContributionItem.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.presence.ui.roster; diff --git a/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/roster/AbstractRosterContributionItem.java b/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/roster/AbstractRosterContributionItem.java index 0a8d4d080..6e4e25a6e 100644 --- a/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/roster/AbstractRosterContributionItem.java +++ b/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/roster/AbstractRosterContributionItem.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.presence.ui.roster; diff --git a/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/roster/AbstractRosterEntryContributionItem.java b/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/roster/AbstractRosterEntryContributionItem.java index f9d68c4c6..72346ff69 100644 --- a/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/roster/AbstractRosterEntryContributionItem.java +++ b/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/roster/AbstractRosterEntryContributionItem.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.presence.ui.roster; diff --git a/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/roster/AbstractRosterGroupContributionItem.java b/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/roster/AbstractRosterGroupContributionItem.java index 670e99967..6235169da 100644 --- a/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/roster/AbstractRosterGroupContributionItem.java +++ b/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/roster/AbstractRosterGroupContributionItem.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.presence.ui.roster; diff --git a/framework/bundles/org.eclipse.ecf.presence/.settings/org.eclipse.jdt.core.prefs b/framework/bundles/org.eclipse.ecf.presence/.settings/org.eclipse.jdt.core.prefs index c092cabb0..d2a42b861 100644 --- a/framework/bundles/org.eclipse.ecf.presence/.settings/org.eclipse.jdt.core.prefs +++ b/framework/bundles/org.eclipse.ecf.presence/.settings/org.eclipse.jdt.core.prefs @@ -21,7 +21,7 @@ org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.autoboxing=ignore org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning org.eclipse.jdt.core.compiler.problem.deadCode=warning -org.eclipse.jdt.core.compiler.problem.deprecation=warning +org.eclipse.jdt.core.compiler.problem.deprecation=ignore org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled org.eclipse.jdt.core.compiler.problem.discouragedReference=error diff --git a/framework/bundles/org.eclipse.ecf.presence/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.presence/META-INF/MANIFEST.MF index ff709bfa7..7c5c62944 100644 --- a/framework/bundles/org.eclipse.ecf.presence/META-INF/MANIFEST.MF +++ b/framework/bundles/org.eclipse.ecf.presence/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-Name: %plugin.name Bundle-SymbolicName: org.eclipse.ecf.presence;singleton:=true Automatic-Module-Name: org.eclipse.ecf.presence -Bundle-Version: 2.1.100.qualifier +Bundle-Version: 2.1.200.qualifier Bundle-Activator: org.eclipse.ecf.internal.presence.PresencePlugin Bundle-Vendor: %plugin.provider Bundle-Localization: plugin diff --git a/framework/bundles/org.eclipse.ecf.presence/about.html b/framework/bundles/org.eclipse.ecf.presence/about.html index 4c79781a5..9f1dc0dd5 100644 --- a/framework/bundles/org.eclipse.ecf.presence/about.html +++ b/framework/bundles/org.eclipse.ecf.presence/about.html @@ -22,7 +22,7 @@ being redistributed by another party ("Redistributor") and different t apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise indicated below, the terms and conditions of the EPL still apply to any source code in the Content -and such source code may be obtained at <a href="/">http://www.eclipse.org</a>.</p> +and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p> </body> </html>
\ No newline at end of file diff --git a/framework/bundles/org.eclipse.ecf.presence/plugin.properties b/framework/bundles/org.eclipse.ecf.presence/plugin.properties index d30f19b32..63ac89b02 100644 --- a/framework/bundles/org.eclipse.ecf.presence/plugin.properties +++ b/framework/bundles/org.eclipse.ecf.presence/plugin.properties @@ -1,10 +1,11 @@ ############################################################################ # Copyright (c) 2007 Composent Inc., IBM Corp. and others. -# 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 # +# This program and the accompanying materials are made +# available under the terms of the Eclipse Public License 2.0 +# which is available at https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 ############################################################################ plugin.provider = Eclipse.org - ECF plugin.name = ECF Presence API
\ No newline at end of file diff --git a/framework/bundles/org.eclipse.ecf.presence/pom.xml b/framework/bundles/org.eclipse.ecf.presence/pom.xml index 41b3375be..c0cdb2717 100644 --- a/framework/bundles/org.eclipse.ecf.presence/pom.xml +++ b/framework/bundles/org.eclipse.ecf.presence/pom.xml @@ -10,6 +10,6 @@ </parent> <groupId>org.eclipse.ecf</groupId> <artifactId>org.eclipse.ecf.presence</artifactId> - <version>2.1.100-SNAPSHOT</version> + <version>2.1.200-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/internal/presence/PresencePlugin.java b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/internal/presence/PresencePlugin.java index bc0d4c905..9fe4af010 100644 --- a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/internal/presence/PresencePlugin.java +++ b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/internal/presence/PresencePlugin.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.internal.presence; diff --git a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/AbstractPresenceContainer.java b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/AbstractPresenceContainer.java index 052efcd62..582dec8c9 100644 --- a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/AbstractPresenceContainer.java +++ b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/AbstractPresenceContainer.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2005 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Chris Aniszczyk <zx@us.ibm.com> - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.presence; diff --git a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IAccountManager.java b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IAccountManager.java index eb88656e2..82cb76f6f 100644 --- a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IAccountManager.java +++ b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IAccountManager.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.presence; diff --git a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IFQID.java b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IFQID.java index 26f9a3485..df7b9a541 100644 --- a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IFQID.java +++ b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IFQID.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2008 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.presence; diff --git a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IIMMessage.java b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IIMMessage.java index 30d04af96..f38e83377 100644 --- a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IIMMessage.java +++ b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IIMMessage.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.presence; diff --git a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IIMMessageEvent.java b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IIMMessageEvent.java index 07e2c6b54..61148569b 100644 --- a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IIMMessageEvent.java +++ b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IIMMessageEvent.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.presence; diff --git a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IIMMessageListener.java b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IIMMessageListener.java index 13950165d..6d0e4e376 100644 --- a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IIMMessageListener.java +++ b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IIMMessageListener.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.presence; diff --git a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IMMessage.java b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IMMessage.java index bb2573300..ff9ca0a9b 100644 --- a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IMMessage.java +++ b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IMMessage.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004, 2007 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.presence; diff --git a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IPresence.java b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IPresence.java index 9fa721c9a..790143955 100644 --- a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IPresence.java +++ b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IPresence.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.presence; diff --git a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IPresenceContainer.java b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IPresenceContainer.java index 9e9e9ce26..0844cb1fc 100644 --- a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IPresenceContainer.java +++ b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IPresenceContainer.java @@ -1,12 +1,15 @@ -/******************************************************************************* -* Copyright (c) 2009 EclipseSource and others. 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: -* EclipseSource - initial API and implementation -******************************************************************************/ +/**************************************************************************** + * Copyright (c) 2009 EclipseSource and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * Contributors: + * EclipseSource - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.presence; import org.eclipse.ecf.core.IContainer; diff --git a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IPresenceContainerAdapter.java b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IPresenceContainerAdapter.java index 0219ec42c..ba54ce58e 100644 --- a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IPresenceContainerAdapter.java +++ b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IPresenceContainerAdapter.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.presence; diff --git a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IPresenceListener.java b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IPresenceListener.java index 74d784503..6674c2029 100644 --- a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IPresenceListener.java +++ b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IPresenceListener.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.presence; diff --git a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IPresenceSender.java b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IPresenceSender.java index 548331529..0e5088f2d 100644 --- a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IPresenceSender.java +++ b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IPresenceSender.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.presence; diff --git a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/Presence.java b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/Presence.java index 4d75e4cc4..1733965ef 100644 --- a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/Presence.java +++ b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/Presence.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.presence; diff --git a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/PresenceContainer.java b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/PresenceContainer.java index bf63eaef4..276510a4e 100644 --- a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/PresenceContainer.java +++ b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/PresenceContainer.java @@ -1,12 +1,15 @@ -/******************************************************************************* -* Copyright (c) 2009 EclipseSource and others. 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: -* EclipseSource - initial API and implementation -******************************************************************************/ +/**************************************************************************** + * Copyright (c) 2009 EclipseSource and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * Contributors: + * EclipseSource - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.presence; import org.eclipse.core.runtime.Assert; diff --git a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/chatroom/ChatRoomCreateException.java b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/chatroom/ChatRoomCreateException.java index 0e52e6ad0..32cee42fb 100644 --- a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/chatroom/ChatRoomCreateException.java +++ b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/chatroom/ChatRoomCreateException.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.presence.chatroom; diff --git a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/chatroom/ChatRoomMessage.java b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/chatroom/ChatRoomMessage.java index f0b5b97ec..b0be1a5ec 100644 --- a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/chatroom/ChatRoomMessage.java +++ b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/chatroom/ChatRoomMessage.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.presence.chatroom; diff --git a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/chatroom/ChatRoomMessageEvent.java b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/chatroom/ChatRoomMessageEvent.java index 5ecb50aef..02bff4243 100644 --- a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/chatroom/ChatRoomMessageEvent.java +++ b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/chatroom/ChatRoomMessageEvent.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.presence.chatroom; diff --git a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/chatroom/IChatRoomAdminListener.java b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/chatroom/IChatRoomAdminListener.java index bff4520bc..e5cb4bb9a 100644 --- a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/chatroom/IChatRoomAdminListener.java +++ b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/chatroom/IChatRoomAdminListener.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.presence.chatroom; diff --git a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/chatroom/IChatRoomAdminSender.java b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/chatroom/IChatRoomAdminSender.java index 189c6525d..8e59e3f9a 100644 --- a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/chatroom/IChatRoomAdminSender.java +++ b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/chatroom/IChatRoomAdminSender.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2007 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.presence.chatroom; diff --git a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/chatroom/IChatRoomContainer.java b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/chatroom/IChatRoomContainer.java index 94470b703..31fc3d88d 100644 --- a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/chatroom/IChatRoomContainer.java +++ b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/chatroom/IChatRoomContainer.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.presence.chatroom; diff --git a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/chatroom/IChatRoomContainerOptionsAdapter.java b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/chatroom/IChatRoomContainerOptionsAdapter.java index e7542d286..a584b6aa9 100644 --- a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/chatroom/IChatRoomContainerOptionsAdapter.java +++ b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/chatroom/IChatRoomContainerOptionsAdapter.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.presence.chatroom; diff --git a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/chatroom/IChatRoomInfo.java b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/chatroom/IChatRoomInfo.java index 6ac63fadf..6ce5a216a 100644 --- a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/chatroom/IChatRoomInfo.java +++ b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/chatroom/IChatRoomInfo.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.presence.chatroom; diff --git a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/chatroom/IChatRoomInvitationListener.java b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/chatroom/IChatRoomInvitationListener.java index df3886d40..b0c395638 100644 --- a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/chatroom/IChatRoomInvitationListener.java +++ b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/chatroom/IChatRoomInvitationListener.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004, 2007 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.presence.chatroom; diff --git a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/chatroom/IChatRoomInvitationSender.java b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/chatroom/IChatRoomInvitationSender.java index 1a7219ac1..6be0578a9 100644 --- a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/chatroom/IChatRoomInvitationSender.java +++ b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/chatroom/IChatRoomInvitationSender.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.presence.chatroom; diff --git a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/chatroom/IChatRoomManager.java b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/chatroom/IChatRoomManager.java index f538db20d..8fab4508c 100644 --- a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/chatroom/IChatRoomManager.java +++ b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/chatroom/IChatRoomManager.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004, 2007 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.presence.chatroom; diff --git a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/chatroom/IChatRoomMessage.java b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/chatroom/IChatRoomMessage.java index 2db7047f1..a2654d25b 100644 --- a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/chatroom/IChatRoomMessage.java +++ b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/chatroom/IChatRoomMessage.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.presence.chatroom; diff --git a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/chatroom/IChatRoomMessageEvent.java b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/chatroom/IChatRoomMessageEvent.java index d7bcf027d..f7b19135c 100644 --- a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/chatroom/IChatRoomMessageEvent.java +++ b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/chatroom/IChatRoomMessageEvent.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.presence.chatroom; diff --git a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/chatroom/IChatRoomMessageSender.java b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/chatroom/IChatRoomMessageSender.java index d4936f28e..4fe63fd40 100644 --- a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/chatroom/IChatRoomMessageSender.java +++ b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/chatroom/IChatRoomMessageSender.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.presence.chatroom; diff --git a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/chatroom/IChatRoomParticipantListener.java b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/chatroom/IChatRoomParticipantListener.java index bfb396668..e5a18d01d 100644 --- a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/chatroom/IChatRoomParticipantListener.java +++ b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/chatroom/IChatRoomParticipantListener.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.presence.chatroom; diff --git a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/history/IHistory.java b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/history/IHistory.java index b06fa24d9..c6a811b88 100644 --- a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/history/IHistory.java +++ b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/history/IHistory.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.presence.history; diff --git a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/history/IHistoryLine.java b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/history/IHistoryLine.java index 2e14c3a37..7645592c2 100644 --- a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/history/IHistoryLine.java +++ b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/history/IHistoryLine.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.presence.history; diff --git a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/history/IHistoryManager.java b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/history/IHistoryManager.java index 0c998b45d..0357f9ca2 100644 --- a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/history/IHistoryManager.java +++ b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/history/IHistoryManager.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.presence.history; diff --git a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/im/ChatMessage.java b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/im/ChatMessage.java index 5ad9e2090..c940bcd4d 100644 --- a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/im/ChatMessage.java +++ b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/im/ChatMessage.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.presence.im; diff --git a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/im/ChatMessageEvent.java b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/im/ChatMessageEvent.java index b41ab2c42..c7a9b19c4 100644 --- a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/im/ChatMessageEvent.java +++ b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/im/ChatMessageEvent.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.presence.im; diff --git a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/im/IChat.java b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/im/IChat.java index 2db2e1c30..590fbb64e 100644 --- a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/im/IChat.java +++ b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/im/IChat.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2007 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.presence.im; diff --git a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/im/IChatID.java b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/im/IChatID.java index b8ff03bbe..2700855f9 100644 --- a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/im/IChatID.java +++ b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/im/IChatID.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.presence.im; diff --git a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/im/IChatManager.java b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/im/IChatManager.java index b57f12203..04c6938d4 100644 --- a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/im/IChatManager.java +++ b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/im/IChatManager.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.presence.im; diff --git a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/im/IChatMessage.java b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/im/IChatMessage.java index 15178fad0..e686593f4 100644 --- a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/im/IChatMessage.java +++ b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/im/IChatMessage.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.presence.im; diff --git a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/im/IChatMessageEvent.java b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/im/IChatMessageEvent.java index 98aa5037f..7809539c0 100644 --- a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/im/IChatMessageEvent.java +++ b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/im/IChatMessageEvent.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.presence.im; diff --git a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/im/IChatMessageSender.java b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/im/IChatMessageSender.java index 29c1ab60d..3894d6798 100644 --- a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/im/IChatMessageSender.java +++ b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/im/IChatMessageSender.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.presence.im; diff --git a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/im/IChatRoomCreationEvent.java b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/im/IChatRoomCreationEvent.java index 17593d435..0f401e575 100644 --- a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/im/IChatRoomCreationEvent.java +++ b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/im/IChatRoomCreationEvent.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.presence.im; diff --git a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/im/ITypingMessage.java b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/im/ITypingMessage.java index dac44c94e..4abbc7313 100644 --- a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/im/ITypingMessage.java +++ b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/im/ITypingMessage.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.presence.im; diff --git a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/im/ITypingMessageEvent.java b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/im/ITypingMessageEvent.java index 06e284d8a..2f33761ca 100644 --- a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/im/ITypingMessageEvent.java +++ b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/im/ITypingMessageEvent.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.presence.im; diff --git a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/im/ITypingMessageSender.java b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/im/ITypingMessageSender.java index d46724f17..692842851 100644 --- a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/im/ITypingMessageSender.java +++ b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/im/ITypingMessageSender.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004, 2007 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.presence.im; diff --git a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/im/IXHTMLChatMessage.java b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/im/IXHTMLChatMessage.java index d1574de28..fc2ad3295 100644 --- a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/im/IXHTMLChatMessage.java +++ b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/im/IXHTMLChatMessage.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.presence.im; diff --git a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/im/IXHTMLChatMessageEvent.java b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/im/IXHTMLChatMessageEvent.java index 4d6a55d85..2a05ff024 100644 --- a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/im/IXHTMLChatMessageEvent.java +++ b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/im/IXHTMLChatMessageEvent.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.presence.im; diff --git a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/im/TypingMessage.java b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/im/TypingMessage.java index 013f282d2..43c252d3b 100644 --- a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/im/TypingMessage.java +++ b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/im/TypingMessage.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.presence.im; diff --git a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/im/TypingMessageEvent.java b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/im/TypingMessageEvent.java index c7af5979c..df4bc8296 100644 --- a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/im/TypingMessageEvent.java +++ b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/im/TypingMessageEvent.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.presence.im; diff --git a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/im/XHTMLChatMessage.java b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/im/XHTMLChatMessage.java index 2e2f6fb97..d3a4b79e7 100644 --- a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/im/XHTMLChatMessage.java +++ b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/im/XHTMLChatMessage.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.presence.im; diff --git a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/im/XHTMLChatMessageEvent.java b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/im/XHTMLChatMessageEvent.java index dc261fa2a..9546501b2 100644 --- a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/im/XHTMLChatMessageEvent.java +++ b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/im/XHTMLChatMessageEvent.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.presence.im; diff --git a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/roster/AbstractRosterManager.java b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/roster/AbstractRosterManager.java index 9c2458b69..f5e44eead 100644 --- a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/roster/AbstractRosterManager.java +++ b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/roster/AbstractRosterManager.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.presence.roster; diff --git a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/roster/IRoster.java b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/roster/IRoster.java index 5c6b2935d..9e685e4ce 100644 --- a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/roster/IRoster.java +++ b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/roster/IRoster.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.presence.roster; diff --git a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/roster/IRosterEntry.java b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/roster/IRosterEntry.java index 5f77bfd1a..70f45f675 100644 --- a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/roster/IRosterEntry.java +++ b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/roster/IRosterEntry.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.presence.roster; diff --git a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/roster/IRosterGroup.java b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/roster/IRosterGroup.java index 8d552b85d..3c87fa9de 100644 --- a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/roster/IRosterGroup.java +++ b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/roster/IRosterGroup.java @@ -1,23 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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: - * Composent, Inc. - initial API and implementation - *****************************************************************************/ - -/**************************************************************************** - * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.presence.roster; diff --git a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/roster/IRosterItem.java b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/roster/IRosterItem.java index ea79da8cc..1f355c9e1 100644 --- a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/roster/IRosterItem.java +++ b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/roster/IRosterItem.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.presence.roster; diff --git a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/roster/IRosterListener.java b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/roster/IRosterListener.java index c62c46529..b16ff2990 100644 --- a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/roster/IRosterListener.java +++ b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/roster/IRosterListener.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.presence.roster; diff --git a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/roster/IRosterManager.java b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/roster/IRosterManager.java index a42ebb199..9e747d2e6 100644 --- a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/roster/IRosterManager.java +++ b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/roster/IRosterManager.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.presence.roster; diff --git a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/roster/IRosterSubscriptionListener.java b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/roster/IRosterSubscriptionListener.java index 9ff820a1f..cca62bc7c 100644 --- a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/roster/IRosterSubscriptionListener.java +++ b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/roster/IRosterSubscriptionListener.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.presence.roster; diff --git a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/roster/IRosterSubscriptionSender.java b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/roster/IRosterSubscriptionSender.java index ea0f2c591..053ec6017 100644 --- a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/roster/IRosterSubscriptionSender.java +++ b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/roster/IRosterSubscriptionSender.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.presence.roster; diff --git a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/roster/Roster.java b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/roster/Roster.java index 308b3ab90..e84fabfa6 100644 --- a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/roster/Roster.java +++ b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/roster/Roster.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.presence.roster; diff --git a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/roster/RosterEntry.java b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/roster/RosterEntry.java index 691790808..80ef67b20 100644 --- a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/roster/RosterEntry.java +++ b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/roster/RosterEntry.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.presence.roster; diff --git a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/roster/RosterGroup.java b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/roster/RosterGroup.java index 1f3758797..90eea818d 100644 --- a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/roster/RosterGroup.java +++ b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/roster/RosterGroup.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.presence.roster; diff --git a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/roster/RosterItem.java b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/roster/RosterItem.java index ff2551b2e..b6f801d06 100644 --- a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/roster/RosterItem.java +++ b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/roster/RosterItem.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.presence.roster; diff --git a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/AbstractUserSearchManager.java b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/AbstractUserSearchManager.java index 9d0a56902..e9e457756 100644 --- a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/AbstractUserSearchManager.java +++ b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/AbstractUserSearchManager.java @@ -1,12 +1,15 @@ -/******************************************************************************* - * Copyright (c) 2008 Marcelo Mayworm. 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 - * +/**************************************************************************** + * Copyright (c) 2008 Marcelo Mayworm. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Marcelo Mayworm - initial API and implementation + * * - ******************************************************************************/ + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.presence.search; import java.util.*; diff --git a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/ICriteria.java b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/ICriteria.java index 749ed69bb..aa8f73493 100644 --- a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/ICriteria.java +++ b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/ICriteria.java @@ -1,12 +1,15 @@ -/******************************************************************************* - * Copyright (c) 2008 Marcelo Mayworm. 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 - * +/**************************************************************************** + * Copyright (c) 2008 Marcelo Mayworm. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Marcelo Mayworm - initial API and implementation + * * - ******************************************************************************/ + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.presence.search; diff --git a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/ICriterion.java b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/ICriterion.java index ec5cd4770..2b5c223b9 100644 --- a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/ICriterion.java +++ b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/ICriterion.java @@ -1,12 +1,15 @@ -/******************************************************************************* - * Copyright (c) 2008 Marcelo Mayworm. 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 - * +/**************************************************************************** + * Copyright (c) 2008 Marcelo Mayworm. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Marcelo Mayworm - initial API and implementation + * * - ******************************************************************************/ + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.presence.search; diff --git a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/IRestriction.java b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/IRestriction.java index 7c05ad154..fa6c67283 100644 --- a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/IRestriction.java +++ b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/IRestriction.java @@ -1,12 +1,15 @@ -/******************************************************************************* - * Copyright (c) 2008 Marcelo Mayworm. 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 - * +/**************************************************************************** + * Copyright (c) 2008 Marcelo Mayworm. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Marcelo Mayworm - initial API and implementation + * * - ******************************************************************************/ + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.presence.search; /** diff --git a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/IResult.java b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/IResult.java index 036be1d3c..e162c2d91 100644 --- a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/IResult.java +++ b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/IResult.java @@ -1,12 +1,15 @@ -/******************************************************************************* - * Copyright (c) 2008 Marcelo Mayworm. 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 - * +/**************************************************************************** + * Copyright (c) 2008 Marcelo Mayworm. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Marcelo Mayworm - initial API and implementation + * * - ******************************************************************************/ + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.presence.search; import org.eclipse.core.runtime.IAdaptable; diff --git a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/IResultList.java b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/IResultList.java index db7e4d4c3..eb8c7945a 100644 --- a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/IResultList.java +++ b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/IResultList.java @@ -1,12 +1,15 @@ -/******************************************************************************* - * Copyright (c) 2008 Marcelo Mayworm. 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 - * +/**************************************************************************** + * Copyright (c) 2008 Marcelo Mayworm. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Marcelo Mayworm - initial API and implementation + * * - ******************************************************************************/ + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.presence.search; diff --git a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/ISearch.java b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/ISearch.java index 2b2000347..45f2d9d35 100644 --- a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/ISearch.java +++ b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/ISearch.java @@ -1,12 +1,15 @@ -/******************************************************************************* - * Copyright (c) 2008 Marcelo Mayworm. 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 - * +/**************************************************************************** + * Copyright (c) 2008 Marcelo Mayworm. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Marcelo Mayworm - initial API and implementation + * * - ******************************************************************************/ + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.presence.search; diff --git a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/IUserSearchCompleteEvent.java b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/IUserSearchCompleteEvent.java index 6108235d4..cb4e4f079 100644 --- a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/IUserSearchCompleteEvent.java +++ b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/IUserSearchCompleteEvent.java @@ -1,12 +1,15 @@ -/******************************************************************************* - * Copyright (c) 2008 Marcelo Mayworm. 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 - * +/**************************************************************************** + * Copyright (c) 2008 Marcelo Mayworm. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Marcelo Mayworm - initial API and implementation + * * - ******************************************************************************/ + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.presence.search; /** diff --git a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/IUserSearchEvent.java b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/IUserSearchEvent.java index 67594fe2d..552b67a2a 100644 --- a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/IUserSearchEvent.java +++ b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/IUserSearchEvent.java @@ -1,12 +1,15 @@ -/******************************************************************************* - * Copyright (c) 2008 Marcelo Mayworm. 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 - * +/**************************************************************************** + * Copyright (c) 2008 Marcelo Mayworm. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Marcelo Mayworm - initial API and implementation + * * - ******************************************************************************/ + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.presence.search; import org.eclipse.ecf.core.util.Event; diff --git a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/IUserSearchListener.java b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/IUserSearchListener.java index b7bbc3348..e459396c4 100644 --- a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/IUserSearchListener.java +++ b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/IUserSearchListener.java @@ -1,12 +1,15 @@ -/******************************************************************************* - * Copyright (c) 2008 Marcelo Mayworm. 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 - * +/**************************************************************************** + * Copyright (c) 2008 Marcelo Mayworm. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Marcelo Mayworm - initial API and implementation + * * - ******************************************************************************/ + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.presence.search; /** diff --git a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/IUserSearchManager.java b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/IUserSearchManager.java index 3fa08a946..0eabbf38d 100644 --- a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/IUserSearchManager.java +++ b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/IUserSearchManager.java @@ -1,12 +1,15 @@ -/******************************************************************************* - * Copyright (c) 2008 Marcelo Mayworm. 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 - * +/**************************************************************************** + * Copyright (c) 2008 Marcelo Mayworm. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Marcelo Mayworm - initial API and implementation + * * - ******************************************************************************/ + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.presence.search; diff --git a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/LogicalCriterion.java b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/LogicalCriterion.java index 7f7dea718..2dd0570eb 100644 --- a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/LogicalCriterion.java +++ b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/LogicalCriterion.java @@ -1,12 +1,15 @@ -/******************************************************************************* - * Copyright (c) 2008 Marcelo Mayworm. 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 - * +/**************************************************************************** + * Copyright (c) 2008 Marcelo Mayworm. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Marcelo Mayworm - initial API and implementation + * * - ******************************************************************************/ + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.presence.search; /** diff --git a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/Restriction.java b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/Restriction.java index 911560d75..07aef88e3 100644 --- a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/Restriction.java +++ b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/Restriction.java @@ -1,12 +1,15 @@ -/******************************************************************************* - * Copyright (c) 2008 Marcelo Mayworm. 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 - * +/**************************************************************************** + * Copyright (c) 2008 Marcelo Mayworm. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Marcelo Mayworm - initial API and implementation + * * - ******************************************************************************/ + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.presence.search; /** diff --git a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/ResultList.java b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/ResultList.java index 6429ccf75..619f72701 100644 --- a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/ResultList.java +++ b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/ResultList.java @@ -1,12 +1,15 @@ -/******************************************************************************* - * Copyright (c) 2008 Marcelo Mayworm. 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 - * +/**************************************************************************** + * Copyright (c) 2008 Marcelo Mayworm. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Marcelo Mayworm - initial API and implementation + * * - ******************************************************************************/ + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.presence.search; import java.util.*; diff --git a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/SimpleCriterion.java b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/SimpleCriterion.java index 3f2120a21..8083bd41e 100644 --- a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/SimpleCriterion.java +++ b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/SimpleCriterion.java @@ -1,12 +1,15 @@ -/******************************************************************************* - * Copyright (c) 2008 Marcelo Mayworm. 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 - * +/**************************************************************************** + * Copyright (c) 2008 Marcelo Mayworm. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Marcelo Mayworm - initial API and implementation + * * - ******************************************************************************/ + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.presence.search; /** diff --git a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/UserSearchCompleteEvent.java b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/UserSearchCompleteEvent.java index 4d9000314..de5fde421 100644 --- a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/UserSearchCompleteEvent.java +++ b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/UserSearchCompleteEvent.java @@ -1,12 +1,15 @@ -/******************************************************************************* - * Copyright (c) 2008 Marcelo Mayworm. 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 - * +/**************************************************************************** + * Copyright (c) 2008 Marcelo Mayworm. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Marcelo Mayworm - initial API and implementation + * * - ******************************************************************************/ + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.presence.search; /** diff --git a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/UserSearchException.java b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/UserSearchException.java index ab1394b23..79d2364eb 100644 --- a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/UserSearchException.java +++ b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/UserSearchException.java @@ -1,12 +1,15 @@ -/******************************************************************************* - * Copyright (c) 2008 Marcelo Mayworm. 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 - * +/**************************************************************************** + * Copyright (c) 2008 Marcelo Mayworm. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Marcelo Mayworm - initial API and implementation + * * - ******************************************************************************/ + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.presence.search; import org.eclipse.core.runtime.IStatus; diff --git a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/message/IMessageResult.java b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/message/IMessageResult.java index a5b5bbad6..36260c2a4 100644 --- a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/message/IMessageResult.java +++ b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/message/IMessageResult.java @@ -1,12 +1,15 @@ -/******************************************************************************* - * Copyright (c) 2008 Marcelo Mayworm. 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 - * +/**************************************************************************** + * Copyright (c) 2008 Marcelo Mayworm. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Marcelo Mayworm - initial API and implementation + * * - ******************************************************************************/ + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.presence.search.message; import org.eclipse.ecf.presence.im.IChatMessage; diff --git a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/message/IMessageSearchCompleteEvent.java b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/message/IMessageSearchCompleteEvent.java index b1957a12f..2f55f517d 100644 --- a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/message/IMessageSearchCompleteEvent.java +++ b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/message/IMessageSearchCompleteEvent.java @@ -1,12 +1,15 @@ -/******************************************************************************* - * Copyright (c) 2008 Marcelo Mayworm. 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 - * +/**************************************************************************** + * Copyright (c) 2008 Marcelo Mayworm. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Marcelo Mayworm - initial API and implementation + * * - ******************************************************************************/ + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.presence.search.message; diff --git a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/message/IMessageSearchEvent.java b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/message/IMessageSearchEvent.java index 4732984b0..403cbd972 100644 --- a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/message/IMessageSearchEvent.java +++ b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/message/IMessageSearchEvent.java @@ -1,12 +1,15 @@ -/******************************************************************************* - * Copyright (c) 2008 Marcelo Mayworm. 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 - * +/**************************************************************************** + * Copyright (c) 2008 Marcelo Mayworm. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Marcelo Mayworm - initial API and implementation + * * - ******************************************************************************/ + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.presence.search.message; diff --git a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/message/IMessageSearchListener.java b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/message/IMessageSearchListener.java index 8ff4912e6..972c75282 100644 --- a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/message/IMessageSearchListener.java +++ b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/message/IMessageSearchListener.java @@ -1,12 +1,15 @@ -/******************************************************************************* - * Copyright (c) 2008 Marcelo Mayworm. 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 - * +/**************************************************************************** + * Copyright (c) 2008 Marcelo Mayworm. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Marcelo Mayworm - initial API and implementation + * * - ******************************************************************************/ + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.presence.search.message; diff --git a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/message/IMessageSearchManager.java b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/message/IMessageSearchManager.java index 5c714af36..856b58d60 100644 --- a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/message/IMessageSearchManager.java +++ b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/message/IMessageSearchManager.java @@ -1,12 +1,15 @@ -/******************************************************************************* - * Copyright (c) 2008 Marcelo Mayworm. 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 - * +/**************************************************************************** + * Copyright (c) 2008 Marcelo Mayworm. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Marcelo Mayworm - initial API and implementation + * * - ******************************************************************************/ + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.presence.search.message; diff --git a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/message/MessageSearchCompleteEvent.java b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/message/MessageSearchCompleteEvent.java index e22497c8e..5f304a041 100644 --- a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/message/MessageSearchCompleteEvent.java +++ b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/message/MessageSearchCompleteEvent.java @@ -1,12 +1,15 @@ -/******************************************************************************* - * Copyright (c) 2008 Marcelo Mayworm. 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 - * +/**************************************************************************** + * Copyright (c) 2008 Marcelo Mayworm. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Marcelo Mayworm - initial API and implementation + * * - ******************************************************************************/ + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.presence.search.message; diff --git a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/message/MessageSearchException.java b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/message/MessageSearchException.java index 53714bdb4..83998c9b7 100644 --- a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/message/MessageSearchException.java +++ b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/message/MessageSearchException.java @@ -1,12 +1,15 @@ -/******************************************************************************* - * Copyright (c) 2008 Marcelo Mayworm. 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 - * +/**************************************************************************** + * Copyright (c) 2008 Marcelo Mayworm. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Marcelo Mayworm - initial API and implementation + * * - ******************************************************************************/ + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.presence.search.message; import org.eclipse.core.runtime.IStatus; diff --git a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/service/IPresenceService.java b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/service/IPresenceService.java index 878499184..443d4272d 100644 --- a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/service/IPresenceService.java +++ b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/service/IPresenceService.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.presence.service; diff --git a/framework/bundles/org.eclipse.ecf.provider/.classpath b/framework/bundles/org.eclipse.ecf.provider/.classpath index 64c5e31b7..eca7bdba8 100644 --- a/framework/bundles/org.eclipse.ecf.provider/.classpath +++ b/framework/bundles/org.eclipse.ecf.provider/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/framework/bundles/org.eclipse.ecf.provider/.settings/.api_filters b/framework/bundles/org.eclipse.ecf.provider/.settings/.api_filters deleted file mode 100644 index 27fec571c..000000000 --- a/framework/bundles/org.eclipse.ecf.provider/.settings/.api_filters +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<component id="org.eclipse.ecf.provider" version="2"> - <resource path="src/org/eclipse/ecf/provider/comm/tcp/Client.java" type="org.eclipse.ecf.provider.comm.tcp.Client"> - <filter comment="Set close timeout to system property value with same default" id="389242988"> - <message_arguments> - <message_argument value="org.eclipse.ecf.provider.comm.tcp.Client"/> - <message_argument value="DEFAULT_CLOSE_TIMEOUT"/> - <message_argument value="2000"/> - </message_arguments> - </filter> - <filter comment="Changed constant to be assigned via system property with same default" id="389242988"> - <message_arguments> - <message_argument value="org.eclipse.ecf.provider.comm.tcp.Client"/> - <message_argument value="DEFAULT_MAX_BUFFER_MSG"/> - <message_argument value="50"/> - </message_arguments> - </filter> - <filter comment="Constant now assigned via access to system property with same default" id="389242988"> - <message_arguments> - <message_argument value="org.eclipse.ecf.provider.comm.tcp.Client"/> - <message_argument value="DEFAULT_WAIT_INTERVAL"/> - <message_argument value="10"/> - </message_arguments> - </filter> - </resource> - <resource path="src/org/eclipse/ecf/provider/generic/TCPClientSOContainer.java" type="org.eclipse.ecf.provider.generic.TCPClientSOContainer"> - <filter id="389242988"> - <message_arguments> - <message_argument value="org.eclipse.ecf.provider.generic.TCPClientSOContainer"/> - <message_argument value="DEFAULT_TCP_CONNECT_TIMEOUT"/> - <message_argument value="30000"/> - </message_arguments> - </filter> - </resource> -</component> diff --git a/framework/bundles/org.eclipse.ecf.provider/.settings/org.eclipse.jdt.core.prefs b/framework/bundles/org.eclipse.ecf.provider/.settings/org.eclipse.jdt.core.prefs index 3d93c5b6c..6781fd970 100644 --- a/framework/bundles/org.eclipse.ecf.provider/.settings/org.eclipse.jdt.core.prefs +++ b/framework/bundles/org.eclipse.ecf.provider/.settings/org.eclipse.jdt.core.prefs @@ -7,26 +7,38 @@ 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.annotation.inheritNullAnnotations=disabled +org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore +org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull +org.eclipse.jdt.core.compiler.annotation.nonnull.secondary= +org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault +org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary= +org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable +org.eclipse.jdt.core.compiler.annotation.nullable.secondary= +org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.compliance=1.8 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.APILeak=warning +org.eclipse.jdt.core.compiler.problem.annotatedTypeArgumentToUnannotated=info org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.autoboxing=ignore org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning org.eclipse.jdt.core.compiler.problem.deadCode=warning -org.eclipse.jdt.core.compiler.problem.deprecation=warning +org.eclipse.jdt.core.compiler.problem.deprecation=ignore org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled org.eclipse.jdt.core.compiler.problem.discouragedReference=warning org.eclipse.jdt.core.compiler.problem.emptyStatement=warning org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled org.eclipse.jdt.core.compiler.problem.fieldHiding=warning @@ -42,7 +54,9 @@ 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.missingDefaultCase=ignore org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore +org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled @@ -57,13 +71,22 @@ org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignor 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.nonnullParameterAnnotationDropped=warning +org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning +org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error org.eclipse.jdt.core.compiler.problem.nullReference=warning +org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error +org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore +org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore +org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore +org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore +org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore @@ -71,19 +94,28 @@ org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled +org.eclipse.jdt.core.compiler.problem.suppressWarningsNotFullyAnalysed=info +org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning +org.eclipse.jdt.core.compiler.problem.terminalDeprecation=warning org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled -org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning +org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore +org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning +org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=warning +org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled +org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=info org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning -org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning +org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore +org.eclipse.jdt.core.compiler.problem.unstableAutoModuleName=warning org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=enabled +org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedImport=error org.eclipse.jdt.core.compiler.problem.unusedLabel=warning org.eclipse.jdt.core.compiler.problem.unusedLocal=warning @@ -93,25 +125,31 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference= org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=enabled org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=enabled org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning -org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning +org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore +org.eclipse.jdt.core.compiler.problem.unusedWarningToken=ignore org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.source=1.8 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 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_bitwise_operator=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_logical_operator=16 org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=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_string_concatenation=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 @@ -181,11 +219,12 @@ 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_additive_operator=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_bitwise_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 @@ -215,6 +254,8 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=inser 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_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=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 @@ -238,12 +279,16 @@ 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_relational_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=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_bitwise_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 @@ -289,6 +334,8 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do n 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_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=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 @@ -324,8 +371,11 @@ org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not inser 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_relational_operator=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_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=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 @@ -348,6 +398,10 @@ 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.formatter.wrap_before_additive_operator=true +org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true +org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true +org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true +org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true org.eclipse.jdt.core.incompatibleJDKLevel=ignore org.eclipse.jdt.core.incompleteClasspath=error diff --git a/framework/bundles/org.eclipse.ecf.provider/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.provider/META-INF/MANIFEST.MF index 5492207aa..c99d509a7 100644 --- a/framework/bundles/org.eclipse.ecf.provider/META-INF/MANIFEST.MF +++ b/framework/bundles/org.eclipse.ecf.provider/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-SymbolicName: org.eclipse.ecf.provider;singleton:=true Automatic-Module-Name: org.eclipse.ecf.provider -Bundle-Version: 4.8.100.qualifier +Bundle-Version: 4.9.1.qualifier Bundle-Name: %plugin.name Bundle-Vendor: %plugin.provider Bundle-Activator: org.eclipse.ecf.internal.provider.ProviderPlugin @@ -13,15 +13,14 @@ Export-Package: org.eclipse.ecf.internal.provider;x-internal:=true, org.eclipse.ecf.provider.generic;version="4.3.0", org.eclipse.ecf.provider.generic.gmm;version="4.3.0", org.eclipse.ecf.provider.util;version="4.4.0" -Eclipse-BuddyPolicy: global Bundle-ManifestVersion: 2 Require-Bundle: org.eclipse.equinox.common;bundle-version="[3.0.0,4.0.0)", - org.eclipse.ecf;bundle-version="3.4.0", + org.eclipse.ecf;bundle-version="3.10.0", org.eclipse.ecf.sharedobject;bundle-version="[2.5.0,3.0.0)" Import-Package: org.osgi.framework;version="[1.3.0,2.0.0)", org.osgi.service.log;version="[1.3.0,2.0.0)", org.osgi.util.tracker;version="[1.3.2,2.0.0)" -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy DynamicImport-Package: * diff --git a/framework/bundles/org.eclipse.ecf.provider/OSGI-INF/permissions.perm b/framework/bundles/org.eclipse.ecf.provider/OSGI-INF/permissions.perm new file mode 100644 index 000000000..3e23f82e2 --- /dev/null +++ b/framework/bundles/org.eclipse.ecf.provider/OSGI-INF/permissions.perm @@ -0,0 +1,30 @@ +# Requires +(org.osgi.framework.BundlePermission "org.eclipse.equinox.common" "require") +(org.osgi.framework.BundlePermission "org.eclipse.ecf" "require") +(org.osgi.framework.BundlePermission "org.eclipse.ecf.sharedobject" "require") +# Imports +(org.osgi.framework.PackagePermission "org.osgi.framework" "import") +(org.osgi.framework.PackagePermission "org.osgi.service.log" "import") +(org.osgi.framework.PackagePermission "org.osgi.util.tracker" "import") +# Exports +(org.osgi.framework.PackagePermission "org.eclipse.ecf.provider.comm" "export") +(org.osgi.framework.PackagePermission "org.eclipse.ecf.provider.comm.tcp" "export") +(org.osgi.framework.PackagePermission "org.eclipse.ecf.provider.generic" "export") +(org.osgi.framework.PackagePermission "org.eclipse.ecf.provider.generic.gmm" "export") +(org.osgi.framework.PackagePermission "org.eclipse.ecf.provider.util" "export") +(org.osgi.framework.BundlePermission "org.eclipse.ecf.provider" "provide") + +# services +(org.osgi.framework.ServicePermission "*" "get,register") +# +(java.io.SerializablePermission "enableSubclassImplementation") +(java.io.SerializablePermission "enableSubstitution") +(org.osgi.framework.AdaptPermission "*" "adapt") +(org.osgi.framework.AdminPermission "*" "*") +(org.eclipse.equinox.log.LogPermission "*" "log") +(java.util.PropertyPermission "*" "read") +(java.net.SocketPermission "*" "accept") +(java.net.SocketPermission "*" "listen,resolve") +(java.net.SocketPermission "*" "connect") +(java.net.SocketPermission "*" "resolve") +(java.lang.RuntimePermission "*") diff --git a/framework/bundles/org.eclipse.ecf.provider/about.html b/framework/bundles/org.eclipse.ecf.provider/about.html index 4c79781a5..9f1dc0dd5 100644 --- a/framework/bundles/org.eclipse.ecf.provider/about.html +++ b/framework/bundles/org.eclipse.ecf.provider/about.html @@ -22,7 +22,7 @@ being redistributed by another party ("Redistributor") and different t apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise indicated below, the terms and conditions of the EPL still apply to any source code in the Content -and such source code may be obtained at <a href="/">http://www.eclipse.org</a>.</p> +and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p> </body> </html>
\ No newline at end of file diff --git a/framework/bundles/org.eclipse.ecf.provider/build.properties b/framework/bundles/org.eclipse.ecf.provider/build.properties index af15676f5..899dcd0bb 100644 --- a/framework/bundles/org.eclipse.ecf.provider/build.properties +++ b/framework/bundles/org.eclipse.ecf.provider/build.properties @@ -1,18 +1,18 @@ -############################################################################### +############################################################################ # Copyright (c) 2005, 2006 IBM Corporation and others. -# 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: -# IBM Corporation - initial API and implementation -############################################################################### +# This program and the accompanying materials are made +# available under the terms of the Eclipse Public License 2.0 +# which is available at https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 +############################################################################ bin.includes = .,\ plugin.xml,\ META-INF/,\ about.html,\ - plugin.properties + plugin.properties,\ + OSGI-INF/ src.includes = about.html jars.compile.order = . source.. = src/ diff --git a/framework/bundles/org.eclipse.ecf.provider/plugin.properties b/framework/bundles/org.eclipse.ecf.provider/plugin.properties index 5a2925540..2a9fa65b3 100644 --- a/framework/bundles/org.eclipse.ecf.provider/plugin.properties +++ b/framework/bundles/org.eclipse.ecf.provider/plugin.properties @@ -1,10 +1,11 @@ ############################################################################ # Copyright (c) 2007 Composent Inc., IBM Corp. and others. -# 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 # +# This program and the accompanying materials are made +# available under the terms of the Eclipse Public License 2.0 +# which is available at https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 ############################################################################ plugin.name=ECF Generic Provider plugin.provider=Eclipse.org - ECF diff --git a/framework/bundles/org.eclipse.ecf.provider/pom.xml b/framework/bundles/org.eclipse.ecf.provider/pom.xml index fb531edca..c32555595 100644 --- a/framework/bundles/org.eclipse.ecf.provider/pom.xml +++ b/framework/bundles/org.eclipse.ecf.provider/pom.xml @@ -10,6 +10,6 @@ </parent> <groupId>org.eclipse.ecf</groupId> <artifactId>org.eclipse.ecf.provider</artifactId> - <version>4.8.100-SNAPSHOT</version> + <version>4.9.1-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/internal/provider/ECFProviderDebugOptions.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/internal/provider/ECFProviderDebugOptions.java index 1228fe1b5..ef1498a0d 100644 --- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/internal/provider/ECFProviderDebugOptions.java +++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/internal/provider/ECFProviderDebugOptions.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2007 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.internal.provider; diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/internal/provider/ProviderPlugin.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/internal/provider/ProviderPlugin.java index 8c7aecfd9..b263db581 100644 --- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/internal/provider/ProviderPlugin.java +++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/internal/provider/ProviderPlugin.java @@ -1,13 +1,15 @@ /**************************************************************************** -* Copyright (c) 2004 Composent, Inc. and others. -* 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: -* Composent, Inc. - initial API and implementation -*****************************************************************************/ + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * Contributors: + * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.internal.provider; diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/AsynchEvent.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/AsynchEvent.java index 7d89d0660..259eae511 100644 --- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/AsynchEvent.java +++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/AsynchEvent.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.provider.comm; diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/ConnectionCreateException.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/ConnectionCreateException.java index 2a21ce3e5..17a75dcc7 100644 --- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/ConnectionCreateException.java +++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/ConnectionCreateException.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.provider.comm; diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/ConnectionEvent.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/ConnectionEvent.java index a5763711a..5624295e9 100644 --- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/ConnectionEvent.java +++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/ConnectionEvent.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.provider.comm; diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/DisconnectEvent.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/DisconnectEvent.java index b2b54cb0f..33326ac6f 100644 --- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/DisconnectEvent.java +++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/DisconnectEvent.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.provider.comm; diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/IAsynchConnection.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/IAsynchConnection.java index 650fabe72..dd9e04b74 100644 --- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/IAsynchConnection.java +++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/IAsynchConnection.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.provider.comm; diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/IAsynchEventHandler.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/IAsynchEventHandler.java index 904a63fe9..1b9aec08c 100644 --- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/IAsynchEventHandler.java +++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/IAsynchEventHandler.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.provider.comm; diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/IConnectRequestHandler.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/IConnectRequestHandler.java index 945bf3e0a..19856b27d 100644 --- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/IConnectRequestHandler.java +++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/IConnectRequestHandler.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.provider.comm; diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/IConnection.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/IConnection.java index 70c7416b5..974695fbc 100644 --- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/IConnection.java +++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/IConnection.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.provider.comm; diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/IConnectionListener.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/IConnectionListener.java index 5c26860c5..1d18ab24a 100644 --- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/IConnectionListener.java +++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/IConnectionListener.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.provider.comm; diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/ISynchAsynchConnection.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/ISynchAsynchConnection.java index 748dc7607..01ebda622 100644 --- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/ISynchAsynchConnection.java +++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/ISynchAsynchConnection.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.provider.comm; diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/ISynchAsynchEventHandler.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/ISynchAsynchEventHandler.java index c9d6903d6..0fb004245 100644 --- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/ISynchAsynchEventHandler.java +++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/ISynchAsynchEventHandler.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.provider.comm; diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/ISynchConnection.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/ISynchConnection.java index b05c9d3b7..0d4167cb4 100644 --- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/ISynchConnection.java +++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/ISynchConnection.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.provider.comm; diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/ISynchEventHandler.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/ISynchEventHandler.java index 9bc093beb..2fc8ed051 100644 --- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/ISynchEventHandler.java +++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/ISynchEventHandler.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.provider.comm; diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/SynchEvent.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/SynchEvent.java index 67c7a6c53..08d620d71 100644 --- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/SynchEvent.java +++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/SynchEvent.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.provider.comm; diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/tcp/AsynchMessage.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/tcp/AsynchMessage.java index 016d91027..894ed98ab 100644 --- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/tcp/AsynchMessage.java +++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/tcp/AsynchMessage.java @@ -1,13 +1,15 @@ /**************************************************************************** -* Copyright (c) 2004 Composent, Inc. and others. -* 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: -* Composent, Inc. - initial API and implementation -*****************************************************************************/ + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * Contributors: + * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.provider.comm.tcp; diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/tcp/Client.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/tcp/Client.java index 4c6acb7c4..d74264ea7 100644 --- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/tcp/Client.java +++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/tcp/Client.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.provider.comm.tcp; diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/tcp/ConnectRequestMessage.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/tcp/ConnectRequestMessage.java index 06467511d..0e4bcfd59 100644 --- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/tcp/ConnectRequestMessage.java +++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/tcp/ConnectRequestMessage.java @@ -1,13 +1,15 @@ /**************************************************************************** -* Copyright (c) 2004 Composent, Inc. and others. -* 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: -* Composent, Inc. - initial API and implementation -*****************************************************************************/ + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * Contributors: + * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.provider.comm.tcp; diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/tcp/ConnectResultMessage.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/tcp/ConnectResultMessage.java index e134567ac..015263cbc 100644 --- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/tcp/ConnectResultMessage.java +++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/tcp/ConnectResultMessage.java @@ -1,13 +1,15 @@ /**************************************************************************** -* Copyright (c) 2004 Composent, Inc. and others. -* 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: -* Composent, Inc. - initial API and implementation -*****************************************************************************/ + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * Contributors: + * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.provider.comm.tcp; diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/tcp/ExObjectInputStream.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/tcp/ExObjectInputStream.java index 8d45247e3..1e94d6fed 100644 --- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/tcp/ExObjectInputStream.java +++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/tcp/ExObjectInputStream.java @@ -1,13 +1,15 @@ /**************************************************************************** -* Copyright (c) 2004 Composent, Inc. and others. -* 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: -* Composent, Inc. - initial API and implementation -*****************************************************************************/ + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * Contributors: + * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.provider.comm.tcp; diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/tcp/ExObjectOutputStream.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/tcp/ExObjectOutputStream.java index 1e87ddc27..9e9a81047 100644 --- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/tcp/ExObjectOutputStream.java +++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/tcp/ExObjectOutputStream.java @@ -1,13 +1,15 @@ /**************************************************************************** -* Copyright (c) 2004 Composent, Inc. and others. -* 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: -* Composent, Inc. - initial API and implementation -*****************************************************************************/ + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * Contributors: + * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.provider.comm.tcp; diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/tcp/IClientSocketFactory.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/tcp/IClientSocketFactory.java index c20a33aef..9552c1cb5 100644 --- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/tcp/IClientSocketFactory.java +++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/tcp/IClientSocketFactory.java @@ -1,13 +1,15 @@ /**************************************************************************** -* Copyright (c) 2004 Composent, Inc. and others. -* 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: -* Composent, Inc. - initial API and implementation -*****************************************************************************/ + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * Contributors: + * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.provider.comm.tcp; diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/tcp/IServerSocketFactory.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/tcp/IServerSocketFactory.java index 881db59e7..a2f1dceff 100644 --- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/tcp/IServerSocketFactory.java +++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/tcp/IServerSocketFactory.java @@ -1,13 +1,15 @@ /**************************************************************************** -* Copyright (c) 2004 Composent, Inc. and others. -* 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: -* Composent, Inc. - initial API and implementation -*****************************************************************************/ + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * Contributors: + * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.provider.comm.tcp; diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/tcp/ISocketAcceptHandler.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/tcp/ISocketAcceptHandler.java index 20e2ea4ec..b50f15ff8 100644 --- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/tcp/ISocketAcceptHandler.java +++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/tcp/ISocketAcceptHandler.java @@ -1,13 +1,15 @@ /**************************************************************************** -* Copyright (c) 2004 Composent, Inc. and others. -* 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: -* Composent, Inc. - initial API and implementation -*****************************************************************************/ + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * Contributors: + * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.provider.comm.tcp; diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/tcp/PingMessage.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/tcp/PingMessage.java index 1b16f34e2..a651361de 100644 --- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/tcp/PingMessage.java +++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/tcp/PingMessage.java @@ -1,13 +1,15 @@ /**************************************************************************** -* Copyright (c) 2004 Composent, Inc. and others. -* 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: -* Composent, Inc. - initial API and implementation -*****************************************************************************/ + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * Contributors: + * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.provider.comm.tcp; diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/tcp/PingResponseMessage.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/tcp/PingResponseMessage.java index 9737c01fb..e70627794 100644 --- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/tcp/PingResponseMessage.java +++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/tcp/PingResponseMessage.java @@ -1,13 +1,15 @@ /**************************************************************************** -* Copyright (c) 2004 Composent, Inc. and others. -* 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: -* Composent, Inc. - initial API and implementation -*****************************************************************************/ + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * Contributors: + * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.provider.comm.tcp; diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/tcp/SSLClient.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/tcp/SSLClient.java index f28a997f2..25c71d55c 100644 --- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/tcp/SSLClient.java +++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/tcp/SSLClient.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2012 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.provider.comm.tcp; diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/tcp/Server.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/tcp/Server.java index c0aedab2b..f9f05d601 100644 --- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/tcp/Server.java +++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/tcp/Server.java @@ -1,13 +1,15 @@ /**************************************************************************** -* Copyright (c) 2004 Composent, Inc. and others. -* 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: -* Composent, Inc. - initial API and implementation -*****************************************************************************/ + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * Contributors: + * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.provider.comm.tcp; diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/tcp/SocketFactory.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/tcp/SocketFactory.java index b68ed01a6..04c9311be 100644 --- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/tcp/SocketFactory.java +++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/tcp/SocketFactory.java @@ -1,13 +1,15 @@ /**************************************************************************** -* Copyright (c) 2004 Composent, Inc. and others. -* 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: -* Composent, Inc. - initial API and implementation -*****************************************************************************/ + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * Contributors: + * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.provider.comm.tcp; diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/tcp/SynchMessage.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/tcp/SynchMessage.java index 1339e0d84..7c8443d8f 100644 --- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/tcp/SynchMessage.java +++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/tcp/SynchMessage.java @@ -1,13 +1,15 @@ /**************************************************************************** -* Copyright (c) 2004 Composent, Inc. and others. -* 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: -* Composent, Inc. - initial API and implementation -*****************************************************************************/ + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * Contributors: + * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.provider.comm.tcp; diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/ClientSOContainer.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/ClientSOContainer.java index daa18c39a..be945c007 100644 --- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/ClientSOContainer.java +++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/ClientSOContainer.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.provider.generic; import java.io.*; diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/ContainerMessage.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/ContainerMessage.java index ef0375b96..125c41408 100644 --- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/ContainerMessage.java +++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/ContainerMessage.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.provider.generic; diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/GenericContainerInstantiator.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/GenericContainerInstantiator.java index a8a5fb3b2..f309f2671 100644 --- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/GenericContainerInstantiator.java +++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/GenericContainerInstantiator.java @@ -1,13 +1,15 @@ -/******************************************************************************* +/**************************************************************************** * Copyright (c) 2004, 2007 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.provider.generic; import java.io.IOException; @@ -73,11 +75,11 @@ public class GenericContainerInstantiator implements IContainerInstantiator, IRe protected Integer getIntegerFromArg(Object arg) { if (arg == null) - return new Integer(-1); + return Integer.valueOf(-1); if (arg instanceof Integer) return (Integer) arg; else if (arg instanceof String) { - return new Integer((String) arg); + return Integer.valueOf((String) arg); } else throw new IllegalArgumentException("arg=" + arg + " is not of integer type"); //$NON-NLS-1$ //$NON-NLS-2$ } @@ -147,7 +149,7 @@ public class GenericContainerInstantiator implements IContainerInstantiator, IRe if (newID == null) newID = IDFactory.getDefault().createStringID(IDFactory.getDefault().createGUID().getName()); if (ka == null) - ka = new Integer(TCPServerSOContainer.DEFAULT_KEEPALIVE); + ka = Integer.valueOf(TCPServerSOContainer.DEFAULT_KEEPALIVE); return new GenericContainerArgs(newID, ka); } @@ -226,7 +228,7 @@ public class GenericContainerInstantiator implements IContainerInstantiator, IRe newID = createTCPServerID(TCPServerSOContainer.DEFAULT_HOST, port, TCPServerSOContainer.DEFAULT_NAME); } if (ka == null) - ka = new Integer(TCPServerSOContainer.DEFAULT_KEEPALIVE); + ka = Integer.valueOf(TCPServerSOContainer.DEFAULT_KEEPALIVE); // Check private intent if (privateIntent) diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOConfig.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOConfig.java index e2d84a7e6..7034a2e47 100644 --- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOConfig.java +++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOConfig.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ /* diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOConnector.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOConnector.java index 4b1970749..fc0c5a4c8 100644 --- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOConnector.java +++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOConnector.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ /* diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOContainer.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOContainer.java index a9acd3776..7b6eccf7a 100644 --- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOContainer.java +++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOContainer.java @@ -1,16 +1,18 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.provider.generic; import java.io.*; -import java.security.AccessController; -import java.security.PrivilegedAction; +import java.security.*; import java.util.HashMap; import java.util.Map; import org.eclipse.core.runtime.*; @@ -991,9 +993,6 @@ public abstract class SOContainer extends AbstractContainer implements ISharedOb return getSharedObjectMessageSerializer().serializeMessage(sharedObjectID, message); } - private static final String SO_SERIALIZATION_OSGI = "osgi.basic"; //$NON-NLS-1$ - private static final String SO_SERIALIZATION_DEFAULT = System.getProperty("org.eclipse.ecf.provider.soserialization", SO_SERIALIZATION_OSGI); //$NON-NLS-1$ - /** * @param sharedObjectID shared object ID * @param message message @@ -1004,13 +1003,25 @@ public abstract class SOContainer extends AbstractContainer implements ISharedOb protected byte[] defaultSerializeSharedObjectMessage(ID sharedObjectID, Object message) throws IOException { if (!(message instanceof Serializable)) throw new NotSerializableException("shared object=" + sharedObjectID + " message=" + message + " not serializable"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - final ByteArrayOutputStream bouts = new ByteArrayOutputStream(); - // If system property set to osgi.basic then use OSGIObjectOutputStream, if not then - // use ObjectOutputStream - final ObjectOutputStream oos = SO_SERIALIZATION_DEFAULT.equals(SO_SERIALIZATION_OSGI) ? new OSGIObjectOutputStream(bouts) : new ObjectOutputStream(bouts); - oos.writeObject(message); - oos.close(); - return bouts.toByteArray(); + try { + return AccessController.doPrivileged((PrivilegedExceptionAction<byte[]>) () -> { + final ByteArrayOutputStream bouts = new ByteArrayOutputStream(); + // If system property set to osgi.basic then use OSGIObjectOutputStream, if not then + // use ObjectOutputStream + final ObjectOutputStream oos = new OSGIObjectOutputStream(bouts); + // write shared object id, so we can read it on receiver and get the classloader for the given shared object + oos.writeObject(sharedObjectID); + oos.writeObject(message); + oos.close(); + return bouts.toByteArray(); + }); + } catch (PrivilegedActionException e) { + Throwable t = e.getCause(); + if (t instanceof IOException) { + throw (IOException) t; + } + throw new IOException("Unexpected exception trown in defaultSerializeSharedObjectMessage ", e); //$NON-NLS-1$ + } } /** @@ -1021,13 +1032,30 @@ public abstract class SOContainer extends AbstractContainer implements ISharedOb * @since 2.0 */ protected Object defaultDeserializeSharedObjectMessage(byte[] bytes) throws IOException, ClassNotFoundException { - final ByteArrayInputStream bins = new ByteArrayInputStream(bytes); - // If system property set to osgi.basic then use OSGIObjectOutputStream, if not then - // use ObjectOutputStream - final ObjectInputStream oins = SO_SERIALIZATION_DEFAULT.equals(SO_SERIALIZATION_OSGI) ? new OSGIObjectInputStream(ProviderPlugin.getDefault().getContext().getBundle(), bins) : new ObjectInputStream(bins); - Object result = oins.readObject(); - oins.close(); - return result; + try { + return AccessController.doPrivileged((PrivilegedExceptionAction<Object>) () -> { + final ByteArrayInputStream bins = new ByteArrayInputStream(bytes); + final OSGIObjectInputStream oins = new OSGIObjectInputStream(ProviderPlugin.getDefault().getContext().getBundle(), bins); + ID sharedObjectID = (ID) oins.readObject(); + if (sharedObjectID != null) { + ISharedObject so = getSharedObject(sharedObjectID); + if (so != null) { + oins.setClassLoader(so.getClass().getClassLoader()); + Object result = oins.readObject(); + oins.close(); + return result; + } + throw new IOException("Could not find sharedObjectID=" + sharedObjectID + " in defaultDeserializeSharedObjectMessage"); //$NON-NLS-1$//$NON-NLS-2$ + } + throw new IOException("Could not find sharedObjectID=" + sharedObjectID + " in defaultDeserializeSharedObjectMessage"); //$NON-NLS-1$//$NON-NLS-2$ + }); + } catch (PrivilegedActionException e) { + Throwable t = e.getCause(); + if (t instanceof IOException) { + throw (IOException) t; + } + throw new IOException("Unexpected exception trown in defaultSerializeSharedObjectMessage ", e); //$NON-NLS-1$ + } } protected Object deserializeSharedObjectMessage(byte[] bytes) throws IOException, ClassNotFoundException { diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOContainerConfig.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOContainerConfig.java index 3af0f92b8..67b9d969b 100644 --- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOContainerConfig.java +++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOContainerConfig.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 2007 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.provider.generic; diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOContainerGMM.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOContainerGMM.java index 3f2e59af5..984ea60fd 100644 --- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOContainerGMM.java +++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOContainerGMM.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.provider.generic; diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOContainerGroup.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOContainerGroup.java index 13a70ed7b..c060085e2 100644 --- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOContainerGroup.java +++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOContainerGroup.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.provider.generic; diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOContext.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOContext.java index 63eaea6da..f01d9b828 100644 --- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOContext.java +++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOContext.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ /* diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOManager.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOManager.java index e5ce187a7..9a1b8c70f 100644 --- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOManager.java +++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOManager.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ /* diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOWrapper.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOWrapper.java index 6874604e0..dde3bdf74 100644 --- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOWrapper.java +++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOWrapper.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.provider.generic; diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SSLClientSOContainer.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SSLClientSOContainer.java index e6477b8b7..41aa78a93 100644 --- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SSLClientSOContainer.java +++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SSLClientSOContainer.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2012 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.provider.generic; diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SSLGenericContainerInstantiator.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SSLGenericContainerInstantiator.java index 99fae3e9c..8dadc3765 100644 --- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SSLGenericContainerInstantiator.java +++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SSLGenericContainerInstantiator.java @@ -1,13 +1,15 @@ -/******************************************************************************* +/**************************************************************************** * Copyright (c) 2012 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.provider.generic; import java.io.IOException; @@ -79,13 +81,13 @@ public class SSLGenericContainerInstantiator implements IContainerInstantiator, protected Integer getIntegerFromArg(Object arg) { if (arg == null) - return new Integer(-1); + return Integer.valueOf(-1); if (arg instanceof Integer) return (Integer) arg; else if (arg instanceof String) { - return new Integer((String) arg); + return Integer.valueOf((String) arg); } else - return new Integer(-1); + return Integer.valueOf(-1); } protected class GenericContainerArgs { @@ -182,7 +184,7 @@ public class SSLGenericContainerInstantiator implements IContainerInstantiator, if (newID == null) newID = IDFactory.getDefault().createStringID(IDFactory.getDefault().createGUID().getName()); if (ka == null) - ka = new Integer(0); + ka = Integer.valueOf(0); return new GenericContainerArgs(newID, ka); } @@ -277,7 +279,7 @@ public class SSLGenericContainerInstantiator implements IContainerInstantiator, newID = IDFactory.getDefault().createStringID(SSLServerSOContainer.DEFAULT_PROTOCOL + "://" + SSLServerSOContainer.DEFAULT_HOST + ":" + port + SSLServerSOContainer.DEFAULT_NAME);//$NON-NLS-1$ //$NON-NLS-2$ } if (ka == null) - ka = new Integer(SSLServerSOContainer.DEFAULT_KEEPALIVE); + ka = Integer.valueOf(SSLServerSOContainer.DEFAULT_KEEPALIVE); // Check for private intent if (privateIntent) @@ -505,4 +507,4 @@ public class SSLGenericContainerInstantiator implements IContainerInstantiator, public Dictionary getPropertiesForImportedConfigs(ContainerTypeDescription description, String[] importedConfigs, Dictionary exportedProperties) { return null; } -}
\ No newline at end of file +} diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SSLServerSOContainer.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SSLServerSOContainer.java index d4db08c1c..eeaea26cd 100644 --- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SSLServerSOContainer.java +++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SSLServerSOContainer.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2012 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.provider.generic; diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SSLServerSOContainerGroup.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SSLServerSOContainerGroup.java index e5f9ef097..5c74735c5 100644 --- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SSLServerSOContainerGroup.java +++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SSLServerSOContainerGroup.java @@ -1,13 +1,15 @@ -/******************************************************************************* +/**************************************************************************** * Copyright (c) 2012 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.provider.generic; import java.io.IOException; diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/ServerSOContainer.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/ServerSOContainer.java index 83535a979..4fd2aa6dd 100644 --- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/ServerSOContainer.java +++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/ServerSOContainer.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.provider.generic; diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/TCPClientSOContainer.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/TCPClientSOContainer.java index fbeef505e..f6f956480 100644 --- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/TCPClientSOContainer.java +++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/TCPClientSOContainer.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.provider.generic; diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/TCPServerSOContainer.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/TCPServerSOContainer.java index 8f6a39dc2..c5a39c2dd 100644 --- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/TCPServerSOContainer.java +++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/TCPServerSOContainer.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.provider.generic; @@ -95,7 +97,7 @@ public class TCPServerSOContainer extends ServerSOContainer implements IConnectR public TCPServerSOContainer(ISharedObjectContainerConfig config, InetAddress bindAddress, int keepAlive) throws IOException, URISyntaxException { super(config); isSingle = true; - URI actualURI = new URI(getID().getName()); + URI actualURI = parseAndValidateURI(); int port = actualURI.getPort(); String path = actualURI.getPath(); if (path == null) @@ -109,7 +111,7 @@ public class TCPServerSOContainer extends ServerSOContainer implements IConnectR super(config); this.keepAlive = keepAlive; // Make sure URI syntax is followed. - URI actualURI = new URI(getID().getName()); + URI actualURI = parseAndValidateURI(); int urlPort = actualURI.getPort(); String path = actualURI.getPath(); if (grp == null) { @@ -122,6 +124,12 @@ public class TCPServerSOContainer extends ServerSOContainer implements IConnectR this.group.putOnTheAir(); } + private URI parseAndValidateURI() throws URISyntaxException { + URI uri = new URI(getID().getName()); + uri.parseServerAuthority(); + return uri; + } + public TCPServerSOContainer(ISharedObjectContainerConfig config, TCPServerSOContainerGroup listener, String path, int keepAlive) { super(config); initialize(listener, path, keepAlive); diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/TCPServerSOContainerGroup.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/TCPServerSOContainerGroup.java index 0a289442e..f40c7ee68 100644 --- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/TCPServerSOContainerGroup.java +++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/TCPServerSOContainerGroup.java @@ -1,13 +1,15 @@ -/******************************************************************************* +/**************************************************************************** * Copyright (c) 2004, 2007 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.provider.generic; import java.io.IOException; diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/gmm/GMMImpl.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/gmm/GMMImpl.java index 2df6b056f..5f0b20ddc 100644 --- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/gmm/GMMImpl.java +++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/gmm/GMMImpl.java @@ -1,13 +1,15 @@ -/******************************************************************************* +/**************************************************************************** * Copyright (c) 2004, 2007 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.provider.generic.gmm; import java.util.*; diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/gmm/Member.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/gmm/Member.java index cfaf15f52..5de727e3f 100644 --- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/gmm/Member.java +++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/gmm/Member.java @@ -1,13 +1,15 @@ /**************************************************************************** -* Copyright (c) 2004 Composent, Inc. and others. -* 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: -* Composent, Inc. - initial API and implementation -*****************************************************************************/ + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * Contributors: + * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.provider.generic.gmm; diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/gmm/MemberChanged.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/gmm/MemberChanged.java index 0acdc2932..4a28d0851 100644 --- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/gmm/MemberChanged.java +++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/gmm/MemberChanged.java @@ -1,13 +1,15 @@ /**************************************************************************** -* Copyright (c) 2004 Composent, Inc. and others. -* 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: -* Composent, Inc. - initial API and implementation -*****************************************************************************/ + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * Contributors: + * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.provider.generic.gmm; diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/util/IClassLoaderMapper.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/util/IClassLoaderMapper.java index db30c7b89..024163017 100644 --- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/util/IClassLoaderMapper.java +++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/util/IClassLoaderMapper.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.provider.util; /** diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/util/IdentifiableObjectInputStream.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/util/IdentifiableObjectInputStream.java index e48886169..9dc0ddf3c 100644 --- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/util/IdentifiableObjectInputStream.java +++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/util/IdentifiableObjectInputStream.java @@ -1,13 +1,15 @@ -/******************************************************************************* +/**************************************************************************** * Copyright (c) 2004 Peter Nehrer and Composent, Inc. - * 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 - * + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: * Peter Nehrer - initial API and implementation - *******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.provider.util; import java.io.*; diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/util/IdentifiableObjectOutputStream.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/util/IdentifiableObjectOutputStream.java index c32202107..ba65016f6 100644 --- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/util/IdentifiableObjectOutputStream.java +++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/util/IdentifiableObjectOutputStream.java @@ -1,13 +1,15 @@ -/******************************************************************************* +/**************************************************************************** * Copyright (c) 2004 Peter Nehrer and Composent, Inc. - * 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 - * + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: * Peter Nehrer - initial API and implementation - *******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.provider.util; import java.io.IOException; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.asyncproxy.j8/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.remoteservice.asyncproxy.j8/META-INF/MANIFEST.MF index 7b11af8c4..daacee406 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.asyncproxy.j8/META-INF/MANIFEST.MF +++ b/framework/bundles/org.eclipse.ecf.remoteservice.asyncproxy.j8/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %bundle.name Bundle-SymbolicName: org.eclipse.ecf.remoteservice.asyncproxy Automatic-Module-Name: org.eclipse.ecf.remoteservice.asyncproxy -Bundle-Version: 2.1.0.qualifier +Bundle-Version: 2.1.200.qualifier Bundle-Vendor: %bundle.provider Import-Package: org.eclipse.equinox.concurrent.future, org.osgi.util.promise diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.asyncproxy.j8/about.html b/framework/bundles/org.eclipse.ecf.remoteservice.asyncproxy.j8/about.html index 4c79781a5..9f1dc0dd5 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.asyncproxy.j8/about.html +++ b/framework/bundles/org.eclipse.ecf.remoteservice.asyncproxy.j8/about.html @@ -22,7 +22,7 @@ being redistributed by another party ("Redistributor") and different t apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise indicated below, the terms and conditions of the EPL still apply to any source code in the Content -and such source code may be obtained at <a href="/">http://www.eclipse.org</a>.</p> +and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p> </body> </html>
\ No newline at end of file diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.asyncproxy.j8/bundle.properties b/framework/bundles/org.eclipse.ecf.remoteservice.asyncproxy.j8/bundle.properties index 7a860ca85..582630696 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.asyncproxy.j8/bundle.properties +++ b/framework/bundles/org.eclipse.ecf.remoteservice.asyncproxy.j8/bundle.properties @@ -1,10 +1,11 @@ ############################################################################ # Copyright (c) 2014 Composent Inc. and others. -# 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 # +# This program and the accompanying materials are made +# available under the terms of the Eclipse Public License 2.0 +# which is available at https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 ############################################################################ bundle.provider=Eclipse.org - ECF bundle.name=ECF RemoteServices AsyncProxy API Java8 diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.asyncproxy.j8/pom.xml b/framework/bundles/org.eclipse.ecf.remoteservice.asyncproxy.j8/pom.xml index 0405e2680..0e9a19fa9 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.asyncproxy.j8/pom.xml +++ b/framework/bundles/org.eclipse.ecf.remoteservice.asyncproxy.j8/pom.xml @@ -10,6 +10,6 @@ </parent> <groupId>org.eclipse.ecf</groupId> <artifactId>org.eclipse.ecf.remoteservice.asyncproxy</artifactId> - <version>2.1.0-SNAPSHOT</version> + <version>2.1.200-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.asyncproxy.j8/src/org/eclipse/ecf/remoteservice/asyncproxy/AbstractAsyncProxyRemoteCall.java b/framework/bundles/org.eclipse.ecf.remoteservice.asyncproxy.j8/src/org/eclipse/ecf/remoteservice/asyncproxy/AbstractAsyncProxyRemoteCall.java index d6d7d9ddd..55f8705c8 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.asyncproxy.j8/src/org/eclipse/ecf/remoteservice/asyncproxy/AbstractAsyncProxyRemoteCall.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.asyncproxy.j8/src/org/eclipse/ecf/remoteservice/asyncproxy/AbstractAsyncProxyRemoteCall.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2014 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.remoteservice.asyncproxy; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.asyncproxy.j8/src/org/eclipse/ecf/remoteservice/asyncproxy/AbstractAsyncProxyRemoteService.java b/framework/bundles/org.eclipse.ecf.remoteservice.asyncproxy.j8/src/org/eclipse/ecf/remoteservice/asyncproxy/AbstractAsyncProxyRemoteService.java index 66dbd3f19..10a2d5e89 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.asyncproxy.j8/src/org/eclipse/ecf/remoteservice/asyncproxy/AbstractAsyncProxyRemoteService.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.asyncproxy.j8/src/org/eclipse/ecf/remoteservice/asyncproxy/AbstractAsyncProxyRemoteService.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2014 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.remoteservice.asyncproxy; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.asyncproxy.j8/src/org/eclipse/ecf/remoteservice/asyncproxy/AsyncReturnUtil.java b/framework/bundles/org.eclipse.ecf.remoteservice.asyncproxy.j8/src/org/eclipse/ecf/remoteservice/asyncproxy/AsyncReturnUtil.java index ceeda8b73..112ec09b9 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.asyncproxy.j8/src/org/eclipse/ecf/remoteservice/asyncproxy/AsyncReturnUtil.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.asyncproxy.j8/src/org/eclipse/ecf/remoteservice/asyncproxy/AsyncReturnUtil.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2018 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.remoteservice.asyncproxy; @@ -65,16 +67,20 @@ public class AsyncReturnUtil { InvocationTargetException { if (returnObject == null) return null; - else if (asyncReturnType.isAssignableFrom(Future.class)) - return ((Future<?>) returnObject).get(timeout, TimeUnit.MILLISECONDS); - else if (asyncReturnType.isAssignableFrom(CompletableFuture.class)) - return ((CompletableFuture<?>) returnObject).get(timeout, TimeUnit.MILLISECONDS); - else if (asyncReturnType.isAssignableFrom(CompletionStage.class)) - return ((CompletionStage<?>) returnObject).toCompletableFuture().get(timeout, TimeUnit.MILLISECONDS); - else if (asyncReturnType.isAssignableFrom(IFuture.class)) + else if (asyncReturnType.isAssignableFrom(Future.class)) { + Future<?> f = (Future<?>) returnObject; + return (timeout == 0L)?f.get():f.get(timeout, TimeUnit.MILLISECONDS); + } else if (asyncReturnType.isAssignableFrom(CompletableFuture.class)) { + CompletableFuture<?> cf = (CompletableFuture<?>) returnObject; + return (timeout == 0L)?cf.get():cf.get(timeout, TimeUnit.MILLISECONDS); + } else if (asyncReturnType.isAssignableFrom(CompletionStage.class)) { + CompletableFuture<?> cf = ((CompletionStage<?>) returnObject).toCompletableFuture(); + return (timeout == 0)?cf.get():cf.get(timeout, TimeUnit.MILLISECONDS); + } else if (asyncReturnType.isAssignableFrom(IFuture.class)) { return ((IFuture<?>) returnObject).get(); - else if (asyncReturnType.isAssignableFrom(Promise.class)) + } else if (asyncReturnType.isAssignableFrom(Promise.class)) { return ((Promise<?>) returnObject).getValue(); + } return null; } diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.asyncproxy.j8/src/org/eclipse/ecf/remoteservice/asyncproxy/IAsyncProxyCompletable.java b/framework/bundles/org.eclipse.ecf.remoteservice.asyncproxy.j8/src/org/eclipse/ecf/remoteservice/asyncproxy/IAsyncProxyCompletable.java index 26a11a82e..9917dd058 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.asyncproxy.j8/src/org/eclipse/ecf/remoteservice/asyncproxy/IAsyncProxyCompletable.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.asyncproxy.j8/src/org/eclipse/ecf/remoteservice/asyncproxy/IAsyncProxyCompletable.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2014 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.remoteservice.asyncproxy; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.asyncproxy/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.remoteservice.asyncproxy/META-INF/MANIFEST.MF index b2f674fd2..7aac29773 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.asyncproxy/META-INF/MANIFEST.MF +++ b/framework/bundles/org.eclipse.ecf.remoteservice.asyncproxy/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %bundle.name Bundle-SymbolicName: org.eclipse.ecf.remoteservice.asyncproxy Automatic-Module-Name: org.eclipse.ecf.remoteservice.asyncproxy -Bundle-Version: 1.1.100.qualifier +Bundle-Version: 1.1.300.qualifier Bundle-Vendor: %bundle.provider Import-Package: org.eclipse.equinox.concurrent.future Bundle-Localization: bundle diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.asyncproxy/about.html b/framework/bundles/org.eclipse.ecf.remoteservice.asyncproxy/about.html index 4c79781a5..9f1dc0dd5 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.asyncproxy/about.html +++ b/framework/bundles/org.eclipse.ecf.remoteservice.asyncproxy/about.html @@ -22,7 +22,7 @@ being redistributed by another party ("Redistributor") and different t apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise indicated below, the terms and conditions of the EPL still apply to any source code in the Content -and such source code may be obtained at <a href="/">http://www.eclipse.org</a>.</p> +and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p> </body> </html>
\ No newline at end of file diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.asyncproxy/bundle.properties b/framework/bundles/org.eclipse.ecf.remoteservice.asyncproxy/bundle.properties index ffb412962..0c400fae4 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.asyncproxy/bundle.properties +++ b/framework/bundles/org.eclipse.ecf.remoteservice.asyncproxy/bundle.properties @@ -1,10 +1,11 @@ ############################################################################ # Copyright (c) 2014 Composent Inc., IBM Corp, and others. -# 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 # +# This program and the accompanying materials are made +# available under the terms of the Eclipse Public License 2.0 +# which is available at https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 ############################################################################ bundle.provider=Eclipse.org - ECF bundle.name=ECF RemoteServices AsyncProxy API diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.asyncproxy/pom.xml b/framework/bundles/org.eclipse.ecf.remoteservice.asyncproxy/pom.xml index 137fac47e..183d4a53f 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.asyncproxy/pom.xml +++ b/framework/bundles/org.eclipse.ecf.remoteservice.asyncproxy/pom.xml @@ -10,6 +10,20 @@ </parent> <groupId>org.eclipse.ecf</groupId> <artifactId>org.eclipse.ecf.remoteservice.asyncproxy</artifactId> - <version>1.1.100-SNAPSHOT</version> + <version>1.1.300-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> + + <build> + <plugins> + <plugin> + <groupId>org.eclipse.tycho.extras</groupId> + <artifactId>tycho-p2-extras-plugin</artifactId> + <version>${tycho-version}</version> + <configuration> + <!-- Skip this check for this bundle due to false "version goes backwards" result caused by multiple bundles with same BSN in the baseline repository --> + <skip>true</skip> + </configuration> + </plugin> + </plugins> + </build> </project> diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.asyncproxy/src/org/eclipse/ecf/remoteservice/asyncproxy/AbstractAsyncProxyRemoteCall.java b/framework/bundles/org.eclipse.ecf.remoteservice.asyncproxy/src/org/eclipse/ecf/remoteservice/asyncproxy/AbstractAsyncProxyRemoteCall.java index d6d7d9ddd..55f8705c8 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.asyncproxy/src/org/eclipse/ecf/remoteservice/asyncproxy/AbstractAsyncProxyRemoteCall.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.asyncproxy/src/org/eclipse/ecf/remoteservice/asyncproxy/AbstractAsyncProxyRemoteCall.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2014 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.remoteservice.asyncproxy; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.asyncproxy/src/org/eclipse/ecf/remoteservice/asyncproxy/AbstractAsyncProxyRemoteService.java b/framework/bundles/org.eclipse.ecf.remoteservice.asyncproxy/src/org/eclipse/ecf/remoteservice/asyncproxy/AbstractAsyncProxyRemoteService.java index c30f9715e..f2e561457 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.asyncproxy/src/org/eclipse/ecf/remoteservice/asyncproxy/AbstractAsyncProxyRemoteService.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.asyncproxy/src/org/eclipse/ecf/remoteservice/asyncproxy/AbstractAsyncProxyRemoteService.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2014 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.remoteservice.asyncproxy; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.asyncproxy/src/org/eclipse/ecf/remoteservice/asyncproxy/AsyncReturnUtil.java b/framework/bundles/org.eclipse.ecf.remoteservice.asyncproxy/src/org/eclipse/ecf/remoteservice/asyncproxy/AsyncReturnUtil.java index 21efa8427..0f5ec9b36 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.asyncproxy/src/org/eclipse/ecf/remoteservice/asyncproxy/AsyncReturnUtil.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.asyncproxy/src/org/eclipse/ecf/remoteservice/asyncproxy/AsyncReturnUtil.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2018 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.remoteservice.asyncproxy; @@ -40,10 +42,12 @@ public class AsyncReturnUtil { InvocationTargetException { if (returnObject == null) return null; - else if (asyncReturnType.isAssignableFrom(Future.class)) - return ((Future<?>) returnObject).get(timeout, TimeUnit.MILLISECONDS); - else if (asyncReturnType.isAssignableFrom(IFuture.class)) + else if (asyncReturnType.isAssignableFrom(Future.class)) { + Future<?> f = (Future<?>) returnObject; + return (timeout == 0L)?f.get():f.get(timeout, TimeUnit.MILLISECONDS); + } else if (asyncReturnType.isAssignableFrom(IFuture.class)) { return ((IFuture<?>) returnObject).get(); + } return null; } diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.asyncproxy/src/org/eclipse/ecf/remoteservice/asyncproxy/IAsyncProxyCompletable.java b/framework/bundles/org.eclipse.ecf.remoteservice.asyncproxy/src/org/eclipse/ecf/remoteservice/asyncproxy/IAsyncProxyCompletable.java index 26a11a82e..9917dd058 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.asyncproxy/src/org/eclipse/ecf/remoteservice/asyncproxy/IAsyncProxyCompletable.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.asyncproxy/src/org/eclipse/ecf/remoteservice/asyncproxy/IAsyncProxyCompletable.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2014 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.remoteservice.asyncproxy; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.rest.synd/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.remoteservice.rest.synd/META-INF/MANIFEST.MF index 71bff4dfd..8ce99d982 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.rest.synd/META-INF/MANIFEST.MF +++ b/framework/bundles/org.eclipse.ecf.remoteservice.rest.synd/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin.name Bundle-SymbolicName: org.eclipse.ecf.remoteservice.rest.synd Automatic-Module-Name: org.eclipse.ecf.remoteservice.rest.synd -Bundle-Version: 1.0.100.qualifier +Bundle-Version: 1.0.200.qualifier Bundle-Activator: org.eclipse.ecf.internal.remoteservice.rest.synd.Activator Bundle-Vendor: %plugin.provider Bundle-RequiredExecutionEnvironment: J2SE-1.4 diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.rest.synd/about.html b/framework/bundles/org.eclipse.ecf.remoteservice.rest.synd/about.html index 4c79781a5..9f1dc0dd5 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.rest.synd/about.html +++ b/framework/bundles/org.eclipse.ecf.remoteservice.rest.synd/about.html @@ -22,7 +22,7 @@ being redistributed by another party ("Redistributor") and different t apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise indicated below, the terms and conditions of the EPL still apply to any source code in the Content -and such source code may be obtained at <a href="/">http://www.eclipse.org</a>.</p> +and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p> </body> </html>
\ No newline at end of file diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.rest.synd/plugin.properties b/framework/bundles/org.eclipse.ecf.remoteservice.rest.synd/plugin.properties index 9d4db8b13..a76163b15 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.rest.synd/plugin.properties +++ b/framework/bundles/org.eclipse.ecf.remoteservice.rest.synd/plugin.properties @@ -1,10 +1,11 @@ -/******************************************************************************* - * Copyright (c) 2009-2010 Naumen. 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: Pavel Samolisov - initial API and implementation - ******************************************************************************/ +############################################################################ +# Copyright (c) 2009-2010 Naumen. +# +# This program and the accompanying materials are made +# available under the terms of the Eclipse Public License 2.0 +# which is available at https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 +############################################################################ plugin.provider=Eclipse.org - ECF plugin.name=ECF RemoteServices REST RSS/Atom Support diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.rest.synd/pom.xml b/framework/bundles/org.eclipse.ecf.remoteservice.rest.synd/pom.xml index bbae323fa..66bf5529e 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.rest.synd/pom.xml +++ b/framework/bundles/org.eclipse.ecf.remoteservice.rest.synd/pom.xml @@ -10,6 +10,6 @@ </parent> <groupId>org.eclipse.ecf</groupId> <artifactId>org.eclipse.ecf.remoteservice.rest.synd</artifactId> - <version>1.0.100-SNAPSHOT</version> + <version>1.0.200-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.rest.synd/src/org/eclipse/ecf/internal/remoteservice/rest/synd/Activator.java b/framework/bundles/org.eclipse.ecf.remoteservice.rest.synd/src/org/eclipse/ecf/internal/remoteservice/rest/synd/Activator.java index 353bd0af0..5351a8103 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.rest.synd/src/org/eclipse/ecf/internal/remoteservice/rest/synd/Activator.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.rest.synd/src/org/eclipse/ecf/internal/remoteservice/rest/synd/Activator.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2010 Naumen. 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 +/**************************************************************************** + * Copyright (c) 2010 Naumen. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: Pavel Samolisov - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.internal.remoteservice.rest.synd; import org.eclipse.core.runtime.IStatus; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.rest.synd/src/org/eclipse/ecf/remoteservice/rest/synd/SyndFeedResponseDeserializer.java b/framework/bundles/org.eclipse.ecf.remoteservice.rest.synd/src/org/eclipse/ecf/remoteservice/rest/synd/SyndFeedResponseDeserializer.java index e4d9d4712..18b20c7db 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.rest.synd/src/org/eclipse/ecf/remoteservice/rest/synd/SyndFeedResponseDeserializer.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.rest.synd/src/org/eclipse/ecf/remoteservice/rest/synd/SyndFeedResponseDeserializer.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2010 Naumen. 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 +/**************************************************************************** + * Copyright (c) 2010 Naumen. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: Pavel Samolisov - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteservice.rest.synd; import com.sun.syndication.io.FeedException; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.rest/.settings/org.eclipse.jdt.core.prefs b/framework/bundles/org.eclipse.ecf.remoteservice.rest/.settings/org.eclipse.jdt.core.prefs index 9fcc1aadb..c3aa32382 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.rest/.settings/org.eclipse.jdt.core.prefs +++ b/framework/bundles/org.eclipse.ecf.remoteservice.rest/.settings/org.eclipse.jdt.core.prefs @@ -21,7 +21,7 @@ org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning org.eclipse.jdt.core.compiler.problem.autoboxing=ignore org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning org.eclipse.jdt.core.compiler.problem.deadCode=warning -org.eclipse.jdt.core.compiler.problem.deprecation=warning +org.eclipse.jdt.core.compiler.problem.deprecation=ignore org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.rest/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.remoteservice.rest/META-INF/MANIFEST.MF index 28dccc975..fb44fba21 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.rest/META-INF/MANIFEST.MF +++ b/framework/bundles/org.eclipse.ecf.remoteservice.rest/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: %plugin.name Bundle-Vendor: %plugin.provider Bundle-SymbolicName: org.eclipse.ecf.remoteservice.rest;singleton:=true Automatic-Module-Name: org.eclipse.ecf.remoteservice.rest -Bundle-Version: 2.7.200.qualifier +Bundle-Version: 2.7.301.qualifier Bundle-Activator: org.eclipse.ecf.internal.remoteservice.rest.Activator Bundle-ActivationPolicy: lazy Eclipse-BuddyPolicy: global diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.rest/about.html b/framework/bundles/org.eclipse.ecf.remoteservice.rest/about.html index 4c79781a5..9f1dc0dd5 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.rest/about.html +++ b/framework/bundles/org.eclipse.ecf.remoteservice.rest/about.html @@ -22,7 +22,7 @@ being redistributed by another party ("Redistributor") and different t apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise indicated below, the terms and conditions of the EPL still apply to any source code in the Content -and such source code may be obtained at <a href="/">http://www.eclipse.org</a>.</p> +and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p> </body> </html>
\ No newline at end of file diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.rest/plugin.properties b/framework/bundles/org.eclipse.ecf.remoteservice.rest/plugin.properties index 98e358784..bcb7f929c 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.rest/plugin.properties +++ b/framework/bundles/org.eclipse.ecf.remoteservice.rest/plugin.properties @@ -1,10 +1,11 @@ ############################################################################ -# Copyright (c) 2009 EclipseSource and others. 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 +# Copyright (c) 2009 EclipseSource and others. # +# This program and the accompanying materials are made +# available under the terms of the Eclipse Public License 2.0 +# which is available at https://www.eclipse.org/legal/epl-2.0/ # +# SPDX-License-Identifier: EPL-2.0 ############################################################################ plugin.provider=Eclipse.org - ECF plugin.name=ECF RemoteServices REST API diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.rest/pom.xml b/framework/bundles/org.eclipse.ecf.remoteservice.rest/pom.xml index 6ca6ed7b5..c9fd2c011 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.rest/pom.xml +++ b/framework/bundles/org.eclipse.ecf.remoteservice.rest/pom.xml @@ -10,6 +10,6 @@ </parent> <groupId>org.eclipse.ecf</groupId> <artifactId>org.eclipse.ecf.remoteservice.rest</artifactId> - <version>2.7.200-SNAPSHOT</version> + <version>2.7.301-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.rest/src/org/eclipse/ecf/internal/remoteservice/rest/Activator.java b/framework/bundles/org.eclipse.ecf.remoteservice.rest/src/org/eclipse/ecf/internal/remoteservice/rest/Activator.java index 8f1cdea0e..f7d55a525 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.rest/src/org/eclipse/ecf/internal/remoteservice/rest/Activator.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.rest/src/org/eclipse/ecf/internal/remoteservice/rest/Activator.java @@ -1,12 +1,15 @@ -/******************************************************************************* - * Copyright (c) 2009 EclipseSource and others. 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 +/**************************************************************************** + * Copyright (c) 2009 EclipseSource and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * EclipseSource - initial API and implementation - *******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.internal.remoteservice.rest; import org.eclipse.core.runtime.IStatus; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.rest/src/org/eclipse/ecf/internal/remoteservice/rest/DebugOptions.java b/framework/bundles/org.eclipse.ecf.remoteservice.rest/src/org/eclipse/ecf/internal/remoteservice/rest/DebugOptions.java index 95915b014..3bf9a0d87 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.rest/src/org/eclipse/ecf/internal/remoteservice/rest/DebugOptions.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.rest/src/org/eclipse/ecf/internal/remoteservice/rest/DebugOptions.java @@ -1,12 +1,15 @@ -/******************************************************************************* - * Copyright (c) 2014 Composent, Inc. and others. 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 +/**************************************************************************** + * Copyright (c) 2014 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.internal.remoteservice.rest; public interface DebugOptions { diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.rest/src/org/eclipse/ecf/internal/remoteservice/rest/RestClientContainerInstantiator.java b/framework/bundles/org.eclipse.ecf.remoteservice.rest/src/org/eclipse/ecf/internal/remoteservice/rest/RestClientContainerInstantiator.java index fad0aa636..52f5cefc7 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.rest/src/org/eclipse/ecf/internal/remoteservice/rest/RestClientContainerInstantiator.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.rest/src/org/eclipse/ecf/internal/remoteservice/rest/RestClientContainerInstantiator.java @@ -1,12 +1,15 @@ -/******************************************************************************* - * Copyright (c) 2009 EclipseSource and others. 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 +/**************************************************************************** + * Copyright (c) 2009 EclipseSource and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * EclipseSource - initial API and implementation - *******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.internal.remoteservice.rest; import java.util.*; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.rest/src/org/eclipse/ecf/remoteservice/rest/IRestCall.java b/framework/bundles/org.eclipse.ecf.remoteservice.rest/src/org/eclipse/ecf/remoteservice/rest/IRestCall.java index 1ffdf2c15..e832c1d9e 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.rest/src/org/eclipse/ecf/remoteservice/rest/IRestCall.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.rest/src/org/eclipse/ecf/remoteservice/rest/IRestCall.java @@ -1,12 +1,15 @@ -/******************************************************************************* - * Copyright (c) 2009 EclipseSource and others. 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 +/**************************************************************************** + * Copyright (c) 2009 EclipseSource and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * EclipseSource - initial API and implementation - *******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteservice.rest; import java.util.Map; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.rest/src/org/eclipse/ecf/remoteservice/rest/RestCall.java b/framework/bundles/org.eclipse.ecf.remoteservice.rest/src/org/eclipse/ecf/remoteservice/rest/RestCall.java index 4d2af770d..afe5306e1 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.rest/src/org/eclipse/ecf/remoteservice/rest/RestCall.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.rest/src/org/eclipse/ecf/remoteservice/rest/RestCall.java @@ -1,13 +1,16 @@ -/******************************************************************************* - * Copyright (c) 2009 EclipseSource and others. 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 +/**************************************************************************** + * Copyright (c) 2009 EclipseSource and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * EclipseSource - initial API and implementation * Composent, Inc - Simplifications - *******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteservice.rest; import java.io.Serializable; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.rest/src/org/eclipse/ecf/remoteservice/rest/RestCallFactory.java b/framework/bundles/org.eclipse.ecf.remoteservice.rest/src/org/eclipse/ecf/remoteservice/rest/RestCallFactory.java index 5a90c4f6e..647506abb 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.rest/src/org/eclipse/ecf/remoteservice/rest/RestCallFactory.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.rest/src/org/eclipse/ecf/remoteservice/rest/RestCallFactory.java @@ -1,13 +1,16 @@ -/******************************************************************************* - * Copyright (c) 2009 EclipseSource and others. 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 +/**************************************************************************** + * Copyright (c) 2009 EclipseSource and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * EclipseSource - initial API and implementation * Composent, Inc - Simplifications -*******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteservice.rest; import java.util.Map; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.rest/src/org/eclipse/ecf/remoteservice/rest/RestCallableFactory.java b/framework/bundles/org.eclipse.ecf.remoteservice.rest/src/org/eclipse/ecf/remoteservice/rest/RestCallableFactory.java index a925cb04b..e4939082c 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.rest/src/org/eclipse/ecf/remoteservice/rest/RestCallableFactory.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.rest/src/org/eclipse/ecf/remoteservice/rest/RestCallableFactory.java @@ -1,12 +1,15 @@ -/******************************************************************************* -* Copyright (c) 2009 Composent, Inc. and others. 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: -* Composent, Inc. - initial API and implementation -******************************************************************************/ +/**************************************************************************** + * Copyright (c) 2009 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * Contributors: + * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteservice.rest; import org.eclipse.ecf.remoteservice.client.*; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.rest/src/org/eclipse/ecf/remoteservice/rest/RestException.java b/framework/bundles/org.eclipse.ecf.remoteservice.rest/src/org/eclipse/ecf/remoteservice/rest/RestException.java index e508433b2..1bae40e4a 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.rest/src/org/eclipse/ecf/remoteservice/rest/RestException.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.rest/src/org/eclipse/ecf/remoteservice/rest/RestException.java @@ -1,12 +1,15 @@ -/******************************************************************************* -* Copyright (c) 2009 Composent, Inc. and others. 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: -* Composent, Inc. - initial API and implementation -******************************************************************************/ +/**************************************************************************** + * Copyright (c) 2009 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * Contributors: + * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteservice.rest; import org.eclipse.core.runtime.IStatus; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.rest/src/org/eclipse/ecf/remoteservice/rest/client/AbstractEntityRequestType.java b/framework/bundles/org.eclipse.ecf.remoteservice.rest/src/org/eclipse/ecf/remoteservice/rest/client/AbstractEntityRequestType.java index 81d54f74b..32900518d 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.rest/src/org/eclipse/ecf/remoteservice/rest/client/AbstractEntityRequestType.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.rest/src/org/eclipse/ecf/remoteservice/rest/client/AbstractEntityRequestType.java @@ -1,12 +1,15 @@ -/******************************************************************************* -* Copyright (c) 2009 Composent, Inc. and others. 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: -* Composent, Inc. - initial API and implementation -******************************************************************************/ +/**************************************************************************** + * Copyright (c) 2009 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * Contributors: + * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteservice.rest.client; import java.io.*; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.rest/src/org/eclipse/ecf/remoteservice/rest/client/AbstractRequestType.java b/framework/bundles/org.eclipse.ecf.remoteservice.rest/src/org/eclipse/ecf/remoteservice/rest/client/AbstractRequestType.java index b3a5708f8..8a21f6ea0 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.rest/src/org/eclipse/ecf/remoteservice/rest/client/AbstractRequestType.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.rest/src/org/eclipse/ecf/remoteservice/rest/client/AbstractRequestType.java @@ -1,12 +1,15 @@ -/******************************************************************************* -* Copyright (c) 2009 Composent, Inc. and others. 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: -* Composent, Inc. - initial API and implementation -******************************************************************************/ +/**************************************************************************** + * Copyright (c) 2009 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * Contributors: + * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteservice.rest.client; import org.eclipse.ecf.remoteservice.client.IRemoteCallableRequestType; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.rest/src/org/eclipse/ecf/remoteservice/rest/client/AbstractRestClientContainer.java b/framework/bundles/org.eclipse.ecf.remoteservice.rest/src/org/eclipse/ecf/remoteservice/rest/client/AbstractRestClientContainer.java index e2c66149d..82a45c83d 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.rest/src/org/eclipse/ecf/remoteservice/rest/client/AbstractRestClientContainer.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.rest/src/org/eclipse/ecf/remoteservice/rest/client/AbstractRestClientContainer.java @@ -1,12 +1,15 @@ -/******************************************************************************* -* Copyright (c) 2014 Composent, Inc. and others. 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: -* Composent, Inc. - initial API and implementation -******************************************************************************/ +/**************************************************************************** + * Copyright (c) 2014 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * Contributors: + * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteservice.rest.client; import java.text.MessageFormat; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.rest/src/org/eclipse/ecf/remoteservice/rest/client/AbstractRestClientService.java b/framework/bundles/org.eclipse.ecf.remoteservice.rest/src/org/eclipse/ecf/remoteservice/rest/client/AbstractRestClientService.java index 7def35fac..33b04bb85 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.rest/src/org/eclipse/ecf/remoteservice/rest/client/AbstractRestClientService.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.rest/src/org/eclipse/ecf/remoteservice/rest/client/AbstractRestClientService.java @@ -1,12 +1,15 @@ -/******************************************************************************* -* Copyright (c) 2014 Composent, Inc. and others. 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: -* Composent, Inc. - initial API and implementation -******************************************************************************/ +/**************************************************************************** + * Copyright (c) 2014 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * Contributors: + * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteservice.rest.client; import org.eclipse.core.runtime.IStatus; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.rest/src/org/eclipse/ecf/remoteservice/rest/client/HttpDeleteRequestType.java b/framework/bundles/org.eclipse.ecf.remoteservice.rest/src/org/eclipse/ecf/remoteservice/rest/client/HttpDeleteRequestType.java index d6617d6f7..1c4f9b0d9 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.rest/src/org/eclipse/ecf/remoteservice/rest/client/HttpDeleteRequestType.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.rest/src/org/eclipse/ecf/remoteservice/rest/client/HttpDeleteRequestType.java @@ -1,12 +1,15 @@ -/******************************************************************************* -* Copyright (c) 2009 Composent, Inc. and others. 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: -* Composent, Inc. - initial API and implementation -******************************************************************************/ +/**************************************************************************** + * Copyright (c) 2009 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * Contributors: + * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteservice.rest.client; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.rest/src/org/eclipse/ecf/remoteservice/rest/client/HttpGetRequestType.java b/framework/bundles/org.eclipse.ecf.remoteservice.rest/src/org/eclipse/ecf/remoteservice/rest/client/HttpGetRequestType.java index 5ca33358a..0443a5602 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.rest/src/org/eclipse/ecf/remoteservice/rest/client/HttpGetRequestType.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.rest/src/org/eclipse/ecf/remoteservice/rest/client/HttpGetRequestType.java @@ -1,12 +1,15 @@ -/******************************************************************************* -* Copyright (c) 2009 Composent, Inc. and others. 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: -* Composent, Inc. - initial API and implementation -******************************************************************************/ +/**************************************************************************** + * Copyright (c) 2009 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * Contributors: + * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteservice.rest.client; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.rest/src/org/eclipse/ecf/remoteservice/rest/client/HttpPostRequestType.java b/framework/bundles/org.eclipse.ecf.remoteservice.rest/src/org/eclipse/ecf/remoteservice/rest/client/HttpPostRequestType.java index 499a38de5..78bbe1471 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.rest/src/org/eclipse/ecf/remoteservice/rest/client/HttpPostRequestType.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.rest/src/org/eclipse/ecf/remoteservice/rest/client/HttpPostRequestType.java @@ -1,12 +1,15 @@ -/******************************************************************************* -* Copyright (c) 2009 Composent, Inc. and others. 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: -* Composent, Inc. - initial API and implementation -******************************************************************************/ +/**************************************************************************** + * Copyright (c) 2009 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * Contributors: + * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteservice.rest.client; import java.util.Map; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.rest/src/org/eclipse/ecf/remoteservice/rest/client/HttpPutRequestType.java b/framework/bundles/org.eclipse.ecf.remoteservice.rest/src/org/eclipse/ecf/remoteservice/rest/client/HttpPutRequestType.java index 576cd5111..e800cc1ba 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.rest/src/org/eclipse/ecf/remoteservice/rest/client/HttpPutRequestType.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.rest/src/org/eclipse/ecf/remoteservice/rest/client/HttpPutRequestType.java @@ -1,12 +1,15 @@ -/******************************************************************************* -* Copyright (c) 2009 Composent, Inc. and others. 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: -* Composent, Inc. - initial API and implementation -******************************************************************************/ +/**************************************************************************** + * Copyright (c) 2009 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * Contributors: + * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteservice.rest.client; import java.util.Map; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.rest/src/org/eclipse/ecf/remoteservice/rest/client/RestClientContainer.java b/framework/bundles/org.eclipse.ecf.remoteservice.rest/src/org/eclipse/ecf/remoteservice/rest/client/RestClientContainer.java index 3b784062c..828a3e046 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.rest/src/org/eclipse/ecf/remoteservice/rest/client/RestClientContainer.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.rest/src/org/eclipse/ecf/remoteservice/rest/client/RestClientContainer.java @@ -1,12 +1,15 @@ -/******************************************************************************* - * Copyright (c) 2009 EclipseSource and others. 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 +/**************************************************************************** + * Copyright (c) 2009 EclipseSource and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * EclipseSource - initial API and implementation - *******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteservice.rest.client; import org.eclipse.ecf.remoteservice.IRemoteService; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.rest/src/org/eclipse/ecf/remoteservice/rest/client/RestClientService.java b/framework/bundles/org.eclipse.ecf.remoteservice.rest/src/org/eclipse/ecf/remoteservice/rest/client/RestClientService.java index f55ddf625..b22cabdec 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.rest/src/org/eclipse/ecf/remoteservice/rest/client/RestClientService.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.rest/src/org/eclipse/ecf/remoteservice/rest/client/RestClientService.java @@ -1,12 +1,15 @@ -/******************************************************************************* - * Copyright (c) 2009 EclipseSource and others. 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 +/**************************************************************************** + * Copyright (c) 2009 EclipseSource and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * EclipseSource - initial API and implementation - *******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteservice.rest.client; import java.io.*; @@ -40,9 +43,9 @@ import org.eclipse.ecf.remoteservice.rest.RestException; */ public class RestClientService extends AbstractRestClientService { - public static final int socketTimeout = Integer.valueOf(System.getProperty("org.eclipse.ecf.remoteservice.rest.RestClientService.socketTimeout", "-1")).intValue(); //$NON-NLS-1$ //$NON-NLS-2$ - public static final int connectRequestTimeout = Integer.valueOf(System.getProperty("org.eclipse.ecf.remoteservice.rest.RestClientService.connectRequestTimeout", "-1")).intValue(); //$NON-NLS-1$ //$NON-NLS-2$ - public static final int connectTimeout = Integer.valueOf(System.getProperty("org.eclipse.ecf.remoteservice.rest.RestClientService.connectTimeout", "-1")).intValue(); //$NON-NLS-1$ //$NON-NLS-2$ + public static final int socketTimeout = Integer.parseInt(System.getProperty("org.eclipse.ecf.remoteservice.rest.RestClientService.socketTimeout", "-1")); //$NON-NLS-1$ //$NON-NLS-2$ + public static final int connectRequestTimeout = Integer.parseInt(System.getProperty("org.eclipse.ecf.remoteservice.rest.RestClientService.connectRequestTimeout", "-1")); //$NON-NLS-1$ //$NON-NLS-2$ + public static final int connectTimeout = Integer.parseInt(System.getProperty("org.eclipse.ecf.remoteservice.rest.RestClientService.connectTimeout", "-1")); //$NON-NLS-1$ //$NON-NLS-2$ protected final static int DEFAULT_RESPONSE_BUFFER_SIZE = 1024; @@ -144,7 +147,7 @@ public class RestClientService extends AbstractRestClientService { responseBody = getResponseAsBytes(response); } // Now pass to the exception handler - handleException("Http response not OK. httpMethod=" + httpMethod + " responseCode=" + new Integer(responseCode), null, responseCode, responseBody); //$NON-NLS-1$ //$NON-NLS-2$ + handleException("Http response not OK. httpMethod=" + httpMethod + " responseCode=" + Integer.valueOf(responseCode), null, responseCode, responseBody); //$NON-NLS-1$ //$NON-NLS-2$ } } catch (IOException e) { handleException("RestClientService transport IOException", e, responseCode); //$NON-NLS-1$ @@ -155,7 +158,7 @@ public class RestClientService extends AbstractRestClientService { trace("processResponse", "httpMethod=" + httpMethod + ";call=" + call + ";callable=" + callable + ";responseHeaders=" + responseHeaders + ";responseBody=" + responseBody); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ result = processResponse(endpointUri, call, callable, responseHeaders, responseBody); } catch (NotSerializableException e) { - handleException("Exception deserializing response. httpMethod=" + httpMethod + " responseCode=" + new Integer(responseCode), e, responseCode); //$NON-NLS-1$ //$NON-NLS-2$ + handleException("Exception deserializing response. httpMethod=" + httpMethod + " responseCode=" + Integer.valueOf(responseCode), e, responseCode); //$NON-NLS-1$ //$NON-NLS-2$ } return result; } diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.rest/src/org/eclipse/ecf/remoteservice/rest/client/XMLRemoteResponseDeserializer.java b/framework/bundles/org.eclipse.ecf.remoteservice.rest/src/org/eclipse/ecf/remoteservice/rest/client/XMLRemoteResponseDeserializer.java index 979c6d2f9..13367bb25 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.rest/src/org/eclipse/ecf/remoteservice/rest/client/XMLRemoteResponseDeserializer.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.rest/src/org/eclipse/ecf/remoteservice/rest/client/XMLRemoteResponseDeserializer.java @@ -1,12 +1,15 @@ -/******************************************************************************* - * Copyright (c) 2009 EclipseSource and others. 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 +/**************************************************************************** + * Copyright (c) 2009 EclipseSource and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * EclipseSource - initial API and implementation - *******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteservice.rest.client; import java.io.NotSerializableException; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.rest/src/org/eclipse/ecf/remoteservice/rest/identity/RestID.java b/framework/bundles/org.eclipse.ecf.remoteservice.rest/src/org/eclipse/ecf/remoteservice/rest/identity/RestID.java index e497be50b..9faa3763a 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.rest/src/org/eclipse/ecf/remoteservice/rest/identity/RestID.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.rest/src/org/eclipse/ecf/remoteservice/rest/identity/RestID.java @@ -1,12 +1,15 @@ -/******************************************************************************* - * Copyright (c) 2009 EclipseSource and others. 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 +/**************************************************************************** + * Copyright (c) 2009 EclipseSource and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * EclipseSource - initial API and implementation - *******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteservice.rest.identity; import java.net.URI; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.rest/src/org/eclipse/ecf/remoteservice/rest/identity/RestNamespace.java b/framework/bundles/org.eclipse.ecf.remoteservice.rest/src/org/eclipse/ecf/remoteservice/rest/identity/RestNamespace.java index 2cf5349be..3240a8053 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.rest/src/org/eclipse/ecf/remoteservice/rest/identity/RestNamespace.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.rest/src/org/eclipse/ecf/remoteservice/rest/identity/RestNamespace.java @@ -1,12 +1,15 @@ -/******************************************************************************* - * Copyright (c) 2009 EclipseSource and others. 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 +/**************************************************************************** + * Copyright (c) 2009 EclipseSource and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * EclipseSource - initial API and implementation - *******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteservice.rest.identity; import java.net.URI; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.rest/src/org/eclipse/ecf/remoteservice/rest/util/DSUtil.java b/framework/bundles/org.eclipse.ecf.remoteservice.rest/src/org/eclipse/ecf/remoteservice/rest/util/DSUtil.java index 12be90f01..58f14351b 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.rest/src/org/eclipse/ecf/remoteservice/rest/util/DSUtil.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.rest/src/org/eclipse/ecf/remoteservice/rest/util/DSUtil.java @@ -1,12 +1,15 @@ -/******************************************************************************* - * Copyright (c) 2009 EclipseSource and others. 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 +/**************************************************************************** + * Copyright (c) 2009 EclipseSource and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Andre Dietisheim - initial API and implementation - *******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteservice.rest.util; import org.osgi.framework.*; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.rpc/.settings/org.eclipse.jdt.core.prefs b/framework/bundles/org.eclipse.ecf.remoteservice.rpc/.settings/org.eclipse.jdt.core.prefs index 68de25269..5b0912a3a 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.rpc/.settings/org.eclipse.jdt.core.prefs +++ b/framework/bundles/org.eclipse.ecf.remoteservice.rpc/.settings/org.eclipse.jdt.core.prefs @@ -21,7 +21,7 @@ org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning org.eclipse.jdt.core.compiler.problem.autoboxing=ignore org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning org.eclipse.jdt.core.compiler.problem.deadCode=warning -org.eclipse.jdt.core.compiler.problem.deprecation=warning +org.eclipse.jdt.core.compiler.problem.deprecation=ignore org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.rpc/.settings/org.eclipse.jdt.ui.prefs b/framework/bundles/org.eclipse.ecf.remoteservice.rpc/.settings/org.eclipse.jdt.ui.prefs index d6c22a4fd..d7020fdf6 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.rpc/.settings/org.eclipse.jdt.ui.prefs +++ b/framework/bundles/org.eclipse.ecf.remoteservice.rpc/.settings/org.eclipse.jdt.ui.prefs @@ -1,4 +1,3 @@ -#Tue Jan 25 17:13:15 MSK 2011 eclipse.preferences.version=1 editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true formatter_profile=_Equinox @@ -6,10 +5,9 @@ formatter_settings_version=12 internal.default.compliance=user org.eclipse.jdt.ui.ignorelowercasenames=true org.eclipse.jdt.ui.importorder=; -org.eclipse.jdt.ui.javadoc=false org.eclipse.jdt.ui.ondemandthreshold=3 org.eclipse.jdt.ui.staticondemandthreshold=99 -org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter function" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter function" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="filecomment_context" deleted\="false" description\="Comment for created JavaScript files" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.filecomment" name\="filecomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for vars" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding function" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="overridecomment_context" deleted\="false" description\="Comment for overriding functions" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/* (non-JSDoc)\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate functions" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created function stubs" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated function stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/* (non-Javadoc)\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="false" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">/*******************************************************************************\r\n * Copyright (c) 2010-2011 Naumen. All rights reserved. This\r\n * program and the accompanying materials are made available under the terms of\r\n * the Eclipse Public License v1.0 which accompanies this distribution, and is\r\n * available at http\://www.eclipse.org/legal/epl-v10.html\r\n *\r\n * Contributors\: Pavel Samolisov - initial API and implementation\r\n ******************************************************************************/\r\n${package_declaration}\r\n\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates> +org.eclipse.jdt.ui.text.custom_code_templates= sp_cleanup.add_default_serial_version_id=true sp_cleanup.add_generated_serial_version_id=false sp_cleanup.add_missing_annotations=true diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.rpc/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.remoteservice.rpc/META-INF/MANIFEST.MF index 4411bdc72..326a8f1ba 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.rpc/META-INF/MANIFEST.MF +++ b/framework/bundles/org.eclipse.ecf.remoteservice.rpc/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin.name Bundle-SymbolicName: org.eclipse.ecf.remoteservice.rpc;singleton:=true Automatic-Module-Name: org.eclipse.ecf.remoteservice.rpc -Bundle-Version: 1.3.0.qualifier +Bundle-Version: 1.3.1.qualifier Bundle-Vendor: %plugin.provider Require-Bundle: org.eclipse.ecf, org.eclipse.equinox.common diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.rpc/about.html b/framework/bundles/org.eclipse.ecf.remoteservice.rpc/about.html index 4c79781a5..9f1dc0dd5 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.rpc/about.html +++ b/framework/bundles/org.eclipse.ecf.remoteservice.rpc/about.html @@ -22,7 +22,7 @@ being redistributed by another party ("Redistributor") and different t apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise indicated below, the terms and conditions of the EPL still apply to any source code in the Content -and such source code may be obtained at <a href="/">http://www.eclipse.org</a>.</p> +and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p> </body> </html>
\ No newline at end of file diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.rpc/build.properties b/framework/bundles/org.eclipse.ecf.remoteservice.rpc/build.properties index 8c730610e..f50488188 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.rpc/build.properties +++ b/framework/bundles/org.eclipse.ecf.remoteservice.rpc/build.properties @@ -1,9 +1,11 @@ ############################################################################ # Copyright (c) 2010-2011 Naumen, IBM Corp, and others. -# 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 +# +# This program and the accompanying materials are made +# available under the terms of the Eclipse Public License 2.0 +# which is available at https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 ############################################################################ source.. = src/ output.. = bin/ diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.rpc/plugin.properties b/framework/bundles/org.eclipse.ecf.remoteservice.rpc/plugin.properties index f367ca030..ca9cc3584 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.rpc/plugin.properties +++ b/framework/bundles/org.eclipse.ecf.remoteservice.rpc/plugin.properties @@ -1,9 +1,11 @@ ############################################################################ # Copyright (c) 2010-2011 Naumen, IBM Corp, and others. -# 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 +# +# This program and the accompanying materials are made +# available under the terms of the Eclipse Public License 2.0 +# which is available at https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 ############################################################################ pluginName = ECF XML-RPC API providerName = Eclipse.org - ECF diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.servlet/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.remoteservice.servlet/META-INF/MANIFEST.MF index a176595d0..6f64de682 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.servlet/META-INF/MANIFEST.MF +++ b/framework/bundles/org.eclipse.ecf.remoteservice.servlet/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin.name Bundle-SymbolicName: org.eclipse.ecf.remoteservice.servlet Automatic-Module-Name: org.eclipse.ecf.remoteservice.servlet -Bundle-Version: 1.0.100.qualifier +Bundle-Version: 1.0.200.qualifier Bundle-Vendor: %plugin.provider Bundle-RequiredExecutionEnvironment: J2SE-1.5 Import-Package: javax.servlet, diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.servlet/about.html b/framework/bundles/org.eclipse.ecf.remoteservice.servlet/about.html index 4c79781a5..9f1dc0dd5 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.servlet/about.html +++ b/framework/bundles/org.eclipse.ecf.remoteservice.servlet/about.html @@ -22,7 +22,7 @@ being redistributed by another party ("Redistributor") and different t apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise indicated below, the terms and conditions of the EPL still apply to any source code in the Content -and such source code may be obtained at <a href="/">http://www.eclipse.org</a>.</p> +and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p> </body> </html>
\ No newline at end of file diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.servlet/plugin.properties b/framework/bundles/org.eclipse.ecf.remoteservice.servlet/plugin.properties index 7b192fe17..03ede7c22 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.servlet/plugin.properties +++ b/framework/bundles/org.eclipse.ecf.remoteservice.servlet/plugin.properties @@ -1,10 +1,11 @@ ############################################################################ # Copyright (c) 2013 Composent Inc. and others. -# 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 # +# This program and the accompanying materials are made +# available under the terms of the Eclipse Public License 2.0 +# which is available at https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 ############################################################################ plugin.provider=Eclipse.org - ECF plugin.name=ECF RemoteServices Servlet API diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.servlet/pom.xml b/framework/bundles/org.eclipse.ecf.remoteservice.servlet/pom.xml index e2434ceb7..f9e018fbe 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.servlet/pom.xml +++ b/framework/bundles/org.eclipse.ecf.remoteservice.servlet/pom.xml @@ -10,6 +10,6 @@ </parent> <groupId>org.eclipse.ecf</groupId> <artifactId>org.eclipse.ecf.remoteservice.servlet</artifactId> - <version>1.0.100-SNAPSHOT</version> + <version>1.0.200-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.servlet/src/org/eclipse/ecf/remoteservice/servlet/HttpServiceComponent.java b/framework/bundles/org.eclipse.ecf.remoteservice.servlet/src/org/eclipse/ecf/remoteservice/servlet/HttpServiceComponent.java index 91ba6671f..b2093f846 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.servlet/src/org/eclipse/ecf/remoteservice/servlet/HttpServiceComponent.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.servlet/src/org/eclipse/ecf/remoteservice/servlet/HttpServiceComponent.java @@ -1,12 +1,15 @@ -/******************************************************************************* -* Copyright (c) 2013 Composent, Inc. and others. 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: -* Composent, Inc. - initial API and implementation -******************************************************************************/ +/**************************************************************************** + * Copyright (c) 2013 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * Contributors: + * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteservice.servlet; import java.util.ArrayList; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.servlet/src/org/eclipse/ecf/remoteservice/servlet/IRemoteCallParameterDeserializer.java b/framework/bundles/org.eclipse.ecf.remoteservice.servlet/src/org/eclipse/ecf/remoteservice/servlet/IRemoteCallParameterDeserializer.java index 61adf371c..853376970 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.servlet/src/org/eclipse/ecf/remoteservice/servlet/IRemoteCallParameterDeserializer.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.servlet/src/org/eclipse/ecf/remoteservice/servlet/IRemoteCallParameterDeserializer.java @@ -1,12 +1,15 @@ -/******************************************************************************* -* Copyright (c) 2013 Composent, Inc. and others. 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: -* Composent, Inc. - initial API and implementation -******************************************************************************/ +/**************************************************************************** + * Copyright (c) 2013 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * Contributors: + * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteservice.servlet; import java.io.IOException; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.servlet/src/org/eclipse/ecf/remoteservice/servlet/IRemoteCallResponseSerializer.java b/framework/bundles/org.eclipse.ecf.remoteservice.servlet/src/org/eclipse/ecf/remoteservice/servlet/IRemoteCallResponseSerializer.java index 0b8b218ec..383a8a8d3 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.servlet/src/org/eclipse/ecf/remoteservice/servlet/IRemoteCallResponseSerializer.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.servlet/src/org/eclipse/ecf/remoteservice/servlet/IRemoteCallResponseSerializer.java @@ -1,12 +1,15 @@ -/******************************************************************************* -* Copyright (c) 2013 Composent, Inc. and others. 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: -* Composent, Inc. - initial API and implementation -******************************************************************************/ +/**************************************************************************** + * Copyright (c) 2013 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * Contributors: + * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteservice.servlet; import java.io.IOException; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.servlet/src/org/eclipse/ecf/remoteservice/servlet/ObjectSerializationParameterDeserializer.java b/framework/bundles/org.eclipse.ecf.remoteservice.servlet/src/org/eclipse/ecf/remoteservice/servlet/ObjectSerializationParameterDeserializer.java index dce26478c..5be1ce839 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.servlet/src/org/eclipse/ecf/remoteservice/servlet/ObjectSerializationParameterDeserializer.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.servlet/src/org/eclipse/ecf/remoteservice/servlet/ObjectSerializationParameterDeserializer.java @@ -1,12 +1,15 @@ -/******************************************************************************* -* Copyright (c) 2013 Composent, Inc. and others. 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: -* Composent, Inc. - initial API and implementation -******************************************************************************/ +/**************************************************************************** + * Copyright (c) 2013 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * Contributors: + * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteservice.servlet; import java.io.IOException; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.servlet/src/org/eclipse/ecf/remoteservice/servlet/ObjectSerializationResponseSerializer.java b/framework/bundles/org.eclipse.ecf.remoteservice.servlet/src/org/eclipse/ecf/remoteservice/servlet/ObjectSerializationResponseSerializer.java index 947be7576..ed41d9928 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.servlet/src/org/eclipse/ecf/remoteservice/servlet/ObjectSerializationResponseSerializer.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.servlet/src/org/eclipse/ecf/remoteservice/servlet/ObjectSerializationResponseSerializer.java @@ -1,12 +1,15 @@ -/******************************************************************************* -* Copyright (c) 2013 Composent, Inc. and others. 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: -* Composent, Inc. - initial API and implementation -******************************************************************************/ +/**************************************************************************** + * Copyright (c) 2013 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * Contributors: + * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteservice.servlet; import java.io.IOException; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.servlet/src/org/eclipse/ecf/remoteservice/servlet/RemoteServiceHttpServlet.java b/framework/bundles/org.eclipse.ecf.remoteservice.servlet/src/org/eclipse/ecf/remoteservice/servlet/RemoteServiceHttpServlet.java index a8be83464..cb1951573 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.servlet/src/org/eclipse/ecf/remoteservice/servlet/RemoteServiceHttpServlet.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.servlet/src/org/eclipse/ecf/remoteservice/servlet/RemoteServiceHttpServlet.java @@ -1,12 +1,15 @@ -/******************************************************************************* -* Copyright (c) 2013 Composent, Inc. and others. 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: -* Composent, Inc. - initial API and implementation -******************************************************************************/ +/**************************************************************************** + * Copyright (c) 2013 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * Contributors: + * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteservice.servlet; import javax.servlet.http.HttpServlet; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.servlet/src/org/eclipse/ecf/remoteservice/servlet/ServletServerContainer.java b/framework/bundles/org.eclipse.ecf.remoteservice.servlet/src/org/eclipse/ecf/remoteservice/servlet/ServletServerContainer.java index 3e5645bda..293e4f53d 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.servlet/src/org/eclipse/ecf/remoteservice/servlet/ServletServerContainer.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.servlet/src/org/eclipse/ecf/remoteservice/servlet/ServletServerContainer.java @@ -1,12 +1,15 @@ -/******************************************************************************* -* Copyright (c) 2013 Composent, Inc. and others. 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: -* Composent, Inc. - initial API and implementation -******************************************************************************/ +/**************************************************************************** + * Copyright (c) 2013 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * Contributors: + * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteservice.servlet; import java.util.Dictionary; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.servlet/src/org/eclipse/ecf/remoteservice/servlet/ServletServerContainerInstantiator.java b/framework/bundles/org.eclipse.ecf.remoteservice.servlet/src/org/eclipse/ecf/remoteservice/servlet/ServletServerContainerInstantiator.java index c050466a7..1e5ae2a9c 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.servlet/src/org/eclipse/ecf/remoteservice/servlet/ServletServerContainerInstantiator.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.servlet/src/org/eclipse/ecf/remoteservice/servlet/ServletServerContainerInstantiator.java @@ -1,12 +1,15 @@ -/******************************************************************************* -* Copyright (c) 2013 Composent, Inc. and others. 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: -* Composent, Inc. - initial API and implementation -******************************************************************************/ +/**************************************************************************** + * Copyright (c) 2013 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * Contributors: + * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteservice.servlet; import java.util.Dictionary; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.soap/.settings/org.eclipse.jdt.core.prefs b/framework/bundles/org.eclipse.ecf.remoteservice.soap/.settings/org.eclipse.jdt.core.prefs index fe8809efa..290ed4000 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.soap/.settings/org.eclipse.jdt.core.prefs +++ b/framework/bundles/org.eclipse.ecf.remoteservice.soap/.settings/org.eclipse.jdt.core.prefs @@ -21,7 +21,7 @@ org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning org.eclipse.jdt.core.compiler.problem.autoboxing=ignore org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning org.eclipse.jdt.core.compiler.problem.deadCode=warning -org.eclipse.jdt.core.compiler.problem.deprecation=warning +org.eclipse.jdt.core.compiler.problem.deprecation=ignore org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.soap/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.remoteservice.soap/META-INF/MANIFEST.MF index 951b8fa04..60b08d1b4 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.soap/META-INF/MANIFEST.MF +++ b/framework/bundles/org.eclipse.ecf.remoteservice.soap/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: %plugin.name Bundle-Vendor: %plugin.provider Bundle-SymbolicName: org.eclipse.ecf.remoteservice.soap;singleton:=true Automatic-Module-Name: org.eclipse.ecf.remoteservice.soap -Bundle-Version: 1.1.100.qualifier +Bundle-Version: 1.1.200.qualifier Bundle-RequiredExecutionEnvironment: J2SE-1.4 Import-Package: org.eclipse.ecf.remoteservice, org.eclipse.ecf.remoteservice.asyncproxy;version="1.0.0", diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.soap/about.html b/framework/bundles/org.eclipse.ecf.remoteservice.soap/about.html index 4c79781a5..9f1dc0dd5 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.soap/about.html +++ b/framework/bundles/org.eclipse.ecf.remoteservice.soap/about.html @@ -22,7 +22,7 @@ being redistributed by another party ("Redistributor") and different t apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise indicated below, the terms and conditions of the EPL still apply to any source code in the Content -and such source code may be obtained at <a href="/">http://www.eclipse.org</a>.</p> +and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p> </body> </html>
\ No newline at end of file diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.soap/plugin.properties b/framework/bundles/org.eclipse.ecf.remoteservice.soap/plugin.properties index ca125d439..7fd2d6d8d 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.soap/plugin.properties +++ b/framework/bundles/org.eclipse.ecf.remoteservice.soap/plugin.properties @@ -1,10 +1,11 @@ ############################################################################ -# Copyright (c) 2009 Composent and others. 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 +# Copyright (c) 2009 Composent and others. # +# This program and the accompanying materials are made +# available under the terms of the Eclipse Public License 2.0 +# which is available at https://www.eclipse.org/legal/epl-2.0/ # +# SPDX-License-Identifier: EPL-2.0 ############################################################################ plugin.provider=Eclipse.org - ECF plugin.name=ECF RemoteServices SOAP Provider API diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.soap/pom.xml b/framework/bundles/org.eclipse.ecf.remoteservice.soap/pom.xml index ed884aa9b..f789714a7 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.soap/pom.xml +++ b/framework/bundles/org.eclipse.ecf.remoteservice.soap/pom.xml @@ -10,6 +10,6 @@ </parent> <groupId>org.eclipse.ecf</groupId> <artifactId>org.eclipse.ecf.remoteservice.soap</artifactId> - <version>1.1.100-SNAPSHOT</version> + <version>1.1.200-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.soap/src/org/eclipse/ecf/remoteservice/soap/client/AbstractSoapClientContainer.java b/framework/bundles/org.eclipse.ecf.remoteservice.soap/src/org/eclipse/ecf/remoteservice/soap/client/AbstractSoapClientContainer.java index b79d2872c..6e23fb4fc 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.soap/src/org/eclipse/ecf/remoteservice/soap/client/AbstractSoapClientContainer.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.soap/src/org/eclipse/ecf/remoteservice/soap/client/AbstractSoapClientContainer.java @@ -1,12 +1,15 @@ -/******************************************************************************* -* Copyright (c) 2009 Composent, Inc. and others. 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: -* Composent, Inc. - initial API and implementation -******************************************************************************/ +/**************************************************************************** + * Copyright (c) 2009 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * Contributors: + * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteservice.soap.client; import org.eclipse.ecf.core.identity.IDFactory; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.soap/src/org/eclipse/ecf/remoteservice/soap/client/AbstractSoapClientService.java b/framework/bundles/org.eclipse.ecf.remoteservice.soap/src/org/eclipse/ecf/remoteservice/soap/client/AbstractSoapClientService.java index 67083c4b7..381b172ea 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.soap/src/org/eclipse/ecf/remoteservice/soap/client/AbstractSoapClientService.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.soap/src/org/eclipse/ecf/remoteservice/soap/client/AbstractSoapClientService.java @@ -1,12 +1,15 @@ -/******************************************************************************* -* Copyright (c) 2009 Composent, Inc. and others. 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: -* Composent, Inc. - initial API and implementation -******************************************************************************/ +/**************************************************************************** + * Copyright (c) 2009 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * Contributors: + * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteservice.soap.client; import org.eclipse.ecf.remoteservice.client.*; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.soap/src/org/eclipse/ecf/remoteservice/soap/client/SoapCallableFactory.java b/framework/bundles/org.eclipse.ecf.remoteservice.soap/src/org/eclipse/ecf/remoteservice/soap/client/SoapCallableFactory.java index a559fa692..3347c712d 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.soap/src/org/eclipse/ecf/remoteservice/soap/client/SoapCallableFactory.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.soap/src/org/eclipse/ecf/remoteservice/soap/client/SoapCallableFactory.java @@ -1,12 +1,15 @@ -/******************************************************************************* -* Copyright (c) 2009 Composent, Inc. and others. 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: -* Composent, Inc. - initial API and implementation -******************************************************************************/ +/**************************************************************************** + * Copyright (c) 2009 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * Contributors: + * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteservice.soap.client; import org.eclipse.ecf.remoteservice.IRemoteCall; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.soap/src/org/eclipse/ecf/remoteservice/soap/client/SoapCallableRequestType.java b/framework/bundles/org.eclipse.ecf.remoteservice.soap/src/org/eclipse/ecf/remoteservice/soap/client/SoapCallableRequestType.java index 48ae762b3..fd5b479d4 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.soap/src/org/eclipse/ecf/remoteservice/soap/client/SoapCallableRequestType.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.soap/src/org/eclipse/ecf/remoteservice/soap/client/SoapCallableRequestType.java @@ -1,12 +1,15 @@ -/******************************************************************************* -* Copyright (c) 2009 Composent, Inc. and others. 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: -* Composent, Inc. - initial API and implementation -******************************************************************************/ +/**************************************************************************** + * Copyright (c) 2009 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * Contributors: + * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteservice.soap.client; import java.util.Map; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.soap/src/org/eclipse/ecf/remoteservice/soap/identity/SoapID.java b/framework/bundles/org.eclipse.ecf.remoteservice.soap/src/org/eclipse/ecf/remoteservice/soap/identity/SoapID.java index b70387c4b..b2d8f0174 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.soap/src/org/eclipse/ecf/remoteservice/soap/identity/SoapID.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.soap/src/org/eclipse/ecf/remoteservice/soap/identity/SoapID.java @@ -1,12 +1,15 @@ -/******************************************************************************* - * Copyright (c) 2009 Composent, Inc. and others. 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 +/**************************************************************************** + * Copyright (c) 2009 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation - *******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteservice.soap.identity; import java.net.URI; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.soap/src/org/eclipse/ecf/remoteservice/soap/identity/SoapNamespace.java b/framework/bundles/org.eclipse.ecf.remoteservice.soap/src/org/eclipse/ecf/remoteservice/soap/identity/SoapNamespace.java index 78d8900dd..3d7bcbd3e 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.soap/src/org/eclipse/ecf/remoteservice/soap/identity/SoapNamespace.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.soap/src/org/eclipse/ecf/remoteservice/soap/identity/SoapNamespace.java @@ -1,12 +1,15 @@ -/******************************************************************************* - * Copyright (c) 2009 Composent, Inc. and others. 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 +/**************************************************************************** + * Copyright (c) 2009 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation - *******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteservice.soap.identity; import java.net.URI; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui.dosgi/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.remoteservice.ui.dosgi/META-INF/MANIFEST.MF index 4010c7a9d..60798c2a9 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.ui.dosgi/META-INF/MANIFEST.MF +++ b/framework/bundles/org.eclipse.ecf.remoteservice.ui.dosgi/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin.name Bundle-SymbolicName: org.eclipse.ecf.remoteservice.ui.dosgi;singleton:=true -Bundle-Version: 3.0.0.qualifier +Bundle-Version: 3.1.0.qualifier Bundle-Vendor: %plugin.provider Fragment-Host: org.eclipse.ecf.remoteservice.ui;bundle-version="[3.0.0,4.0.0)" Bundle-RequiredExecutionEnvironment: J2SE-1.4 @@ -10,4 +10,5 @@ Bundle-Localization: plugin Import-Package: org.eclipse.ecf.osgi.services.distribution;version="2.0.0", org.eclipse.ecf.osgi.services.remoteserviceadmin;version="1.0.0" DynamicImport-Package: * +Automatic-Module-Name: org.eclipse.ecf.remoteservice.ui.dosgi diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui.dosgi/plugin.properties b/framework/bundles/org.eclipse.ecf.remoteservice.ui.dosgi/plugin.properties index f6b4796fd..e7de66064 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.ui.dosgi/plugin.properties +++ b/framework/bundles/org.eclipse.ecf.remoteservice.ui.dosgi/plugin.properties @@ -1,10 +1,11 @@ ############################################################################ # Copyright (c) 2007 Composent Inc., IBM Corp, and others. -# 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 # +# This program and the accompanying materials are made +# available under the terms of the Eclipse Public License 2.0 +# which is available at https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 ############################################################################ plugin.name=ECF Remote Services UI for Distributed OSGi plugin.provider=Eclipse.org - ECF diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui.dosgi/src/org/eclipse/ecf/remoteservice/ui/dosgi/handlers/DOSGiReflectiveRemoteServiceHandler.java b/framework/bundles/org.eclipse.ecf.remoteservice.ui.dosgi/src/org/eclipse/ecf/remoteservice/ui/dosgi/handlers/DOSGiReflectiveRemoteServiceHandler.java index 15f00b3ca..9154ddd76 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.ui.dosgi/src/org/eclipse/ecf/remoteservice/ui/dosgi/handlers/DOSGiReflectiveRemoteServiceHandler.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.ui.dosgi/src/org/eclipse/ecf/remoteservice/ui/dosgi/handlers/DOSGiReflectiveRemoteServiceHandler.java @@ -1,13 +1,15 @@ -/******************************************************************************* +/**************************************************************************** * Copyright (c) 2009 Markus Alexander Kuppe. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Markus Alexander Kuppe (ecf-dev_eclipse.org <at> lemmster <dot> de) - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteservice.ui.dosgi.handlers; import org.eclipse.core.commands.ExecutionEvent; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/.settings/org.eclipse.jdt.core.prefs b/framework/bundles/org.eclipse.ecf.remoteservice.ui/.settings/org.eclipse.jdt.core.prefs index f0d24ec9c..8d08721f2 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/.settings/org.eclipse.jdt.core.prefs +++ b/framework/bundles/org.eclipse.ecf.remoteservice.ui/.settings/org.eclipse.jdt.core.prefs @@ -1,4 +1,13 @@ eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled +org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore +org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull +org.eclipse.jdt.core.compiler.annotation.nonnull.secondary= +org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault +org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary= +org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable +org.eclipse.jdt.core.compiler.annotation.nullable.secondary= +org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 @@ -7,17 +16,20 @@ org.eclipse.jdt.core.compiler.compliance=1.7 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.problem.APILeak=warning +org.eclipse.jdt.core.compiler.problem.annotatedTypeArgumentToUnannotated=info org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.autoboxing=ignore org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning org.eclipse.jdt.core.compiler.problem.deadCode=warning -org.eclipse.jdt.core.compiler.problem.deprecation=warning +org.eclipse.jdt.core.compiler.problem.deprecation=ignore org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore @@ -25,50 +37,78 @@ 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.includeNullInfoFromAsserts=disabled org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning +org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore +org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore +org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore +org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning +org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning +org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error org.eclipse.jdt.core.compiler.problem.nullReference=warning +org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error +org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore +org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore +org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore +org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore +org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore +org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore +org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning +org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled +org.eclipse.jdt.core.compiler.problem.suppressWarningsNotFullyAnalysed=info +org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore +org.eclipse.jdt.core.compiler.problem.terminalDeprecation=warning org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning +org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore +org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning +org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=warning +org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled +org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=info org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore +org.eclipse.jdt.core.compiler.problem.unstableAutoModuleName=warning org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled +org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedImport=warning org.eclipse.jdt.core.compiler.problem.unusedLabel=warning org.eclipse.jdt.core.compiler.problem.unusedLocal=warning +org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning -org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning +org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore +org.eclipse.jdt.core.compiler.problem.unusedWarningToken=ignore org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.source=1.7 diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.remoteservice.ui/META-INF/MANIFEST.MF index cc47854cd..2abaa84ce 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/META-INF/MANIFEST.MF +++ b/framework/bundles/org.eclipse.ecf.remoteservice.ui/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin.name Bundle-SymbolicName: org.eclipse.ecf.remoteservice.ui;singleton:=true Automatic-Module-Name: org.eclipse.ecf.remoteservice.ui -Bundle-Version: 3.4.200.qualifier +Bundle-Version: 3.4.400.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Require-Bundle: org.eclipse.core.runtime, org.eclipse.ui, diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/OSGI-INF/discovery.xml b/framework/bundles/org.eclipse.ecf.remoteservice.ui/OSGI-INF/discovery.xml index 459748841..12ff64750 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/OSGI-INF/discovery.xml +++ b/framework/bundles/org.eclipse.ecf.remoteservice.ui/OSGI-INF/discovery.xml @@ -3,9 +3,5 @@ <implementation class="org.eclipse.ecf.internal.remoteservices.ui.DiscoveryComponent"/> <property name="endpoint.listener.scope" type="String" value="(ecf.endpoint.id.ns=*)"/> <reference bind="bindRemoteServiceAdmin" cardinality="0..1" interface="org.osgi.service.remoteserviceadmin.RemoteServiceAdmin" name="RemoteServiceAdmin" policy="dynamic" unbind="unbindRemoteServiceAdmin"/> - <service> - <provide interface="org.osgi.service.remoteserviceadmin.EndpointEventListener"/> - <provide interface="org.osgi.service.remoteserviceadmin.RemoteServiceAdminListener"/> - </service> <reference bind="bindEndpointDescriptionLocator" cardinality="0..1" interface="org.eclipse.ecf.osgi.services.remoteserviceadmin.IEndpointDescriptionLocator" name="IEndpointDescriptionLocator" policy="dynamic" unbind="unbindEndpointDescriptionLocator"/> </scr:component> diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/about.html b/framework/bundles/org.eclipse.ecf.remoteservice.ui/about.html index 4c79781a5..9f1dc0dd5 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/about.html +++ b/framework/bundles/org.eclipse.ecf.remoteservice.ui/about.html @@ -22,7 +22,7 @@ being redistributed by another party ("Redistributor") and different t apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise indicated below, the terms and conditions of the EPL still apply to any source code in the Content -and such source code may be obtained at <a href="/">http://www.eclipse.org</a>.</p> +and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p> </body> </html>
\ No newline at end of file diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/plugin.properties b/framework/bundles/org.eclipse.ecf.remoteservice.ui/plugin.properties index 19971893a..50a66d33a 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/plugin.properties +++ b/framework/bundles/org.eclipse.ecf.remoteservice.ui/plugin.properties @@ -1,14 +1,15 @@ ############################################################################ # Copyright (c) 2007 Composent Inc., IBM Corp, and others. -# 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 # +# This program and the accompanying materials are made +# available under the terms of the Eclipse Public License 2.0 +# which is available at https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 ############################################################################ plugin.name=ECF Remote Services/RSA UI plugin.provider=Eclipse.org - ECF -perspective.name = Remote Services +perspective.name = Remote Services Development remote.services.category.name=Remote Services remote.services.discovery.view.name=Endpoint Discovery diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/plugin.xml b/framework/bundles/org.eclipse.ecf.remoteservice.ui/plugin.xml index e17f18ee0..629b8976d 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/plugin.xml +++ b/framework/bundles/org.eclipse.ecf.remoteservice.ui/plugin.xml @@ -25,59 +25,6 @@ name="Disconnect Command"> </command> </extension> - <extension - point="org.eclipse.ui.menus"> - <menuContribution - locationURI="popup:org.eclipse.ecf.discovery.ui.DiscoveryView?after=additions"> - <command - commandId="org.eclipse.ecf.remoteservices.ui.commands.connectCommand" - id="org.eclipse.ecf.remoteservices.ui.menus.connectCommand" - mnemonic="S"> - <visibleWhen> - <with - variable="activeMenuSelection"> - <iterate - ifEmpty="false" - operator="and"> - <test - property="org.eclipse.ecf.remoteservices.isConnected" - value="false"> - </test> - <test - args="remotesvcs" - property="org.eclipse.ecf.discovery.isServiceType" - value="true"> - </test> - </iterate> - </with> - </visibleWhen> - </command> - <command - commandId="org.eclipse.ecf.remoteservices.ui.commands.disconnectCommand" - id="org.eclipse.ecf.remoteservices.ui.menus.disconnectCommand" - mnemonic="S" - style="push"> - <visibleWhen - checkEnabled="false"> - <with - variable="activeMenuSelection"> - <iterate - ifEmpty="false" - operator="and"> - <test - property="org.eclipse.ecf.remoteservices.isConnected" - value="true"> - </test> - <test - args="remotesvcs" - property="org.eclipse.ecf.discovery.isServiceType" - value="true"> - </test></iterate> - </with> - </visibleWhen> - </command> - </menuContribution> - </extension> <extension point="org.eclipse.core.expressions.propertyTesters"> diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/pom.xml b/framework/bundles/org.eclipse.ecf.remoteservice.ui/pom.xml index d64cc763f..6b8cc3850 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/pom.xml +++ b/framework/bundles/org.eclipse.ecf.remoteservice.ui/pom.xml @@ -10,6 +10,6 @@ </parent> <groupId>org.eclipse.ecf</groupId> <artifactId>org.eclipse.ecf.remoteservice.ui</artifactId> - <version>3.4.200-SNAPSHOT</version> + <version>3.4.400-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/schema/org.eclipse.ecf.remoteservice.ui.servicesview.exsd b/framework/bundles/org.eclipse.ecf.remoteservice.ui/schema/org.eclipse.ecf.remoteservice.ui.servicesview.exsd index fc3c9c06f..c1cdd05fd 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/schema/org.eclipse.ecf.remoteservice.ui.servicesview.exsd +++ b/framework/bundles/org.eclipse.ecf.remoteservice.ui/schema/org.eclipse.ecf.remoteservice.ui.servicesview.exsd @@ -104,7 +104,6 @@ </servicesview> </extension> </pre> - </documentation> </annotation> @@ -114,7 +113,6 @@ </appInfo> <documentation> See the IServicesView interface. This interface allows other views to set the selected service in the associated view. If the view given does not implement IServicesView then it will not be used in this manner, but this interface should be implemented by Service View extensions. - </documentation> </annotation> @@ -124,16 +122,14 @@ <meta.section type="copyright"/> </appInfo> <documentation> - /******************************************************************************* - * Copyright (c) 2015 Composent, Inc. 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: Scott Lewis - initial API and implementation - ******************************************************************************/ + Copyright (c) 2015 Composent, Inc. and others. + +This program and the accompanying materials are made +available under the terms of the Eclipse Public License 2.0 +which is available at https://www.eclipse.org/legal/epl-2.0/ + +SPDX-License-Identifier: EPL-2.0 - </documentation> </annotation> diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/internal/remoteservices/ui/Activator.java b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/internal/remoteservices/ui/Activator.java index 84bb60611..b8f1ce30e 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/internal/remoteservices/ui/Activator.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/internal/remoteservices/ui/Activator.java @@ -1,14 +1,16 @@ -/******************************************************************************* +/**************************************************************************** * Copyright (c) 2008 Versant Corp, 2015 Composent, Inc. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Markus Kuppe (mkuppe <at> versant <dot> com) - initial API and implementation * Scott Lewis - enhancements to support Remote Service Admin specification - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.internal.remoteservices.ui; @@ -21,7 +23,9 @@ import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.core.runtime.IExtensionPoint; import org.eclipse.core.runtime.IExtensionRegistry; import org.eclipse.ecf.core.IContainerManager; +import org.eclipse.ecf.core.util.BundleStarter; import org.eclipse.ui.plugin.AbstractUIPlugin; +import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; import org.osgi.util.tracker.ServiceTracker; @@ -56,6 +60,8 @@ public class Activator extends AbstractUIPlugin { @Override public void start(BundleContext context) throws Exception { super.start(context); + BundleStarter.startDependents(context, new String[] { "org.eclipse.ecf.osgi.services.distribution" }, + Bundle.RESOLVED | Bundle.STARTING); this.context = context; ServiceTracker<IExtensionRegistry, IExtensionRegistry> st = new ServiceTracker(this.context, IExtensionRegistry.class, null); diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/internal/remoteservices/ui/DiscoveryComponent.java b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/internal/remoteservices/ui/DiscoveryComponent.java index 655832d19..800f7c35f 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/internal/remoteservices/ui/DiscoveryComponent.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/internal/remoteservices/ui/DiscoveryComponent.java @@ -1,23 +1,27 @@ -/******************************************************************************* - * Copyright (c) 2015 Composent, Inc. 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 - * +/**************************************************************************** + * Copyright (c) 2015 Composent, Inc. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Scott Lewis - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.internal.remoteservices.ui; import java.util.ArrayList; +import java.util.Hashtable; import java.util.List; import org.eclipse.ecf.osgi.services.remoteserviceadmin.IEndpointDescriptionLocator; +import org.eclipse.ecf.osgi.services.remoteserviceadmin.ITopologyManager; import org.eclipse.ecf.osgi.services.remoteserviceadmin.RemoteServiceAdmin; import org.eclipse.ecf.remoteserviceadmin.ui.endpoint.EndpointDiscoveryView; import org.eclipse.ecf.remoteserviceadmin.ui.rsa.RemoteServiceAdminView; -import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; -import org.osgi.framework.BundleException; +import org.osgi.framework.ServiceRegistration; import org.osgi.service.remoteserviceadmin.EndpointEvent; import org.osgi.service.remoteserviceadmin.EndpointEventListener; import org.osgi.service.remoteserviceadmin.RemoteServiceAdminEvent; @@ -25,21 +29,33 @@ import org.osgi.service.remoteserviceadmin.RemoteServiceAdminListener; public class DiscoveryComponent implements EndpointEventListener, RemoteServiceAdminListener { - private static final String RSA_SYMBOLICNAME = "org.eclipse.ecf.osgi.services.remoteserviceadmin"; //$NON-NLS-1$ + private static String ENDPOINT_LISTENER_SCOPE = System + .getProperty("org.eclipse.ecf.remoteservices.ui.endpointListenerScope", "(ecf.endpoint.id.ns=*)"); private static DiscoveryComponent instance; private BundleContext context; private RemoteServiceAdmin rsa; - void bindRemoteServiceAdmin(RemoteServiceAdmin r) { - rsa = r; + @SuppressWarnings("unused") + private ITopologyManager tm; + + void bindRemoteServiceAdmin(org.osgi.service.remoteserviceadmin.RemoteServiceAdmin r) { + rsa = (RemoteServiceAdmin) r; } - void unbindRemoteServiceAdmin(RemoteServiceAdmin rsa) { + void unbindRemoteServiceAdmin(org.osgi.service.remoteserviceadmin.RemoteServiceAdmin rsa) { this.rsa = null; } + void bindTopologyManager(ITopologyManager tm) { + this.tm = tm; + } + + void unbindTopologyManager(ITopologyManager tm) { + this.tm = null; + } + public BundleContext getContext() { return this.context; } @@ -49,6 +65,10 @@ public class DiscoveryComponent implements EndpointEventListener, RemoteServiceA private IEndpointDescriptionLocator edLocator; + private ServiceRegistration<EndpointEventListener> eelRegistration; + + private ServiceRegistration<RemoteServiceAdminListener> rsaadminRegistration; + void bindEndpointDescriptionLocator(IEndpointDescriptionLocator locator) { this.edLocator = locator; } @@ -80,11 +100,26 @@ public class DiscoveryComponent implements EndpointEventListener, RemoteServiceA synchronized (this) { instance = this; this.context = context; + // Register this instance as an endpoint event listener + Hashtable<String, Object> props = new Hashtable<String, Object>(); + props.put(EndpointEventListener.ENDPOINT_LISTENER_SCOPE, ENDPOINT_LISTENER_SCOPE); + this.eelRegistration = context.registerService(EndpointEventListener.class, this, props); + // register as remote service admin listener + this.rsaadminRegistration = context.registerService(RemoteServiceAdminListener.class, this, null); } + } void deactivate() { synchronized (this) { + if (this.eelRegistration != null) { + this.eelRegistration.unregister(); + this.eelRegistration = null; + } + if (this.rsaadminRegistration != null) { + this.rsaadminRegistration.unregister(); + this.rsaadminRegistration = null; + } instance = null; discoveryView = null; rsa = null; @@ -96,22 +131,6 @@ public class DiscoveryComponent implements EndpointEventListener, RemoteServiceA } } - public void startRSA() throws BundleException { - Bundle rsaBundle = null; - BundleContext ctxt = null; - synchronized (this) { - ctxt = this.context; - if (ctxt == null) - return; - } - for (Bundle b : ctxt.getBundles()) - if (b.getSymbolicName().equals(RSA_SYMBOLICNAME)) - rsaBundle = b; - if (rsaBundle == null) - throw new BundleException(Messages.DiscoveryComponent_ERROR_MSG_CANNOT_FIND_RSA_BUNDLE); - rsaBundle.start(); - } - private List<EndpointEvent> history; List<EndpointEvent> getHistory() { diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/internal/remoteservices/ui/Messages.java b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/internal/remoteservices/ui/Messages.java index 2daf6b838..c244cbbb6 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/internal/remoteservices/ui/Messages.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/internal/remoteservices/ui/Messages.java @@ -1,13 +1,15 @@ -/******************************************************************************* +/**************************************************************************** * Copyright (c) 2008 Remy Chi Jian Suen and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Remy Chi Jian Suen <remy.suen@gmail.com> - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.internal.remoteservices.ui; import org.eclipse.osgi.util.NLS; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/internal/remoteservices/ui/OverlayIcon.java b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/internal/remoteservices/ui/OverlayIcon.java index dad10fdd6..bb94260b9 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/internal/remoteservices/ui/OverlayIcon.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/internal/remoteservices/ui/OverlayIcon.java @@ -1,14 +1,16 @@ -/******************************************************************************* - * Copyright (c) 2000, 2008 IBM Corporation, 2015 Composent, Inc and others. - * 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 - * +/**************************************************************************** + * Copyright (c) 2000, 2008 IBM Corporation, 2015 Composent, Inc and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: * IBM Corporation - initial API and implementation * Composent, Inc - Changes for use in RSA discovery view - *******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.internal.remoteservices.ui; import org.eclipse.jface.resource.CompositeImageDescriptor; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/internal/remoteservices/ui/RemoteServiceHandlerUtil.java b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/internal/remoteservices/ui/RemoteServiceHandlerUtil.java index 0bc036ebe..d88567792 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/internal/remoteservices/ui/RemoteServiceHandlerUtil.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/internal/remoteservices/ui/RemoteServiceHandlerUtil.java @@ -1,13 +1,15 @@ -/******************************************************************************* +/**************************************************************************** * Copyright (c) 2008 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Markus Kuppe (mkuppe <at> versant <dot> com) - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.internal.remoteservices.ui; @@ -102,7 +104,7 @@ public class RemoteServiceHandlerUtil { private static IRemoteServiceReference[] getRemoteServiceReferencesForRemoteServiceAdapter( IRemoteServiceContainerAdapter adapter, IServiceInfo serviceInfo) - throws InvalidSyntaxException, IDCreateException { + throws InvalidSyntaxException, IDCreateException { ID serviceID = null; final String serviceNamespace = getServiceNamespace(serviceInfo); final String serviceid = getServiceID(serviceInfo); diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/internal/remoteservices/ui/RemoteServicePerspective.java b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/internal/remoteservices/ui/RemoteServicePerspective.java index b9908ea11..7f5bf4ae9 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/internal/remoteservices/ui/RemoteServicePerspective.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/internal/remoteservices/ui/RemoteServicePerspective.java @@ -1,13 +1,15 @@ -/******************************************************************************* +/**************************************************************************** * Copyright (c) 2015 Remain Software and others - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Willem Sietse Jongman - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.internal.remoteservices.ui; import java.util.List; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/internal/remoteservices/ui/handlers/ConnectRemoteServicehandler.java b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/internal/remoteservices/ui/handlers/ConnectRemoteServicehandler.java index 0ed4384e3..0af70c595 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/internal/remoteservices/ui/handlers/ConnectRemoteServicehandler.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/internal/remoteservices/ui/handlers/ConnectRemoteServicehandler.java @@ -1,13 +1,15 @@ -/******************************************************************************* +/**************************************************************************** * Copyright (c) 2008 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Markus Kuppe (mkuppe <at> versant <dot> com) - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.internal.remoteservices.ui.handlers; import org.eclipse.core.commands.ExecutionEvent; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/internal/remoteservices/ui/handlers/ConnectionHandler.java b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/internal/remoteservices/ui/handlers/ConnectionHandler.java index 9ddf6eddd..3b933ec91 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/internal/remoteservices/ui/handlers/ConnectionHandler.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/internal/remoteservices/ui/handlers/ConnectionHandler.java @@ -1,13 +1,15 @@ -/******************************************************************************* +/**************************************************************************** * Copyright (c) 2008 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Markus Kuppe (mkuppe <at> versant <dot> com) - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.internal.remoteservices.ui.handlers; @@ -24,8 +26,7 @@ public abstract class ConnectionHandler extends AbstractHandler { /* * (non-Javadoc) * - * @see - * org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands. + * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands. * ExecutionEvent) */ public Object execute(ExecutionEvent event) throws ExecutionException { diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/internal/remoteservices/ui/handlers/DisonnectRemoteServicehandler.java b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/internal/remoteservices/ui/handlers/DisonnectRemoteServicehandler.java index 9e2d022a3..9464177a4 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/internal/remoteservices/ui/handlers/DisonnectRemoteServicehandler.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/internal/remoteservices/ui/handlers/DisonnectRemoteServicehandler.java @@ -1,13 +1,15 @@ -/******************************************************************************* +/**************************************************************************** * Copyright (c) 2008 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Markus Kuppe (mkuppe <at> versant <dot> com) - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.internal.remoteservices.ui.handlers; import org.eclipse.core.commands.ExecutionEvent; @@ -26,8 +28,7 @@ public class DisonnectRemoteServicehandler extends ConnectionHandler { /* * (non-Javadoc) * - * @see - * org.eclipse.ecf.internal.remoteservices.ui.handlers.ConnectionHandler + * @see org.eclipse.ecf.internal.remoteservices.ui.handlers.ConnectionHandler * #getJob() */ protected Job getJob(final ExecutionEvent event) throws ExecutionException { diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/internal/remoteservices/ui/handlers/ReflectiveRemoteServiceHandler.java b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/internal/remoteservices/ui/handlers/ReflectiveRemoteServiceHandler.java index 0c8857065..734266969 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/internal/remoteservices/ui/handlers/ReflectiveRemoteServiceHandler.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/internal/remoteservices/ui/handlers/ReflectiveRemoteServiceHandler.java @@ -1,13 +1,15 @@ -/******************************************************************************* +/**************************************************************************** * Copyright (c) 2008 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Markus Kuppe (mkuppe <at> versant <dot> com) - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.internal.remoteservices.ui.handlers; import java.lang.reflect.InvocationTargetException; @@ -115,12 +117,12 @@ public class ReflectiveRemoteServiceHandler extends AbstractHandler implements I break; case MethodInvocationDialog.OSGI_SERVICE_PROXY: throw new UnsupportedOperationException(); - // invokeOSGiProxy(interfaceClass, remoteCall); - // break; + // invokeOSGiProxy(interfaceClass, remoteCall); + // break; case MethodInvocationDialog.REMOTE_SERVICE_PROXY: throw new UnsupportedOperationException(); - // invokeProxy(interfaceClass, remoteService, remoteCall); - // break; + // invokeProxy(interfaceClass, remoteService, remoteCall); + // break; case MethodInvocationDialog.SYNCHRONOUS: invokeSync(cls, remoteService, remoteCall); break; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/internal/remoteservices/ui/messages.properties b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/internal/remoteservices/ui/messages.properties index 1dab0f066..98d54d6bc 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/internal/remoteservices/ui/messages.properties +++ b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/internal/remoteservices/ui/messages.properties @@ -1,14 +1,12 @@ -################################################################################ +############################################################################ # Copyright (c) 2008 Remy Chi Jian Suen, 2015 Composent, Inc. and others. -# 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: -# Remy Chi Jian Suen <remy.suen@gmail.com> - initial API and implementation -# Scott Lewis <slewis@composent.com> - additions -################################################################################ +# This program and the accompanying materials are made +# available under the terms of the Eclipse Public License 2.0 +# which is available at https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 +############################################################################ AbstractRegistrationNode_ErrorName=Error. Please see Error Log View for details and stack trace. AbstractRSANode_NodeClosed=closed AbstractServicesView_UsingBundlesNodeName=Using Bundles diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/internal/remoteservices/ui/property/ConnectedTester.java b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/internal/remoteservices/ui/property/ConnectedTester.java index 029ad4ac7..837a11f9b 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/internal/remoteservices/ui/property/ConnectedTester.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/internal/remoteservices/ui/property/ConnectedTester.java @@ -1,13 +1,15 @@ -/******************************************************************************* +/**************************************************************************** * Copyright (c) 2008 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Markus Kuppe (mkuppe <at> versant <dot> com) - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.internal.remoteservices.ui.property; import org.eclipse.core.expressions.PropertyTester; @@ -68,8 +70,7 @@ public class ConnectedTester extends PropertyTester { } /** - * @param connectID - * The conected ID for which an IContainer is to be returned + * @param connectID The conected ID for which an IContainer is to be returned * @return a IContainer instance of null */ // TODO push this functionality down into the ContainerManager diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteservice/ui/services/IServicesView.java b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteservice/ui/services/IServicesView.java index f196e4c02..f8d90903b 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteservice/ui/services/IServicesView.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteservice/ui/services/IServicesView.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2015 Composent, Inc. 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 - * +/**************************************************************************** + * Copyright (c) 2015 Composent, Inc. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Scott Lewis - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteservice.ui.services; /** diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/EndpointDiscoveryView.java b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/EndpointDiscoveryView.java index ad2f25988..312fcf64a 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/EndpointDiscoveryView.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/EndpointDiscoveryView.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2015 Composent, Inc. 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 - * +/**************************************************************************** + * Copyright (c) 2015 Composent, Inc. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Scott Lewis - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteserviceadmin.ui.endpoint; import java.io.FileInputStream; @@ -433,7 +436,7 @@ public class EndpointDiscoveryView extends ViewPart { } protected EndpointNode createEndpointDescriptionNode(EndpointDescription ed) { - EndpointNode edo = new EndpointNode(ed,findImportReference(ed)); + EndpointNode edo = new EndpointNode(ed, findImportReference(ed)); // Interfaces EndpointInterfacesNode ein = new EndpointInterfacesNode(); @@ -480,7 +483,7 @@ public class EndpointDiscoveryView extends ViewPart { EndpointNode findEndpointNode(final ImportReference ir) { EndpointGroupNode egn = contentProvider.getRootNode(); - for(AbstractEndpointNode aen: egn.getChildren()) { + for (AbstractEndpointNode aen : egn.getChildren()) { if (aen instanceof EndpointNode) { EndpointNode en = (EndpointNode) aen; ImportReference iRef = en.getImportReference(); @@ -490,13 +493,14 @@ public class EndpointDiscoveryView extends ViewPart { } return null; } - + public void handleRSAEent(RemoteServiceAdminEvent event) { final int type = event.getType(); Throwable t = event.getException(); if (t == null) { TreeViewer treeViewer = this.viewer; - if (treeViewer == null) return; + if (treeViewer == null) + return; switch (type) { case RemoteServiceAdminEvent.IMPORT_UNREGISTRATION: final ImportReference ir = (ImportReference) event.getImportReference(); @@ -505,7 +509,7 @@ public class EndpointDiscoveryView extends ViewPart { @Override public void run() { EndpointGroupNode egn = contentProvider.getRootNode(); - for(AbstractEndpointNode aen: egn.getChildren()) { + for (AbstractEndpointNode aen : egn.getChildren()) { if (aen instanceof EndpointNode) { EndpointNode en = (EndpointNode) aen; ImportReference iRef = en.getImportReference(); @@ -514,7 +518,8 @@ public class EndpointDiscoveryView extends ViewPart { } } viewer.refresh(); - }}); + } + }); } break; } diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/AbstractEndpointNode.java b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/AbstractEndpointNode.java index 59d0e4f55..9b8dea0ec 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/AbstractEndpointNode.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/AbstractEndpointNode.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2015 Composent, Inc. 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 - * +/**************************************************************************** + * Copyright (c) 2015 Composent, Inc. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Scott Lewis - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteserviceadmin.ui.endpoint.model; import java.util.ArrayList; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/AbstractEndpointNodeWorkbenchAdapter.java b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/AbstractEndpointNodeWorkbenchAdapter.java index 76da5cac3..cc5dfce98 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/AbstractEndpointNodeWorkbenchAdapter.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/AbstractEndpointNodeWorkbenchAdapter.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2015 Composent, Inc. 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 - * +/**************************************************************************** + * Copyright (c) 2015 Composent, Inc. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Scott Lewis - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteserviceadmin.ui.endpoint.model; import org.eclipse.ui.model.WorkbenchAdapter; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointAdapterFactory.java b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointAdapterFactory.java index c390b1bca..08bcdccd0 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointAdapterFactory.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointAdapterFactory.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2015 Composent, Inc. 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 - * +/**************************************************************************** + * Copyright (c) 2015 Composent, Inc. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Scott Lewis - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteserviceadmin.ui.endpoint.model; import org.eclipse.core.runtime.IAdapterFactory; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointAsyncInterfacesNode.java b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointAsyncInterfacesNode.java index 51d45c4e1..b81ec76f3 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointAsyncInterfacesNode.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointAsyncInterfacesNode.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2015 Composent, Inc. 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 - * +/**************************************************************************** + * Copyright (c) 2015 Composent, Inc. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Scott Lewis - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteserviceadmin.ui.endpoint.model; import org.eclipse.ecf.osgi.services.remoteserviceadmin.RemoteConstants; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointAsyncInterfacesNodeWorkbenchAdapter.java b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointAsyncInterfacesNodeWorkbenchAdapter.java index c1201321a..262b8930d 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointAsyncInterfacesNodeWorkbenchAdapter.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointAsyncInterfacesNodeWorkbenchAdapter.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2015 Composent, Inc. 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 - * +/**************************************************************************** + * Copyright (c) 2015 Composent, Inc. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Scott Lewis - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteserviceadmin.ui.endpoint.model; import org.eclipse.ecf.remoteservices.ui.RSAImageRegistry; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointConfigTypesNode.java b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointConfigTypesNode.java index eeecf3162..50b252b2d 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointConfigTypesNode.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointConfigTypesNode.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2015 Composent, Inc. 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 - * +/**************************************************************************** + * Copyright (c) 2015 Composent, Inc. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Scott Lewis - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteserviceadmin.ui.endpoint.model; import org.eclipse.ecf.internal.remoteservices.ui.Messages; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointConnectTargetIDNode.java b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointConnectTargetIDNode.java index 646babe7c..822285ae8 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointConnectTargetIDNode.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointConnectTargetIDNode.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2015 Composent, Inc. 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 - * +/**************************************************************************** + * Copyright (c) 2015 Composent, Inc. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Scott Lewis - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteserviceadmin.ui.endpoint.model; import org.eclipse.ecf.internal.remoteservices.ui.Messages; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointContainerIDNode.java b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointContainerIDNode.java index 7378e5ea9..340a7a787 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointContainerIDNode.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointContainerIDNode.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2015 Composent, Inc. 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 - * +/**************************************************************************** + * Copyright (c) 2015 Composent, Inc. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Scott Lewis - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteserviceadmin.ui.endpoint.model; import org.eclipse.ecf.internal.remoteservices.ui.Messages; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointContentProvider.java b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointContentProvider.java index 8d48a47b9..8d3669ff1 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointContentProvider.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointContentProvider.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2015 Composent, Inc. 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 - * +/**************************************************************************** + * Copyright (c) 2015 Composent, Inc. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Scott Lewis - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteserviceadmin.ui.endpoint.model; import org.eclipse.ui.IViewSite; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointDiscoveryGroupNode.java b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointDiscoveryGroupNode.java index 77cebab2e..0b357417e 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointDiscoveryGroupNode.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointDiscoveryGroupNode.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2015 Composent, Inc. 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 - * +/**************************************************************************** + * Copyright (c) 2015 Composent, Inc. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Scott Lewis - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteserviceadmin.ui.endpoint.model; import org.eclipse.ecf.discovery.identity.IServiceID; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointDiscoveryGroupNodeWorkbenchAdapter.java b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointDiscoveryGroupNodeWorkbenchAdapter.java index a4e30cd32..bc04779fc 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointDiscoveryGroupNodeWorkbenchAdapter.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointDiscoveryGroupNodeWorkbenchAdapter.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2015 Composent, Inc. 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 - * +/**************************************************************************** + * Copyright (c) 2015 Composent, Inc. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Scott Lewis - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteserviceadmin.ui.endpoint.model; import org.eclipse.ecf.remoteservices.ui.RSAImageRegistry; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointECFNode.java b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointECFNode.java index 041507bfd..98a00b5a5 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointECFNode.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointECFNode.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2015 Composent, Inc. 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 - * +/**************************************************************************** + * Copyright (c) 2015 Composent, Inc. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Scott Lewis - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteserviceadmin.ui.endpoint.model; /** diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointFrameworkIDNode.java b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointFrameworkIDNode.java index 999d51613..7d7b9844d 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointFrameworkIDNode.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointFrameworkIDNode.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2015 Composent, Inc. 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 - * +/**************************************************************************** + * Copyright (c) 2015 Composent, Inc. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Scott Lewis - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteserviceadmin.ui.endpoint.model; import org.eclipse.ecf.internal.remoteservices.ui.Messages; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointGroupNode.java b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointGroupNode.java index 0ba0b22e4..ec7a68e1c 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointGroupNode.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointGroupNode.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2015 Composent, Inc. 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 - * +/**************************************************************************** + * Copyright (c) 2015 Composent, Inc. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Scott Lewis - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteserviceadmin.ui.endpoint.model; /** diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointGroupNodeWorkbenchAdapter.java b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointGroupNodeWorkbenchAdapter.java index 5fcb87e6e..305f0cee3 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointGroupNodeWorkbenchAdapter.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointGroupNodeWorkbenchAdapter.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2015 Composent, Inc. 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 - * +/**************************************************************************** + * Copyright (c) 2015 Composent, Inc. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Scott Lewis - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteserviceadmin.ui.endpoint.model; import org.eclipse.jface.resource.ImageDescriptor; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointHostGroupNode.java b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointHostGroupNode.java index 03cd93bed..ed115bbd5 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointHostGroupNode.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointHostGroupNode.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2015 Composent, Inc. 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 - * +/**************************************************************************** + * Copyright (c) 2015 Composent, Inc. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Scott Lewis - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteserviceadmin.ui.endpoint.model; /** diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointHostGroupNodeWorkbenchAdapter.java b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointHostGroupNodeWorkbenchAdapter.java index 894f75f84..4377568b1 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointHostGroupNodeWorkbenchAdapter.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointHostGroupNodeWorkbenchAdapter.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2015 Composent, Inc. 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 - * +/**************************************************************************** + * Copyright (c) 2015 Composent, Inc. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Scott Lewis - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteserviceadmin.ui.endpoint.model; import org.eclipse.ecf.remoteservices.ui.RSAImageRegistry; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointIDNode.java b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointIDNode.java index 487f01acf..cdcda98b5 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointIDNode.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointIDNode.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2015 Composent, Inc. 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 - * +/**************************************************************************** + * Copyright (c) 2015 Composent, Inc. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Scott Lewis - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteserviceadmin.ui.endpoint.model; import org.eclipse.ecf.internal.remoteservices.ui.Messages; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointIntentsNode.java b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointIntentsNode.java index df13f7ade..582e2d4fe 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointIntentsNode.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointIntentsNode.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2015 Composent, Inc. 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 - * +/**************************************************************************** + * Copyright (c) 2015 Composent, Inc. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Scott Lewis - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteserviceadmin.ui.endpoint.model; import org.eclipse.ecf.internal.remoteservices.ui.Messages; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointInterfacesNode.java b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointInterfacesNode.java index 242cb1bba..b04bdce57 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointInterfacesNode.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointInterfacesNode.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2015 Composent, Inc. 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 - * +/**************************************************************************** + * Copyright (c) 2015 Composent, Inc. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Scott Lewis - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteserviceadmin.ui.endpoint.model; import org.osgi.framework.Constants; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointInterfacesNodeWorkbenchAdapter.java b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointInterfacesNodeWorkbenchAdapter.java index 8e8fa00ae..c9dc1596c 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointInterfacesNodeWorkbenchAdapter.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointInterfacesNodeWorkbenchAdapter.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2015 Composent, Inc. 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 - * +/**************************************************************************** + * Copyright (c) 2015 Composent, Inc. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Scott Lewis - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteserviceadmin.ui.endpoint.model; import org.eclipse.ecf.remoteservices.ui.RSAImageRegistry; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointNamespaceNode.java b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointNamespaceNode.java index 5ddb6119a..cd3e95a34 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointNamespaceNode.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointNamespaceNode.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2015 Composent, Inc. 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 - * +/**************************************************************************** + * Copyright (c) 2015 Composent, Inc. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Scott Lewis - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteserviceadmin.ui.endpoint.model; import org.eclipse.ecf.internal.remoteservices.ui.Messages; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointNode.java b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointNode.java index b8a6d52fa..96e8d1f92 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointNode.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointNode.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2015 Composent, Inc. 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 - * +/**************************************************************************** + * Copyright (c) 2015 Composent, Inc. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Scott Lewis - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteserviceadmin.ui.endpoint.model; import org.eclipse.ecf.osgi.services.remoteserviceadmin.EndpointDescription; @@ -28,6 +31,7 @@ public class EndpointNode extends AbstractEndpointNode { this.endpointDescription = ed; this.importReference = (ImportReference) irn.getImportRegistration().getImportReference(); } + /** * @since 3.3 */ @@ -51,18 +55,17 @@ public class EndpointNode extends AbstractEndpointNode { public EndpointDescription getEndpointDescription() { return endpointDescription; } - + @Deprecated public ImportRegistrationNode getImportReg() { return null; } - - + @Deprecated public ImportRegistration getImportRegistration() { return null; } - + /** * @since 3.3 */ @@ -84,10 +87,10 @@ public class EndpointNode extends AbstractEndpointNode { public void setImportReference(ImportReference iref) { this.importReference = iref; } - + @Deprecated public void setImportReg(ImportRegistrationNode ir) { - + } } diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointNodeWorkbenchAdapter.java b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointNodeWorkbenchAdapter.java index cd83d0d2a..09fbd5ae1 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointNodeWorkbenchAdapter.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointNodeWorkbenchAdapter.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2015 Composent, Inc. 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 - * +/**************************************************************************** + * Copyright (c) 2015 Composent, Inc. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Scott Lewis - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteserviceadmin.ui.endpoint.model; import org.eclipse.ecf.internal.remoteservices.ui.OverlayIcon; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointPackageVersionNode.java b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointPackageVersionNode.java index 7b3432c99..97e4009fa 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointPackageVersionNode.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointPackageVersionNode.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2015 Composent, Inc. 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 - * +/**************************************************************************** + * Copyright (c) 2015 Composent, Inc. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Scott Lewis - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteserviceadmin.ui.endpoint.model; import org.eclipse.ecf.internal.remoteservices.ui.Messages; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointPackageVersionNodeWorkbenchAdapter.java b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointPackageVersionNodeWorkbenchAdapter.java index 2d9972a64..52117c01b 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointPackageVersionNodeWorkbenchAdapter.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointPackageVersionNodeWorkbenchAdapter.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2015 Composent, Inc. 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 - * +/**************************************************************************** + * Copyright (c) 2015 Composent, Inc. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Scott Lewis - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteserviceadmin.ui.endpoint.model; import org.eclipse.ecf.remoteservices.ui.RSAImageRegistry; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointPropertyGroupNode.java b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointPropertyGroupNode.java index 242b46e08..ea34fade3 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointPropertyGroupNode.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointPropertyGroupNode.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2015 Composent, Inc. 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 - * +/**************************************************************************** + * Copyright (c) 2015 Composent, Inc. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Scott Lewis - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteserviceadmin.ui.endpoint.model; /** diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointPropertyGroupNodeWorkbenchAdapter.java b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointPropertyGroupNodeWorkbenchAdapter.java index 5b44e5ba9..5fe8c7a03 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointPropertyGroupNodeWorkbenchAdapter.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointPropertyGroupNodeWorkbenchAdapter.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2015 Composent, Inc. 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 - * +/**************************************************************************** + * Copyright (c) 2015 Composent, Inc. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Scott Lewis - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteserviceadmin.ui.endpoint.model; import org.eclipse.jface.resource.ImageDescriptor; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointPropertyNode.java b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointPropertyNode.java index 4129af7a6..d9ce058fb 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointPropertyNode.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointPropertyNode.java @@ -1,13 +1,16 @@ -/******************************************************************************* - * Copyright (c) 2015 Composent, Inc. 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 - * +/**************************************************************************** + * Copyright (c) 2015 Composent, Inc. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Scott Lewis - initial API and implementation * * @since 3.3 - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteserviceadmin.ui.endpoint.model; /** diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointPropertyNodeWorkbenchAdapter.java b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointPropertyNodeWorkbenchAdapter.java index d2fad00d9..f72392ea1 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointPropertyNodeWorkbenchAdapter.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointPropertyNodeWorkbenchAdapter.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2015 Composent, Inc. 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 - * +/**************************************************************************** + * Copyright (c) 2015 Composent, Inc. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Scott Lewis - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteserviceadmin.ui.endpoint.model; import org.eclipse.ecf.remoteservices.ui.RSAImageRegistry; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointPropertySource.java b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointPropertySource.java index fb586ba81..f17b8aa38 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointPropertySource.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointPropertySource.java @@ -1,13 +1,16 @@ -/******************************************************************************* - * Copyright (c) 2015 Composent, Inc. 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 - * +/**************************************************************************** + * Copyright (c) 2015 Composent, Inc. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Scott Lewis - initial API and implementation * * @since 3.3 - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteserviceadmin.ui.endpoint.model; import java.util.ArrayList; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointRemoteServiceFilterNode.java b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointRemoteServiceFilterNode.java index e180acf2a..c1f77e0d8 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointRemoteServiceFilterNode.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointRemoteServiceFilterNode.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2015 Composent, Inc. 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 - * +/**************************************************************************** + * Copyright (c) 2015 Composent, Inc. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Scott Lewis - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteserviceadmin.ui.endpoint.model; import org.eclipse.ecf.internal.remoteservices.ui.Messages; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointRemoteServiceIDNode.java b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointRemoteServiceIDNode.java index 478e159d0..f73938bfd 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointRemoteServiceIDNode.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointRemoteServiceIDNode.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2015 Composent, Inc. 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 - * +/**************************************************************************** + * Copyright (c) 2015 Composent, Inc. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Scott Lewis - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteserviceadmin.ui.endpoint.model; import org.eclipse.ecf.internal.remoteservices.ui.Messages; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointServiceIDNode.java b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointServiceIDNode.java index f8681b4f3..29d13693a 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointServiceIDNode.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointServiceIDNode.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2015 Composent, Inc. 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 - * +/**************************************************************************** + * Copyright (c) 2015 Composent, Inc. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Scott Lewis - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteserviceadmin.ui.endpoint.model; import org.eclipse.ecf.internal.remoteservices.ui.Messages; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointTimestampNode.java b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointTimestampNode.java index 3a421e4d8..2ed24a2e4 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointTimestampNode.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointTimestampNode.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2015 Composent, Inc. 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 - * +/**************************************************************************** + * Copyright (c) 2015 Composent, Inc. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Scott Lewis - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteserviceadmin.ui.endpoint.model; import org.eclipse.ecf.internal.remoteservices.ui.Messages; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/ImportRegistrationNode.java b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/ImportRegistrationNode.java index c773563e2..4a7771bf5 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/ImportRegistrationNode.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/ImportRegistrationNode.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2015 Composent, Inc. 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 - * +/**************************************************************************** + * Copyright (c) 2015 Composent, Inc. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Scott Lewis - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteserviceadmin.ui.endpoint.model; import org.eclipse.ecf.osgi.services.remoteserviceadmin.RemoteServiceAdmin.ImportRegistration; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/AbstractRemoteServiceAdminView.java b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/AbstractRemoteServiceAdminView.java index 1da9b3e13..e55c66acc 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/AbstractRemoteServiceAdminView.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/AbstractRemoteServiceAdminView.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2015 Composent, Inc. 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 - * +/**************************************************************************** + * Copyright (c) 2015 Composent, Inc. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Scott Lewis - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteserviceadmin.ui.rsa; import org.eclipse.core.runtime.IStatus; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/RemoteServiceAdminView.java b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/RemoteServiceAdminView.java index 0845ce2b0..2374051f1 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/RemoteServiceAdminView.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/RemoteServiceAdminView.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2015 Composent, Inc. 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 - * +/**************************************************************************** + * Copyright (c) 2015 Composent, Inc. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Scott Lewis - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteserviceadmin.ui.rsa; import java.util.List; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/model/AbstractRSAContentProvider.java b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/model/AbstractRSAContentProvider.java index d0222dc59..df431a0c4 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/model/AbstractRSAContentProvider.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/model/AbstractRSAContentProvider.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2015 Composent, Inc. 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 - * +/**************************************************************************** + * Copyright (c) 2015 Composent, Inc. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Scott Lewis - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteserviceadmin.ui.rsa.model; import org.eclipse.ui.IViewSite; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/model/AbstractRSANode.java b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/model/AbstractRSANode.java index cb7b2119c..bf08c3af6 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/model/AbstractRSANode.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/model/AbstractRSANode.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2015 Composent, Inc. 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 - * +/**************************************************************************** + * Copyright (c) 2015 Composent, Inc. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Scott Lewis - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteserviceadmin.ui.rsa.model; import java.util.ArrayList; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/model/AbstractRSAWorkbenchAdapter.java b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/model/AbstractRSAWorkbenchAdapter.java index 2c3f05c5d..43bb13ce8 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/model/AbstractRSAWorkbenchAdapter.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/model/AbstractRSAWorkbenchAdapter.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2015 Composent, Inc. 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 - * +/**************************************************************************** + * Copyright (c) 2015 Composent, Inc. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Scott Lewis - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteserviceadmin.ui.rsa.model; import org.eclipse.ui.model.WorkbenchAdapter; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/model/AbstractRegistrationNode.java b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/model/AbstractRegistrationNode.java index 707207b8c..3edf0f586 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/model/AbstractRegistrationNode.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/model/AbstractRegistrationNode.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2015 Composent, Inc. 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 - * +/**************************************************************************** + * Copyright (c) 2015 Composent, Inc. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Scott Lewis - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteserviceadmin.ui.rsa.model; import org.eclipse.core.runtime.Platform; @@ -29,7 +32,7 @@ public abstract class AbstractRegistrationNode extends AbstractRSANode { */ public AbstractRegistrationNode(Throwable t, boolean showStack) { this.error = t; - if (this.error != null) + if (this.error != null) addChild(new ExceptionNode(this.error, showStack)); } @@ -48,21 +51,21 @@ public abstract class AbstractRegistrationNode extends AbstractRSANode { public abstract boolean isClosed(); protected abstract String getValidName(); - + /** * @since 3.4 */ - protected String getErrorName(){ + protected String getErrorName() { return ERROR; } - + /** * @since 3.4 */ protected String getClosedName() { return CLOSED; } - + public abstract ServiceReference getServiceReference(); public String getName() { diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/model/EndpointDescriptionRSANode.java b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/model/EndpointDescriptionRSANode.java index f4bcb3939..8d0ab9540 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/model/EndpointDescriptionRSANode.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/model/EndpointDescriptionRSANode.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2015 Composent, Inc. 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 - * +/**************************************************************************** + * Copyright (c) 2015 Composent, Inc. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Scott Lewis - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteserviceadmin.ui.rsa.model; import java.util.List; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/model/EndpointDescriptionRSANodeWorkbenchAdapter.java b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/model/EndpointDescriptionRSANodeWorkbenchAdapter.java index c998c94fd..e7f947790 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/model/EndpointDescriptionRSANodeWorkbenchAdapter.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/model/EndpointDescriptionRSANodeWorkbenchAdapter.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2015 Composent, Inc. 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 - * +/**************************************************************************** + * Copyright (c) 2015 Composent, Inc. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Scott Lewis - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteserviceadmin.ui.rsa.model; import org.eclipse.ecf.osgi.services.remoteserviceadmin.EndpointDescription; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/model/ExceptionNode.java b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/model/ExceptionNode.java index 093def399..408464bae 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/model/ExceptionNode.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/model/ExceptionNode.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2015 Composent, Inc. 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 - * +/**************************************************************************** + * Copyright (c) 2015 Composent, Inc. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Scott Lewis - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteserviceadmin.ui.rsa.model; /** @@ -16,16 +19,16 @@ public class ExceptionNode extends NameValuePropertyNode { public ExceptionNode(String exceptionLabel, Throwable exception, boolean showStack) { super(exceptionLabel, exception.getLocalizedMessage()); if (showStack) { - for(StackTraceElement ste: exception.getStackTrace()) + for (StackTraceElement ste : exception.getStackTrace()) addChild(new StackTraceElementNode(ste.toString())); Throwable cause = exception.getCause(); if (cause != null) - addChild(new ExceptionNode(cause,true)); + addChild(new ExceptionNode(cause, true)); } } public ExceptionNode(Throwable exception, boolean showStack) { - this("",exception, showStack); + this("", exception, showStack); setNameValueSeparator(""); } } diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/model/ExceptionNodeWorkbenchAdapter.java b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/model/ExceptionNodeWorkbenchAdapter.java index 9ae61af99..5122f49c1 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/model/ExceptionNodeWorkbenchAdapter.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/model/ExceptionNodeWorkbenchAdapter.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2015 Composent, Inc. 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 - * +/**************************************************************************** + * Copyright (c) 2015 Composent, Inc. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Scott Lewis - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteserviceadmin.ui.rsa.model; import org.eclipse.jface.resource.ImageDescriptor; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/model/ExportRegistrationNode.java b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/model/ExportRegistrationNode.java index cb8bce7f2..4d7c80257 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/model/ExportRegistrationNode.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/model/ExportRegistrationNode.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2015 Composent, Inc. 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 - * +/**************************************************************************** + * Copyright (c) 2015 Composent, Inc. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Scott Lewis - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteserviceadmin.ui.rsa.model; import org.eclipse.ecf.osgi.services.remoteserviceadmin.RemoteServiceAdmin.ExportReference; @@ -41,7 +44,7 @@ public class ExportRegistrationNode extends AbstractRegistrationNode { protected String getErrorName() { return "Export " + super.getErrorName(); } - + protected ExportRegistration getExportRegistration() { return this.exportRegistration; } diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/model/ExportRegistrationNodeWorkbenchAdapter.java b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/model/ExportRegistrationNodeWorkbenchAdapter.java index 81e221018..e532eee67 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/model/ExportRegistrationNodeWorkbenchAdapter.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/model/ExportRegistrationNodeWorkbenchAdapter.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2015 Composent, Inc. 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 - * +/**************************************************************************** + * Copyright (c) 2015 Composent, Inc. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Scott Lewis - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteserviceadmin.ui.rsa.model; import org.eclipse.ecf.remoteservices.ui.RSAImageRegistry; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/model/ExportedServicesRootNode.java b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/model/ExportedServicesRootNode.java index 6ddc487bc..4c79d5cd9 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/model/ExportedServicesRootNode.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/model/ExportedServicesRootNode.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2015 Composent, Inc. 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 - * +/**************************************************************************** + * Copyright (c) 2015 Composent, Inc. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Scott Lewis - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteserviceadmin.ui.rsa.model; /** diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/model/ExportedServicesRootNodeWorkbenchAdapter.java b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/model/ExportedServicesRootNodeWorkbenchAdapter.java index a487d9f54..6efd110f7 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/model/ExportedServicesRootNodeWorkbenchAdapter.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/model/ExportedServicesRootNodeWorkbenchAdapter.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2015 Composent, Inc. 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 - * +/**************************************************************************** + * Copyright (c) 2015 Composent, Inc. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Scott Lewis - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteserviceadmin.ui.rsa.model; import org.eclipse.jface.resource.ImageDescriptor; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/model/ImportRegistrationNode.java b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/model/ImportRegistrationNode.java index 66fef6765..c2d747fa3 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/model/ImportRegistrationNode.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/model/ImportRegistrationNode.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2015 Composent, Inc. 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 - * +/**************************************************************************** + * Copyright (c) 2015 Composent, Inc. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Scott Lewis - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteserviceadmin.ui.rsa.model; import org.eclipse.ecf.osgi.services.remoteserviceadmin.RemoteServiceAdmin.ImportReference; @@ -41,7 +44,6 @@ public class ImportRegistrationNode extends AbstractRegistrationNode { protected String getErrorName() { return "Import " + super.getErrorName(); } - protected ImportRegistration getImportRegistration() { return this.importRegistration; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/model/ImportRegistrationNodeWorkbenchAdapter.java b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/model/ImportRegistrationNodeWorkbenchAdapter.java index 262f18cea..ad62046d2 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/model/ImportRegistrationNodeWorkbenchAdapter.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/model/ImportRegistrationNodeWorkbenchAdapter.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2015 Composent, Inc. 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 - * +/**************************************************************************** + * Copyright (c) 2015 Composent, Inc. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Scott Lewis - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteserviceadmin.ui.rsa.model; import org.eclipse.ecf.remoteservices.ui.RSAImageRegistry; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/model/ImportedEndpointsRootNode.java b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/model/ImportedEndpointsRootNode.java index 2c98a931d..8fbb103d0 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/model/ImportedEndpointsRootNode.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/model/ImportedEndpointsRootNode.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2015 Composent, Inc. 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 - * +/**************************************************************************** + * Copyright (c) 2015 Composent, Inc. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Scott Lewis - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteserviceadmin.ui.rsa.model; /** diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/model/ImportedEndpointsRootNodeWorkbenchAdapter.java b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/model/ImportedEndpointsRootNodeWorkbenchAdapter.java index 36b7b3c29..cccc0192a 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/model/ImportedEndpointsRootNodeWorkbenchAdapter.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/model/ImportedEndpointsRootNodeWorkbenchAdapter.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2015 Composent, Inc. 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 - * +/**************************************************************************** + * Copyright (c) 2015 Composent, Inc. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Scott Lewis - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteserviceadmin.ui.rsa.model; import org.eclipse.jface.resource.ImageDescriptor; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/model/NameValuePropertyNode.java b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/model/NameValuePropertyNode.java index 4c7a169db..fc4eac436 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/model/NameValuePropertyNode.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/model/NameValuePropertyNode.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2015 Composent, Inc. 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 - * +/**************************************************************************** + * Copyright (c) 2015 Composent, Inc. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Scott Lewis - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteserviceadmin.ui.rsa.model; /** diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/model/NameValuePropertyNodeWorkbenchAdapter.java b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/model/NameValuePropertyNodeWorkbenchAdapter.java index 1f417e6f7..13ef3b53d 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/model/NameValuePropertyNodeWorkbenchAdapter.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/model/NameValuePropertyNodeWorkbenchAdapter.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2015 Composent, Inc. 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 - * +/**************************************************************************** + * Copyright (c) 2015 Composent, Inc. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Scott Lewis - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteserviceadmin.ui.rsa.model; import org.eclipse.ecf.remoteservices.ui.RSAImageRegistry; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/model/RSAAdapterFactory.java b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/model/RSAAdapterFactory.java index 779a42116..72a5a875e 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/model/RSAAdapterFactory.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/model/RSAAdapterFactory.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2015 Composent, Inc. 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 - * +/**************************************************************************** + * Copyright (c) 2015 Composent, Inc. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Scott Lewis - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteserviceadmin.ui.rsa.model; import org.eclipse.core.runtime.IAdapterFactory; @@ -25,7 +28,7 @@ public class RSAAdapterFactory implements IAdapterFactory { private NameValuePropertyNodeWorkbenchAdapter nameValuePropertyAdapter = new NameValuePropertyNodeWorkbenchAdapter(); private EndpointDescriptionRSANodeWorkbenchAdapter edAdapter = new EndpointDescriptionRSANodeWorkbenchAdapter(); private ExceptionNodeWorkbenchAdapter enAdapter = new ExceptionNodeWorkbenchAdapter(); - + @Override public Object getAdapter(Object adaptableObject, @SuppressWarnings("rawtypes") Class adapterType) { if (adapterType.isInstance(adaptableObject)) { diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/model/RSAContentProvider.java b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/model/RSAContentProvider.java index 4ffe8d64d..68ac7d6f5 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/model/RSAContentProvider.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/model/RSAContentProvider.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2015 Composent, Inc. 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 - * +/**************************************************************************** + * Copyright (c) 2015 Composent, Inc. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Scott Lewis - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteserviceadmin.ui.rsa.model; import org.eclipse.ecf.internal.remoteservices.ui.Messages; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/model/ServiceIdNode.java b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/model/ServiceIdNode.java index 93c6cbc77..08a2e3396 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/model/ServiceIdNode.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/model/ServiceIdNode.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2015 Composent, Inc. 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 - * +/**************************************************************************** + * Copyright (c) 2015 Composent, Inc. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Scott Lewis - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteserviceadmin.ui.rsa.model; import org.osgi.framework.Constants; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/model/StackTraceElementNode.java b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/model/StackTraceElementNode.java index 70c0f854c..180f61c56 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/model/StackTraceElementNode.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/model/StackTraceElementNode.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2015 Composent, Inc. 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 - * +/**************************************************************************** + * Copyright (c) 2015 Composent, Inc. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Scott Lewis - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteserviceadmin.ui.rsa.model; /** @@ -14,7 +17,7 @@ package org.eclipse.ecf.remoteserviceadmin.ui.rsa.model; public class StackTraceElementNode extends NameValuePropertyNode { public StackTraceElementNode(String stackTraceElement) { - super("at",stackTraceElement); + super("at", stackTraceElement); setNameValueSeparator(" "); } } diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteservices/ui/MethodInvocationDialog.java b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteservices/ui/MethodInvocationDialog.java index de4eea837..c49f7fc44 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteservices/ui/MethodInvocationDialog.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteservices/ui/MethodInvocationDialog.java @@ -1,13 +1,15 @@ -/******************************************************************************* +/**************************************************************************** * Copyright (c) 2008 Remy Chi Jian Suen and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Remy Chi Jian Suen <remy.suen@gmail.com> - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteservices.ui; import java.lang.reflect.Method; @@ -68,31 +70,27 @@ public final class MethodInvocationDialog extends Dialog { public static final int ASYNC_LISTENER = 0; /** - * An integer constant that corresponds to the "Async Future Result" - * selection. + * An integer constant that corresponds to the "Async Future Result" selection. * * @see #getInvocationType() */ public static final int ASYNC_FUTURE_RESULT = ASYNC_LISTENER + 1; /** - * An integer constant that corresponds to the "Async Fire-and-Go" - * selection. + * An integer constant that corresponds to the "Async Fire-and-Go" selection. * * @see #getInvocationType() */ public static final int ASYNC_FIRE_AND_GO = ASYNC_FUTURE_RESULT + 1; /** - * An integer constant that corresponds to the "OSGi Service Proxy" - * selection. + * An integer constant that corresponds to the "OSGi Service Proxy" selection. * * @see #getInvocationType() */ public static final int OSGI_SERVICE_PROXY = ASYNC_FIRE_AND_GO + 1; /** - * An integer constant that corresponds to the "Remote Service Proxy" - * selection. + * An integer constant that corresponds to the "Remote Service Proxy" selection. * * @see #getInvocationType() */ @@ -124,13 +122,10 @@ public final class MethodInvocationDialog extends Dialog { private int invocationType; /** - * Creates a new MethodInvocationDialog on top of the specified shell - * provider. + * Creates a new MethodInvocationDialog on top of the specified shell provider. * - * @param parentShell - * the provider to return the parent shell of this dialog - * @param cls - * the class to select the methods from + * @param parentShell the provider to return the parent shell of this dialog + * @param cls the class to select the methods from */ public MethodInvocationDialog(IShellProvider parentShell, Class cls) { super(parentShell); @@ -174,10 +169,8 @@ public final class MethodInvocationDialog extends Dialog { /** * Creates a new MethodInvocationDialog over the provided shell. * - * @param parentShell - * the parent shell - * @param cls - * the class to select the methods from + * @param parentShell the parent shell + * @param cls the class to select the methods from */ public MethodInvocationDialog(Shell parentShell, Class cls) { this(new SameShellProvider(parentShell), cls); @@ -408,8 +401,8 @@ public final class MethodInvocationDialog extends Dialog { } /** - * Retrieves the timeout value that has been specified by the user. This - * value is in milliseconds. + * Retrieves the timeout value that has been specified by the user. This value + * is in milliseconds. * * @return the timeout valued specified by the user in milliseconds */ diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteservices/ui/RSAImageRegistry.java b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteservices/ui/RSAImageRegistry.java index 1c2001566..df121ba51 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteservices/ui/RSAImageRegistry.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteservices/ui/RSAImageRegistry.java @@ -1,14 +1,16 @@ -/******************************************************************************* - * Copyright (c) 2000, 2008 IBM Corporation, 2015 Composent, Inc and others. - * 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 - * +/**************************************************************************** + * Copyright (c) 2000, 2008 IBM Corporation, 2015 Composent, Inc and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: * IBM Corporation - initial API and implementation * Composent, Inc - Changes for use in RSA discovery view - *******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteservices.ui; import java.net.URL; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteservices/ui/RemoteMethod.java b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteservices/ui/RemoteMethod.java index d4901a37f..ba8ef0bb7 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteservices/ui/RemoteMethod.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteservices/ui/RemoteMethod.java @@ -1,13 +1,15 @@ -/******************************************************************************* +/**************************************************************************** * Copyright (c) 2008 Remy Chi Jian Suen and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Remy Chi Jian Suen <remy.suen@gmail.com> - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteservices.ui; import java.lang.reflect.Method; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteservices/ui/util/PropertyUtils.java b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteservices/ui/util/PropertyUtils.java index 645e41b61..078b5357d 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteservices/ui/util/PropertyUtils.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteservices/ui/util/PropertyUtils.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2015 Composent, Inc. 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 - * +/**************************************************************************** + * Copyright (c) 2015 Composent, Inc. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Scott Lewis - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteservices.ui.util; import java.util.ArrayList; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice/.settings/.api_filters b/framework/bundles/org.eclipse.ecf.remoteservice/.settings/.api_filters index b3682b6af..75c3674e9 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice/.settings/.api_filters +++ b/framework/bundles/org.eclipse.ecf.remoteservice/.settings/.api_filters @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <component id="org.eclipse.ecf.remoteservice" version="2"> - <resource path="src/org/eclipse/ecf/remoteservice/client/AbstractClientContainer.java" type="org.eclipse.ecf.remoteservice.client.AbstractClientContainer"> - <filter id="336658481"> + <resource path="src/org/eclipse/ecf/remoteservice/IRemoteServiceRegistration.java" type="org.eclipse.ecf.remoteservice.IRemoteServiceRegistration"> + <filter id="403804204"> <message_arguments> - <message_argument value="org.eclipse.ecf.remoteservice.client.AbstractClientContainer"/> - <message_argument value="remoteServiceFactory"/> + <message_argument value="org.eclipse.ecf.remoteservice.IRemoteServiceRegistration"/> + <message_argument value="getClassLoader()"/> </message_arguments> </filter> </resource> diff --git a/framework/bundles/org.eclipse.ecf.remoteservice/.settings/org.eclipse.jdt.core.prefs b/framework/bundles/org.eclipse.ecf.remoteservice/.settings/org.eclipse.jdt.core.prefs index 64a2d3d25..3f0838245 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice/.settings/org.eclipse.jdt.core.prefs +++ b/framework/bundles/org.eclipse.ecf.remoteservice/.settings/org.eclipse.jdt.core.prefs @@ -1,4 +1,3 @@ -#Tue Jan 11 19:53:19 PST 2011 eclipse.preferences.version=1 org.eclipse.jdt.core.builder.cleanOutputFolder=clean org.eclipse.jdt.core.builder.duplicateResourceTask=warning @@ -8,6 +7,15 @@ 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.annotation.inheritNullAnnotations=disabled +org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore +org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull +org.eclipse.jdt.core.compiler.annotation.nonnull.secondary= +org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault +org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary= +org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable +org.eclipse.jdt.core.compiler.annotation.nullable.secondary= +org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve @@ -17,17 +25,20 @@ 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.APILeak=warning +org.eclipse.jdt.core.compiler.problem.annotatedTypeArgumentToUnannotated=info org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.autoboxing=ignore org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning org.eclipse.jdt.core.compiler.problem.deadCode=warning -org.eclipse.jdt.core.compiler.problem.deprecation=warning +org.eclipse.jdt.core.compiler.problem.deprecation=ignore org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore org.eclipse.jdt.core.compiler.problem.emptyStatement=warning org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled org.eclipse.jdt.core.compiler.problem.fieldHiding=warning @@ -43,7 +54,9 @@ 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.missingDefaultCase=ignore org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore +org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled @@ -58,30 +71,51 @@ org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignor 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.nonnullParameterAnnotationDropped=warning +org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning +org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error org.eclipse.jdt.core.compiler.problem.nullReference=warning +org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error +org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore +org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore +org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore +org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore +org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore +org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore +org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled +org.eclipse.jdt.core.compiler.problem.suppressWarningsNotFullyAnalysed=info +org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning +org.eclipse.jdt.core.compiler.problem.terminalDeprecation=warning org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning +org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore +org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning +org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=warning +org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled +org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=info 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.unstableAutoModuleName=warning org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=enabled +org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedImport=error org.eclipse.jdt.core.compiler.problem.unusedLabel=warning org.eclipse.jdt.core.compiler.problem.unusedLocal=warning @@ -91,7 +125,8 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference= 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.unusedWarningToken=warning +org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore +org.eclipse.jdt.core.compiler.problem.unusedWarningToken=ignore org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.source=1.5 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false diff --git a/framework/bundles/org.eclipse.ecf.remoteservice/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.remoteservice/META-INF/MANIFEST.MF index d27d0491d..4c6b85fda 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice/META-INF/MANIFEST.MF +++ b/framework/bundles/org.eclipse.ecf.remoteservice/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin.name Bundle-SymbolicName: org.eclipse.ecf.remoteservice Automatic-Module-Name: org.eclipse.ecf.remoteservice -Bundle-Version: 8.13.1.qualifier +Bundle-Version: 8.14.0.qualifier Bundle-Activator: org.eclipse.ecf.internal.remoteservice.Activator Bundle-Vendor: %plugin.provider Bundle-Localization: plugin diff --git a/framework/bundles/org.eclipse.ecf.remoteservice/about.html b/framework/bundles/org.eclipse.ecf.remoteservice/about.html index 4c79781a5..9f1dc0dd5 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice/about.html +++ b/framework/bundles/org.eclipse.ecf.remoteservice/about.html @@ -22,7 +22,7 @@ being redistributed by another party ("Redistributor") and different t apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise indicated below, the terms and conditions of the EPL still apply to any source code in the Content -and such source code may be obtained at <a href="/">http://www.eclipse.org</a>.</p> +and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p> </body> </html>
\ No newline at end of file diff --git a/framework/bundles/org.eclipse.ecf.remoteservice/plugin.properties b/framework/bundles/org.eclipse.ecf.remoteservice/plugin.properties index 0d9b2cbda..bbd40cfc8 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice/plugin.properties +++ b/framework/bundles/org.eclipse.ecf.remoteservice/plugin.properties @@ -1,10 +1,11 @@ ############################################################################ # Copyright (c) 2007 Composent Inc., IBM Corp, and others. -# 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 # +# This program and the accompanying materials are made +# available under the terms of the Eclipse Public License 2.0 +# which is available at https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 ############################################################################ plugin.provider=Eclipse.org - ECF plugin.name=ECF RemoteServices API diff --git a/framework/bundles/org.eclipse.ecf.remoteservice/pom.xml b/framework/bundles/org.eclipse.ecf.remoteservice/pom.xml index cdd18fbac..35a8f5213 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice/pom.xml +++ b/framework/bundles/org.eclipse.ecf.remoteservice/pom.xml @@ -10,6 +10,6 @@ </parent> <groupId>org.eclipse.ecf</groupId> <artifactId>org.eclipse.ecf.remoteservice</artifactId> - <version>8.13.1-SNAPSHOT</version> + <version>8.14.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/internal/remoteservice/Activator.java b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/internal/remoteservice/Activator.java index e321b9121..a20843a01 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/internal/remoteservice/Activator.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/internal/remoteservice/Activator.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004, 2009, 2015 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.internal.remoteservice; @@ -52,6 +54,8 @@ public class Activator implements BundleActivator { private ServiceTracker<IRemoteServiceDistributionProvider, IRemoteServiceDistributionProvider> distributionProviderTracker; + static final List<String> excludeDistributionProviders = Arrays.asList(System.getProperty(PLUGIN_ID + ".excludeDistributionProviders", "").split(",")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + class RSDPRegistrations { private ServiceRegistration<ContainerTypeDescription> ctdSR; private ServiceRegistration<Namespace> nsSR; @@ -105,7 +109,9 @@ public class Activator implements BundleActivator { ContainerTypeDescription ctd = dProvider.getContainerTypeDescription(); if (ctd == null) log(new Status(IStatus.ERROR, Activator.PLUGIN_ID, "Remote Service Provider Container Type Description cannot be null")); //$NON-NLS-1$ - else { + else if (excludeDistributionProviders.contains(ctd.getName())) { + log(new Status(IStatus.WARNING, Activator.PLUGIN_ID, "Remote Service Provider name=" + ctd.getName() + " excluded")); //$NON-NLS-1$ //$NON-NLS-2$ + } else { Dictionary<String, ?> ctdProps = dProvider.getContainerTypeDescriptionProperties(); // Register the container type description ServiceRegistration<ContainerTypeDescription> ctdSR = bundleContext.registerService(ContainerTypeDescription.class, ctd, ctdProps); diff --git a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/AbstractRSAContainer.java b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/AbstractRSAContainer.java index 229178540..c8b13f04b 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/AbstractRSAContainer.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/AbstractRSAContainer.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2016 Composent, Inc. 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 - * +/**************************************************************************** + * Copyright (c) 2016 Composent, Inc. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Scott Lewis <slewis@composent.com> - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteservice; import java.util.Map; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/AbstractRemoteCallListener.java b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/AbstractRemoteCallListener.java index bab1f7b81..31f7ba99e 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/AbstractRemoteCallListener.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/AbstractRemoteCallListener.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004, 2009 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.remoteservice; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/AbstractRemoteService.java b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/AbstractRemoteService.java index 6cd97c85d..f3a10f2c3 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/AbstractRemoteService.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/AbstractRemoteService.java @@ -1,12 +1,15 @@ -/******************************************************************************* -* Copyright (c) 2010 Composent, Inc. and others. 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: -* Composent, Inc. - initial API and implementation -******************************************************************************/ +/**************************************************************************** + * Copyright (c) 2010 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * Contributors: + * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteservice; import java.lang.reflect.*; @@ -369,7 +372,7 @@ public abstract class AbstractRemoteService extends AbstractAsyncProxyRemoteServ String proxyClass = (clazzes.length == 1) ? clazzes[0] : Arrays.asList(clazzes).toString(); return proxyClass + ".proxy@" + getRemoteServiceID(); //$NON-NLS-1$ } else if (methodName.equals("hashCode")) { //$NON-NLS-1$ - return new Integer(hashCode()); + return Integer.valueOf(hashCode()); } else if (methodName.equals("equals")) { //$NON-NLS-1$ if (args == null || args.length == 0) return Boolean.FALSE; @@ -712,7 +715,9 @@ public abstract class AbstractRemoteService extends AbstractAsyncProxyRemoteServ * @since 8.13 */ public Object callSync(IRemoteCall call, Callable<Object> callable) throws InterruptedException, ExecutionException, TimeoutException { - return callAsync(call, callable).get(call.getTimeout(), TimeUnit.MILLISECONDS); + long timeout = call.getTimeout(); + Future<Object> future = callAsync(call, callable); + return (timeout == 0) ? future.get() : future.get(timeout, TimeUnit.MILLISECONDS); } /** @@ -735,7 +740,9 @@ public abstract class AbstractRemoteService extends AbstractAsyncProxyRemoteServ return getFutureExecutorService(call).submit(new Callable<Object>() { public Object call() throws Exception { try { - return getFutureExecutorService(call).submit(callable).get(call.getTimeout(), TimeUnit.MILLISECONDS); + long timeout = call.getTimeout(); + Future<Object> future = getFutureExecutorService(call).submit(callable); + return (timeout == 0L) ? future.get() : future.get(timeout, TimeUnit.MILLISECONDS); } catch (InterruptedException e) { throw new InterruptedException("Interrupted calling remote service method=" + call.getMethod()); //$NON-NLS-1$ } catch (ExecutionException e) { @@ -791,7 +798,9 @@ public abstract class AbstractRemoteService extends AbstractAsyncProxyRemoteServ getFutureExecutorService(call).submit(new Runnable() { public void run() { try { - callback.handleEvent(getFutureExecutorService(call).submit(callable).get(call.getTimeout(), TimeUnit.MILLISECONDS)); + long timeout = call.getTimeout(); + Future<IRemoteCallCompleteEvent> future = getFutureExecutorService(call).submit(callable); + callback.handleEvent((timeout == 0L) ? future.get() : future.get(timeout, TimeUnit.MILLISECONDS)); } catch (InterruptedException e) { callback.handleEvent(createRCCE(null, new InterruptedException("Interrupted calling remote service method=" + call.getMethod()))); //$NON-NLS-1$ } catch (ExecutionException e) { diff --git a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/AsyncMethod.java b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/AsyncMethod.java index 1fef198d0..39fad87b3 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/AsyncMethod.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/AsyncMethod.java @@ -1,12 +1,15 @@ -/******************************************************************************* -* Copyright (c) 2010 Composent, Inc. and others. 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: -* Composent, Inc. - initial API and implementation -******************************************************************************/ +/**************************************************************************** + * Copyright (c) 2010 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * Contributors: + * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteservice; /** diff --git a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/AsyncService.java b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/AsyncService.java index 4af464428..d31efe956 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/AsyncService.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/AsyncService.java @@ -1,12 +1,15 @@ -/******************************************************************************* -* Copyright (c) 2010 Composent, Inc. and others. 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: -* Composent, Inc. - initial API and implementation -******************************************************************************/ +/**************************************************************************** + * Copyright (c) 2010 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * Contributors: + * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteservice; /** diff --git a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/CallbackRemoteCallListener.java b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/CallbackRemoteCallListener.java index 3d20564c9..408ee12a6 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/CallbackRemoteCallListener.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/CallbackRemoteCallListener.java @@ -1,12 +1,15 @@ -/******************************************************************************* -* Copyright (c) 2010 Composent, Inc. and others. 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: -* Composent, Inc. - initial API and implementation -******************************************************************************/ +/**************************************************************************** + * Copyright (c) 2010 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * Contributors: + * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteservice; import org.eclipse.core.runtime.Assert; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/Constants.java b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/Constants.java index 646beec43..f58b919ba 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/Constants.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/Constants.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004-2011 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.remoteservice; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IAsyncCallback.java b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IAsyncCallback.java index 99c5e81dd..734290db9 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IAsyncCallback.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IAsyncCallback.java @@ -1,12 +1,15 @@ -/******************************************************************************* -* Copyright (c) 2010 Composent, Inc. and others. 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: -* Composent, Inc. - initial API and implementation -******************************************************************************/ +/**************************************************************************** + * Copyright (c) 2010 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * Contributors: + * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteservice; /** diff --git a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IAsyncRemoteServiceProxy.java b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IAsyncRemoteServiceProxy.java index 8e504976b..69e482cc4 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IAsyncRemoteServiceProxy.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IAsyncRemoteServiceProxy.java @@ -1,12 +1,15 @@ -/******************************************************************************* -* Copyright (c) 2010 Composent, Inc. and others. 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: -* Composent, Inc. - initial API and implementation -******************************************************************************/ +/**************************************************************************** + * Copyright (c) 2010 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * Contributors: + * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteservice; /** diff --git a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IExtendedRemoteServiceRegistration.java b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IExtendedRemoteServiceRegistration.java index 2405d4d8e..0844e5f1d 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IExtendedRemoteServiceRegistration.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IExtendedRemoteServiceRegistration.java @@ -1,12 +1,15 @@ -/******************************************************************************* - * Copyright (c) 2014 Markus Alexander Kuppe and others. 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 +/**************************************************************************** + * Copyright (c) 2014 Markus Alexander Kuppe and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Markus Alexander Kuppe - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteservice; import java.util.Dictionary; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IOSGiRemoteServiceContainerAdapter.java b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IOSGiRemoteServiceContainerAdapter.java index b50caba13..72bb348cd 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IOSGiRemoteServiceContainerAdapter.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IOSGiRemoteServiceContainerAdapter.java @@ -1,13 +1,15 @@ -/******************************************************************************* +/**************************************************************************** * Copyright (c) 2010 Markus Alexander Kuppe. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Markus Alexander Kuppe (ecf-dev_eclipse.org <at> lemmster <dot> de) - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteservice; import java.util.Dictionary; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IRemoteCall.java b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IRemoteCall.java index 18001c059..f2c723d94 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IRemoteCall.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IRemoteCall.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004, 2009 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.remoteservice; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IRemoteCallListener.java b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IRemoteCallListener.java index 776235119..5dca8fe1a 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IRemoteCallListener.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IRemoteCallListener.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004, 2009 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.remoteservice; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IRemoteFilter.java b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IRemoteFilter.java index e9e327945..66176d015 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IRemoteFilter.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IRemoteFilter.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004, 2009 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.remoteservice; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IRemoteService.java b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IRemoteService.java index adf76034b..b054fe7e5 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IRemoteService.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IRemoteService.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004, 2009 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.remoteservice; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IRemoteServiceCallPolicy.java b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IRemoteServiceCallPolicy.java index 7f1c1cada..ea6a45f14 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IRemoteServiceCallPolicy.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IRemoteServiceCallPolicy.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004, 2010 Composent, Inc., Franky Brandelance and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. and Franky Brandelance - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.remoteservice; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IRemoteServiceConsumer.java b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IRemoteServiceConsumer.java index 1af065505..12bda4e33 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IRemoteServiceConsumer.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IRemoteServiceConsumer.java @@ -1,12 +1,15 @@ -/******************************************************************************* -* Copyright (c) 2010 Composent, Inc. and others. 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: -* Composent, Inc. - initial API and implementation -******************************************************************************/ +/**************************************************************************** + * Copyright (c) 2010 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * Contributors: + * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteservice; import org.eclipse.core.runtime.IAdaptable; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IRemoteServiceContainer.java b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IRemoteServiceContainer.java index 346a21b85..e398a0d8e 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IRemoteServiceContainer.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IRemoteServiceContainer.java @@ -1,12 +1,15 @@ -/******************************************************************************* -* Copyright (c) 2009 EclipseSource and others. 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: -* EclipseSource - initial API and implementation -******************************************************************************/ +/**************************************************************************** + * Copyright (c) 2009 EclipseSource and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * Contributors: + * EclipseSource - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteservice; import org.eclipse.ecf.core.ContainerConnectException; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IRemoteServiceContainerAdapter.java b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IRemoteServiceContainerAdapter.java index d5cf4c9bb..c9f5b0dad 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IRemoteServiceContainerAdapter.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IRemoteServiceContainerAdapter.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004, 2009 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.remoteservice; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IRemoteServiceHost.java b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IRemoteServiceHost.java index c3685ad09..a4a3d5e9b 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IRemoteServiceHost.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IRemoteServiceHost.java @@ -1,12 +1,15 @@ -/******************************************************************************* -* Copyright (c) 2010 Composent, Inc. and others. 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: -* Composent, Inc. - initial API and implementation -******************************************************************************/ +/**************************************************************************** + * Copyright (c) 2010 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * Contributors: + * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteservice; import java.util.Dictionary; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IRemoteServiceID.java b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IRemoteServiceID.java index 9b6600e42..41ee0647f 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IRemoteServiceID.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IRemoteServiceID.java @@ -1,12 +1,15 @@ -/******************************************************************************* -* Copyright (c) 2009 EclipseSource and others. 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: -* EclipseSource - initial API and implementation -******************************************************************************/ +/**************************************************************************** + * Copyright (c) 2009 EclipseSource and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * Contributors: + * EclipseSource - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteservice; import org.eclipse.ecf.core.identity.ID; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IRemoteServiceImplDebugOptions.java b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IRemoteServiceImplDebugOptions.java index fb7cebe01..acf1b96bb 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IRemoteServiceImplDebugOptions.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IRemoteServiceImplDebugOptions.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteservice; import org.eclipse.ecf.internal.remoteservice.Activator; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IRemoteServiceListener.java b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IRemoteServiceListener.java index bb47651e0..05a32e961 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IRemoteServiceListener.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IRemoteServiceListener.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004, 2009 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.remoteservice; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IRemoteServiceProxy.java b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IRemoteServiceProxy.java index 2b126540f..e1186eb9e 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IRemoteServiceProxy.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IRemoteServiceProxy.java @@ -1,12 +1,15 @@ -/******************************************************************************* -* Copyright (c) 2009 EclipseSource and others. 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: -* EclipseSource - initial API and implementation -******************************************************************************/ +/**************************************************************************** + * Copyright (c) 2009 EclipseSource and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * Contributors: + * EclipseSource - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteservice; /** diff --git a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IRemoteServiceReference.java b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IRemoteServiceReference.java index 1829b982a..af6eae619 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IRemoteServiceReference.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IRemoteServiceReference.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004, 2009 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.remoteservice; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IRemoteServiceRegistration.java b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IRemoteServiceRegistration.java index d6e3e336e..60cbfb01d 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IRemoteServiceRegistration.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IRemoteServiceRegistration.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004, 2009 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.remoteservice; @@ -78,4 +80,9 @@ public interface IRemoteServiceRegistration { * */ public void unregister(); + + /** + * @since 8.14 + */ + public ClassLoader getClassLoader(); } diff --git a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/RSARemoteServiceContainerAdapter.java b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/RSARemoteServiceContainerAdapter.java index bb8421455..c3a7b0127 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/RSARemoteServiceContainerAdapter.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/RSARemoteServiceContainerAdapter.java @@ -1,12 +1,15 @@ -/******************************************************************************* -* Copyright (c) 2016 Composent, Inc. and others. 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: -* Composent, Inc. - initial API and implementation -******************************************************************************/ +/**************************************************************************** + * Copyright (c) 2016 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * Contributors: + * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteservice; import java.util.Dictionary; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/RemoteCall.java b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/RemoteCall.java index a438cb189..4ff0ed826 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/RemoteCall.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/RemoteCall.java @@ -1,12 +1,15 @@ -/******************************************************************************* -* Copyright (c) 2009 Composent, Inc. and others. 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: -* Composent, Inc. - initial API and implementation -******************************************************************************/ +/**************************************************************************** + * Copyright (c) 2009 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * Contributors: + * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteservice; import java.util.Arrays; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/RemoteCallFactory.java b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/RemoteCallFactory.java index 5d8d787b4..ef183a3d0 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/RemoteCallFactory.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/RemoteCallFactory.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2010 Naumen and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Pavel Samolisov - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.remoteservice; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/RemoteServiceContainer.java b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/RemoteServiceContainer.java index c3fe86559..7d6da71d2 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/RemoteServiceContainer.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/RemoteServiceContainer.java @@ -1,12 +1,15 @@ -/******************************************************************************* -* Copyright (c) 2009 EclipseSource and others. 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: -* EclipseSource - initial API and implementation -******************************************************************************/ +/**************************************************************************** + * Copyright (c) 2009 EclipseSource and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * Contributors: + * EclipseSource - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteservice; import org.eclipse.core.runtime.Assert; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/RemoteServiceHelper.java b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/RemoteServiceHelper.java index d530ba934..e776ab32b 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/RemoteServiceHelper.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/RemoteServiceHelper.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004, 2009 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.remoteservice; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/RemoteServiceID.java b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/RemoteServiceID.java index 67074a86e..614e51788 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/RemoteServiceID.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/RemoteServiceID.java @@ -1,12 +1,15 @@ -/******************************************************************************* -* Copyright (c) 2009 EclipseSource and others. 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: -* EclipseSource - initial API and implementation -******************************************************************************/ +/**************************************************************************** + * Copyright (c) 2009 EclipseSource and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * Contributors: + * EclipseSource - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteservice; import org.eclipse.core.runtime.Assert; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/RemoteServiceNamespace.java b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/RemoteServiceNamespace.java index 23ecabb81..620e264dc 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/RemoteServiceNamespace.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/RemoteServiceNamespace.java @@ -1,12 +1,15 @@ -/******************************************************************************* -* Copyright (c) 2009 EclipseSource and others. 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: -* EclipseSource - initial API and implementation -******************************************************************************/ +/**************************************************************************** + * Copyright (c) 2009 EclipseSource and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * Contributors: + * EclipseSource - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteservice; import org.eclipse.ecf.core.identity.*; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/RemoteServiceReferenceImpl.java b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/RemoteServiceReferenceImpl.java index 8d2ecb265..09d6c9e73 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/RemoteServiceReferenceImpl.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/RemoteServiceReferenceImpl.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2013 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2013 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteservice; import org.eclipse.ecf.core.identity.ID; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/RemoteServiceRegistrationImpl.java b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/RemoteServiceRegistrationImpl.java index 49e5bad06..410d2a2bb 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/RemoteServiceRegistrationImpl.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/RemoteServiceRegistrationImpl.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2013 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2013 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteservice; import java.io.Serializable; @@ -82,6 +85,7 @@ public class RemoteServiceRegistrationImpl implements IRemoteServiceRegistration this.service = svc; this.clazzes = clzzes; this.reference = new RemoteServiceReferenceImpl(this); + setClassLoader(this.service.getClass().getClassLoader()); synchronized (registry) { ID containerID = registry.getContainerID(); if (containerID == null) @@ -129,6 +133,7 @@ public class RemoteServiceRegistrationImpl implements IRemoteServiceRegistration if (this.registrationListener != null) { this.registrationListener.unregister(this); } + this.classLoader = null; } /** @@ -467,4 +472,17 @@ public class RemoteServiceRegistrationImpl implements IRemoteServiceRegistration public String[] getInterfaces() { return this.clazzes; } + + private ClassLoader classLoader = RemoteServiceRegistrationImpl.class.getClassLoader(); + + public ClassLoader getClassLoader() { + return classLoader; + } + + /** + * @since 8.14 + */ + protected void setClassLoader(ClassLoader cl) { + this.classLoader = cl; + } } diff --git a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/RemoteServiceRegistryImpl.java b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/RemoteServiceRegistryImpl.java index 3cbd8ec6d..f7c5103cc 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/RemoteServiceRegistryImpl.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/RemoteServiceRegistryImpl.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2013 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2013 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteservice; import java.io.Serializable; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/client/AbstractClientContainer.java b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/client/AbstractClientContainer.java index 36c66e4c9..80392526b 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/client/AbstractClientContainer.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/client/AbstractClientContainer.java @@ -1,12 +1,15 @@ -/******************************************************************************* -* Copyright (c) 2009 Composent, Inc. and others. 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: -* Composent, Inc. - initial API and implementation -******************************************************************************/ +/**************************************************************************** + * Copyright (c) 2009 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * Contributors: + * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteservice.client; import java.io.NotSerializableException; @@ -22,7 +25,8 @@ import org.eclipse.ecf.core.security.IConnectContext; import org.eclipse.ecf.internal.remoteservice.Activator; import org.eclipse.ecf.remoteservice.*; import org.eclipse.ecf.remoteservice.client.AbstractClientService.UriRequest; -import org.eclipse.ecf.remoteservice.events.*; +import org.eclipse.ecf.remoteservice.events.IRemoteServiceEvent; +import org.eclipse.ecf.remoteservice.events.IRemoteServiceRegisteredEvent; import org.eclipse.ecf.remoteservice.util.RemoteFilterImpl; import org.eclipse.equinox.concurrent.future.*; import org.osgi.framework.InvalidSyntaxException; @@ -230,27 +234,7 @@ public abstract class AbstractClientContainer extends AbstractContainer implemen } public boolean ungetRemoteService(final IRemoteServiceReference reference) { - boolean result = referencesInUse.contains(reference); - referencesInUse.remove(reference); - fireRemoteServiceEvent(new IRemoteServiceUnregisteredEvent() { - - public IRemoteServiceReference getReference() { - return reference; - } - - public ID getLocalContainerID() { - return getID(); - } - - public ID getContainerID() { - return getID(); - } - - public String[] getClazzes() { - return registry.getClazzes(reference); - } - }); - return result; + return referencesInUse.remove(reference); } // Implementation of IRestClientContainerAdapter diff --git a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/client/AbstractClientService.java b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/client/AbstractClientService.java index ec9dac64c..4dfd1b93c 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/client/AbstractClientService.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/client/AbstractClientService.java @@ -1,12 +1,15 @@ -/******************************************************************************* -* Copyright (c) 2009 Composent, Inc. and others. 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: -* Composent, Inc. - initial API and implementation -******************************************************************************/ +/**************************************************************************** + * Copyright (c) 2009 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * Contributors: + * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteservice.client; import java.io.NotSerializableException; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/client/AbstractParameterSerializer.java b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/client/AbstractParameterSerializer.java index 69f6df94f..1c7c67f48 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/client/AbstractParameterSerializer.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/client/AbstractParameterSerializer.java @@ -1,12 +1,15 @@ -/******************************************************************************* -* Copyright (c) 2013 Markus Alexander Kuppe and others. 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 Alexander Kuppe - initial API and implementation -******************************************************************************/ +/**************************************************************************** + * Copyright (c) 2013 Markus Alexander Kuppe and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * Contributors: + * Markus Alexander Kuppe - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteservice.client; import org.eclipse.ecf.remoteservice.IRemoteCall; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/client/AbstractRSAClientContainer.java b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/client/AbstractRSAClientContainer.java index d788d06c5..f53d613a2 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/client/AbstractRSAClientContainer.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/client/AbstractRSAClientContainer.java @@ -1,12 +1,15 @@ -/******************************************************************************* -* Copyright (c) 2016 Composent, Inc. and others. 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: -* Composent, Inc. - initial API and implementation -******************************************************************************/ +/**************************************************************************** + * Copyright (c) 2016 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * Contributors: + * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteservice.client; import java.util.*; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/client/AbstractRSAClientService.java b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/client/AbstractRSAClientService.java index 0b5140d0f..2b3ccec39 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/client/AbstractRSAClientService.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/client/AbstractRSAClientService.java @@ -1,12 +1,15 @@ -/******************************************************************************* -* Copyright (c) 2016 Composent, Inc. and others. 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: -* Composent, Inc. - initial API and implementation -******************************************************************************/ +/**************************************************************************** + * Copyright (c) 2016 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * Contributors: + * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteservice.client; import java.lang.reflect.Method; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/client/IRemoteCallParameter.java b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/client/IRemoteCallParameter.java index d45ac4b47..5b56c4827 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/client/IRemoteCallParameter.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/client/IRemoteCallParameter.java @@ -1,12 +1,15 @@ -/******************************************************************************* -* Copyright (c) 2009 Composent, Inc. and others. 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: -* Composent, Inc. - initial API and implementation -******************************************************************************/ +/**************************************************************************** + * Copyright (c) 2009 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * Contributors: + * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteservice.client; /** diff --git a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/client/IRemoteCallParameterSerializer.java b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/client/IRemoteCallParameterSerializer.java index 76f1735e3..53dbb9e20 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/client/IRemoteCallParameterSerializer.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/client/IRemoteCallParameterSerializer.java @@ -1,12 +1,15 @@ -/******************************************************************************* -* Copyright (c) 2009 Composent, Inc. and others. 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: -* Composent, Inc. - initial API and implementation -******************************************************************************/ +/**************************************************************************** + * Copyright (c) 2009 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * Contributors: + * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteservice.client; import java.io.NotSerializableException; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/client/IRemoteCallable.java b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/client/IRemoteCallable.java index 4163028ac..92b62db62 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/client/IRemoteCallable.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/client/IRemoteCallable.java @@ -1,12 +1,15 @@ -/******************************************************************************* -* Copyright (c) 2009 Composent, Inc. and others. 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: -* Composent, Inc. - initial API and implementation -******************************************************************************/ +/**************************************************************************** + * Copyright (c) 2009 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * Contributors: + * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteservice.client; /** diff --git a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/client/IRemoteCallableRequestType.java b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/client/IRemoteCallableRequestType.java index ebfa8f3c5..c97082aa1 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/client/IRemoteCallableRequestType.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/client/IRemoteCallableRequestType.java @@ -1,12 +1,15 @@ -/******************************************************************************* -* Copyright (c) 2009 Composent, Inc. and others. 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: -* Composent, Inc. - initial API and implementation -******************************************************************************/ +/**************************************************************************** + * Copyright (c) 2009 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * Contributors: + * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteservice.client; /** diff --git a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/client/IRemoteResponseDeserializer.java b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/client/IRemoteResponseDeserializer.java index 4f846c3b3..5e78eb5ad 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/client/IRemoteResponseDeserializer.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/client/IRemoteResponseDeserializer.java @@ -1,12 +1,15 @@ -/******************************************************************************* -* Copyright (c) 2009 Composent, Inc. and others. 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: -* Composent, Inc. - initial API and implementation -******************************************************************************/ +/**************************************************************************** + * Copyright (c) 2009 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * Contributors: + * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteservice.client; import java.io.NotSerializableException; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/client/IRemoteServiceClientContainerAdapter.java b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/client/IRemoteServiceClientContainerAdapter.java index 11d399e5d..bdcc11abb 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/client/IRemoteServiceClientContainerAdapter.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/client/IRemoteServiceClientContainerAdapter.java @@ -1,12 +1,15 @@ -/******************************************************************************* -* Copyright (c) 2009 Composent, Inc. and others. 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: -* Composent, Inc. - initial API and implementation -******************************************************************************/ +/**************************************************************************** + * Copyright (c) 2009 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * Contributors: + * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteservice.client; import java.util.Dictionary; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/client/RemoteCallParameter.java b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/client/RemoteCallParameter.java index f5c0c33cd..608ff7e14 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/client/RemoteCallParameter.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/client/RemoteCallParameter.java @@ -1,12 +1,15 @@ -/******************************************************************************* -* Copyright (c) 2009 Composent, Inc. and others. 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: -* Composent, Inc. - initial API and implementation -******************************************************************************/ +/**************************************************************************** + * Copyright (c) 2009 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * Contributors: + * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteservice.client; import java.util.ArrayList; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/client/RemoteCallParameterFactory.java b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/client/RemoteCallParameterFactory.java index dfaee5de2..e64f6eb3c 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/client/RemoteCallParameterFactory.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/client/RemoteCallParameterFactory.java @@ -1,12 +1,15 @@ -/******************************************************************************* -* Copyright (c) 2009 Composent, Inc. and others. 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: -* Composent, Inc. - initial API and implementation -******************************************************************************/ +/**************************************************************************** + * Copyright (c) 2009 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * Contributors: + * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteservice.client; import java.util.*; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/client/RemoteCallable.java b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/client/RemoteCallable.java index bc35ec542..c77efd129 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/client/RemoteCallable.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/client/RemoteCallable.java @@ -1,12 +1,15 @@ -/******************************************************************************* -* Copyright (c) 2009 Composent, Inc. and others. 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: -* Composent, Inc. - initial API and implementation -******************************************************************************/ +/**************************************************************************** + * Copyright (c) 2009 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * Contributors: + * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteservice.client; import java.util.Arrays; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/client/RemoteCallableFactory.java b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/client/RemoteCallableFactory.java index 8cf1fbea4..01ab65a67 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/client/RemoteCallableFactory.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/client/RemoteCallableFactory.java @@ -1,12 +1,15 @@ -/******************************************************************************* -* Copyright (c) 2009 Composent, Inc. and others. 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: -* Composent, Inc. - initial API and implementation -******************************************************************************/ +/**************************************************************************** + * Copyright (c) 2009 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * Contributors: + * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteservice.client; import org.eclipse.ecf.remoteservice.IRemoteCall; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/client/RemoteServiceClientReference.java b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/client/RemoteServiceClientReference.java index 8e8d27c7f..ab055c572 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/client/RemoteServiceClientReference.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/client/RemoteServiceClientReference.java @@ -1,12 +1,15 @@ -/******************************************************************************* - * Copyright (c) 2009 EclipseSource and others. 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 +/**************************************************************************** + * Copyright (c) 2009 EclipseSource and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * EclipseSource - initial API and implementation - *******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteservice.client; import org.eclipse.ecf.core.identity.ID; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/client/RemoteServiceClientRegistration.java b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/client/RemoteServiceClientRegistration.java index 786d76866..25fd46bdd 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/client/RemoteServiceClientRegistration.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/client/RemoteServiceClientRegistration.java @@ -1,12 +1,15 @@ -/******************************************************************************* - * Copyright (c) 2009 EclipseSource and others. 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 +/**************************************************************************** + * Copyright (c) 2009 EclipseSource and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * EclipseSource - initial API and implementation - *******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteservice.client; import java.util.Dictionary; @@ -104,6 +107,7 @@ public class RemoteServiceClientRegistration implements IRemoteServiceRegistrati public void unregister() { registry.unregisterRegistration(this); + this.classLoader = null; } protected IRemoteCallable findDefaultRemoteCallable(String methodToFind) { @@ -147,4 +151,16 @@ public class RemoteServiceClientRegistration implements IRemoteServiceRegistrati return findRemoteCallable(remoteCall); } + private ClassLoader classLoader = null; + + public ClassLoader getClassLoader() { + return this.classLoader; + } + + /** + * @since 8.14 + */ + protected void setClassLoader(ClassLoader cl) { + this.classLoader = cl; + } } diff --git a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/client/RemoteServiceClientRegistry.java b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/client/RemoteServiceClientRegistry.java index 8e05886da..45690e3d9 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/client/RemoteServiceClientRegistry.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/client/RemoteServiceClientRegistry.java @@ -1,13 +1,16 @@ -/******************************************************************************* - * Copyright (c) 2009 EclipseSource and others. 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 +/**************************************************************************** + * Copyright (c) 2009 EclipseSource and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * EclipseSource - initial API and implementation * Composent, Inc - Simplifications -*******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteservice.client; import java.io.Serializable; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/client/StringParameterSerializer.java b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/client/StringParameterSerializer.java index c17ae276c..41703e18d 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/client/StringParameterSerializer.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/client/StringParameterSerializer.java @@ -1,12 +1,15 @@ -/******************************************************************************* -* Copyright (c) 2009 Composent, Inc. and others. 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: -* Composent, Inc. - initial API and implementation -******************************************************************************/ +/**************************************************************************** + * Copyright (c) 2009 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * Contributors: + * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteservice.client; import java.io.NotSerializableException; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/events/IRemoteCallCompleteEvent.java b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/events/IRemoteCallCompleteEvent.java index d59b80831..05e713085 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/events/IRemoteCallCompleteEvent.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/events/IRemoteCallCompleteEvent.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004, 2009 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.remoteservice.events; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/events/IRemoteCallEvent.java b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/events/IRemoteCallEvent.java index 46de4c913..cc137cc8b 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/events/IRemoteCallEvent.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/events/IRemoteCallEvent.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004, 2009 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.remoteservice.events; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/events/IRemoteCallStartEvent.java b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/events/IRemoteCallStartEvent.java index dd3f334eb..bf474a4df 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/events/IRemoteCallStartEvent.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/events/IRemoteCallStartEvent.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004, 2009 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.remoteservice.events; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/events/IRemoteServiceChangedEvent.java b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/events/IRemoteServiceChangedEvent.java index 32b4e9203..64f3efe65 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/events/IRemoteServiceChangedEvent.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/events/IRemoteServiceChangedEvent.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004, 2009 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.remoteservice.events; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/events/IRemoteServiceEvent.java b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/events/IRemoteServiceEvent.java index 40fa00884..fde9b81c0 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/events/IRemoteServiceEvent.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/events/IRemoteServiceEvent.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004, 2009 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.remoteservice.events; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/events/IRemoteServiceRegisteredEvent.java b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/events/IRemoteServiceRegisteredEvent.java index f17f1bbe8..f66f98285 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/events/IRemoteServiceRegisteredEvent.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/events/IRemoteServiceRegisteredEvent.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004, 2009 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.remoteservice.events; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/events/IRemoteServiceUnregisteredEvent.java b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/events/IRemoteServiceUnregisteredEvent.java index a366f46f7..742a2ff05 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/events/IRemoteServiceUnregisteredEvent.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/events/IRemoteServiceUnregisteredEvent.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004, 2009 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.remoteservice.events; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/provider/AdapterConfig.java b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/provider/AdapterConfig.java index 77cd7c2d3..1abe5694f 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/provider/AdapterConfig.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/provider/AdapterConfig.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2015 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2015 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteservice.provider; import org.eclipse.core.runtime.Assert; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/provider/IRemoteServiceDistributionProvider.java b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/provider/IRemoteServiceDistributionProvider.java index 312222951..ad77ac4b8 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/provider/IRemoteServiceDistributionProvider.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/provider/IRemoteServiceDistributionProvider.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2015 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2015 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteservice.provider; import java.util.Dictionary; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/provider/PeerRemoteServiceContainerInstantiator.java b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/provider/PeerRemoteServiceContainerInstantiator.java index 1c12b7407..b601caa73 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/provider/PeerRemoteServiceContainerInstantiator.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/provider/PeerRemoteServiceContainerInstantiator.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2016 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2016 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteservice.provider; import java.util.*; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/provider/RemoteServiceContainerInstantiator.java b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/provider/RemoteServiceContainerInstantiator.java index 131034d72..74ed18bdf 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/provider/RemoteServiceContainerInstantiator.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/provider/RemoteServiceContainerInstantiator.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2016 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2016 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteservice.provider; import java.net.URI; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/provider/RemoteServiceDistributionProvider.java b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/provider/RemoteServiceDistributionProvider.java index e3c937bfa..426fb9201 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/provider/RemoteServiceDistributionProvider.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/provider/RemoteServiceDistributionProvider.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2015 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2015 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteservice.provider; import java.util.*; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/util/AsyncUtil.java b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/util/AsyncUtil.java index 77f64fb2c..e2695f412 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/util/AsyncUtil.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/util/AsyncUtil.java @@ -1,12 +1,15 @@ -/******************************************************************************* -* Copyright (c) 2018 Composent, Inc. and others. 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: -* Composent, Inc. - initial API and implementation -******************************************************************************/ +/**************************************************************************** + * Copyright (c) 2018 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * Contributors: + * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteservice.util; import java.util.Arrays; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/util/EndpointDescriptionPropertiesUtil.java b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/util/EndpointDescriptionPropertiesUtil.java index 587f812d5..47877c53d 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/util/EndpointDescriptionPropertiesUtil.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/util/EndpointDescriptionPropertiesUtil.java @@ -1,12 +1,15 @@ -/******************************************************************************* -* Copyright (c) 2016 Composent, Inc. and others. 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: -* Composent, Inc. - initial API and implementation -******************************************************************************/ +/**************************************************************************** + * Copyright (c) 2016 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * Contributors: + * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteservice.util; import java.util.*; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/util/IDUtil.java b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/util/IDUtil.java index 04f790f96..f01fa9dc3 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/util/IDUtil.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/util/IDUtil.java @@ -1,12 +1,15 @@ -/******************************************************************************* -* Copyright (c) 2016 Composent, Inc. and others. 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: -* Composent, Inc. - initial API and implementation -******************************************************************************/ +/**************************************************************************** + * Copyright (c) 2016 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * Contributors: + * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteservice.util; import java.util.Iterator; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/util/ObjectSerializationUtil.java b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/util/ObjectSerializationUtil.java index 148274883..fdbc345d3 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/util/ObjectSerializationUtil.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/util/ObjectSerializationUtil.java @@ -1,12 +1,15 @@ -/******************************************************************************* -* Copyright (c) 2013 Composent, Inc. and others. 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: -* Composent, Inc. - initial API and implementation -******************************************************************************/ +/**************************************************************************** + * Copyright (c) 2013 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * Contributors: + * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteservice.util; import java.io.*; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/util/RemoteCallMethod.java b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/util/RemoteCallMethod.java index e0f8d0a38..98836f731 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/util/RemoteCallMethod.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/util/RemoteCallMethod.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2008 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.remoteservice.util; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/util/RemoteFilterImpl.java b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/util/RemoteFilterImpl.java index aa48e2ba4..753574cc2 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/util/RemoteFilterImpl.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/util/RemoteFilterImpl.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2008 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.remoteservice.util; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/util/StreamUtil.java b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/util/StreamUtil.java index f983be943..3f862b9d9 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/util/StreamUtil.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/util/StreamUtil.java @@ -1,12 +1,15 @@ -/******************************************************************************* -* Copyright (c) 2013 Composent, Inc. and others. 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: -* Composent, Inc. - initial API and implementation -******************************************************************************/ +/**************************************************************************** + * Copyright (c) 2013 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * Contributors: + * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.remoteservice.util; import java.io.*; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/util/tracker/IRemoteServiceTrackerCustomizer.java b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/util/tracker/IRemoteServiceTrackerCustomizer.java index a2731fe8a..b0a464b98 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/util/tracker/IRemoteServiceTrackerCustomizer.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/util/tracker/IRemoteServiceTrackerCustomizer.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004, 2009 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.remoteservice.util.tracker; diff --git a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/util/tracker/RemoteServiceTracker.java b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/util/tracker/RemoteServiceTracker.java index 64cce1c4b..bb509f136 100644 --- a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/util/tracker/RemoteServiceTracker.java +++ b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/util/tracker/RemoteServiceTracker.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2008 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.remoteservice.util.tracker; diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/.settings/org.eclipse.jdt.core.prefs b/framework/bundles/org.eclipse.ecf.sharedobject/.settings/org.eclipse.jdt.core.prefs index 0f46ca37c..846e8eb13 100644 --- a/framework/bundles/org.eclipse.ecf.sharedobject/.settings/org.eclipse.jdt.core.prefs +++ b/framework/bundles/org.eclipse.ecf.sharedobject/.settings/org.eclipse.jdt.core.prefs @@ -6,6 +6,15 @@ 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.annotation.inheritNullAnnotations=disabled +org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore +org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull +org.eclipse.jdt.core.compiler.annotation.nonnull.secondary= +org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault +org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary= +org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable +org.eclipse.jdt.core.compiler.annotation.nullable.secondary= +org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve @@ -15,17 +24,20 @@ 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.APILeak=warning +org.eclipse.jdt.core.compiler.problem.annotatedTypeArgumentToUnannotated=info org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.autoboxing=ignore org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning org.eclipse.jdt.core.compiler.problem.deadCode=warning -org.eclipse.jdt.core.compiler.problem.deprecation=warning +org.eclipse.jdt.core.compiler.problem.deprecation=ignore org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore org.eclipse.jdt.core.compiler.problem.emptyStatement=warning org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled org.eclipse.jdt.core.compiler.problem.fieldHiding=warning @@ -41,7 +53,9 @@ 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.missingDefaultCase=ignore org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore +org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled @@ -56,13 +70,22 @@ org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignor 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.nonnullParameterAnnotationDropped=warning +org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning +org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error org.eclipse.jdt.core.compiler.problem.nullReference=warning +org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error +org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore +org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore +org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore +org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore +org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore @@ -70,19 +93,28 @@ org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled +org.eclipse.jdt.core.compiler.problem.suppressWarningsNotFullyAnalysed=info +org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning +org.eclipse.jdt.core.compiler.problem.terminalDeprecation=warning org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled -org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning +org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore +org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning +org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=warning +org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled +org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=info org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning -org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning +org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore +org.eclipse.jdt.core.compiler.problem.unstableAutoModuleName=warning org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=enabled +org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedImport=error org.eclipse.jdt.core.compiler.problem.unusedLabel=warning org.eclipse.jdt.core.compiler.problem.unusedLocal=warning @@ -92,7 +124,8 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference= org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=enabled org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=enabled org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning -org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning +org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore +org.eclipse.jdt.core.compiler.problem.unusedWarningToken=ignore org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.source=1.5 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.sharedobject/META-INF/MANIFEST.MF index f67070605..85dbb388a 100644 --- a/framework/bundles/org.eclipse.ecf.sharedobject/META-INF/MANIFEST.MF +++ b/framework/bundles/org.eclipse.ecf.sharedobject/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-Name: %plugin.name Bundle-SymbolicName: org.eclipse.ecf.sharedobject;singleton:=true Automatic-Module-Name: org.eclipse.ecf.sharedobject -Bundle-Version: 2.6.0.qualifier +Bundle-Version: 2.6.200.qualifier Bundle-Activator: org.eclipse.ecf.internal.core.sharedobject.Activator Bundle-Localization: plugin Bundle-Vendor: %plugin.provider diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/OSGI-INF/permissions.perm b/framework/bundles/org.eclipse.ecf.sharedobject/OSGI-INF/permissions.perm new file mode 100644 index 000000000..f15dbd4c0 --- /dev/null +++ b/framework/bundles/org.eclipse.ecf.sharedobject/OSGI-INF/permissions.perm @@ -0,0 +1,32 @@ +# Requires +(org.osgi.framework.BundlePermission "org.eclipse.equinox.common" "require") +(org.osgi.framework.BundlePermission "org.eclipse.equinox.registry" "require") +(org.osgi.framework.BundlePermission "org.eclipse.ecf" "require") +(org.osgi.framework.BundlePermission "org.eclipse.ecf.sharedobject" "provide") +# Imports +(org.osgi.framework.PackagePermission "org.eclipse.equinox.concurrent.future" "import") +(org.osgi.framework.PackagePermission "org.osgi.framework" "import") +(org.osgi.framework.PackagePermission "org.osgi.service.log" "import") +(org.osgi.framework.PackagePermission "org.osgi.util.tracker" "import") +# Exports +(org.osgi.framework.PackagePermission "org.eclipse.ecf.core.sharedobject" "export") +(org.osgi.framework.PackagePermission "org.eclipse.ecf.core.sharedobject.events" "export") +(org.osgi.framework.PackagePermission "org.eclipse.ecf.core.sharedobject.model" "export") +(org.osgi.framework.PackagePermission "org.eclipse.ecf.core.sharedobject.provider" "export") +(org.osgi.framework.PackagePermission "org.eclipse.ecf.core.sharedobject.security" "export") +(org.osgi.framework.PackagePermission "org.eclipse.ecf.core.sharedobject.util" "export") +(org.osgi.framework.PackagePermission "org.eclipse.ecf.core.user" "export") +(org.osgi.framework.PackagePermission "org.eclipse.ecf.core.util" "export") +(org.osgi.framework.PackagePermission "org.eclipse.ecf.core.util.reflection" "export") + +# services +(org.osgi.framework.ServicePermission "*" "get,register") +# +(java.io.SerializablePermission "enableSubclassImplementation") +(java.io.SerializablePermission "enableSubstitution") +(org.osgi.framework.AdaptPermission "*" "adapt") +(org.osgi.framework.AdminPermission "*" "*") +(org.eclipse.equinox.log.LogPermission "*" "log") +(java.util.PropertyPermission "*" "read") +(java.lang.RuntimePermission "*") +(java.lang.reflect.ReflectPermission "suppressAccessChecks") diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/about.html b/framework/bundles/org.eclipse.ecf.sharedobject/about.html index 4c79781a5..9f1dc0dd5 100644 --- a/framework/bundles/org.eclipse.ecf.sharedobject/about.html +++ b/framework/bundles/org.eclipse.ecf.sharedobject/about.html @@ -22,7 +22,7 @@ being redistributed by another party ("Redistributor") and different t apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise indicated below, the terms and conditions of the EPL still apply to any source code in the Content -and such source code may be obtained at <a href="/">http://www.eclipse.org</a>.</p> +and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p> </body> </html>
\ No newline at end of file diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/build.properties b/framework/bundles/org.eclipse.ecf.sharedobject/build.properties index 6d5e0f021..d75346825 100644 --- a/framework/bundles/org.eclipse.ecf.sharedobject/build.properties +++ b/framework/bundles/org.eclipse.ecf.sharedobject/build.properties @@ -4,7 +4,8 @@ bin.includes = .,\ plugin.xml,\ about.html,\ plugin.properties,\ - schema/ + schema/,\ + OSGI-INF/ src.includes = about.html,\ schema/ jars.compile.order = . diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/plugin.properties b/framework/bundles/org.eclipse.ecf.sharedobject/plugin.properties index 60429583b..9202e791f 100644 --- a/framework/bundles/org.eclipse.ecf.sharedobject/plugin.properties +++ b/framework/bundles/org.eclipse.ecf.sharedobject/plugin.properties @@ -1,10 +1,11 @@ ############################################################################ # Copyright (c) 2007 Composent Inc., IBM Corp. and others. -# 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 # +# This program and the accompanying materials are made +# available under the terms of the Eclipse Public License 2.0 +# which is available at https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 ############################################################################ plugin.name=ECF SharedObject API plugin.provider=Eclipse.org - ECF diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/pom.xml b/framework/bundles/org.eclipse.ecf.sharedobject/pom.xml index 6178b224e..82fc0be9a 100644 --- a/framework/bundles/org.eclipse.ecf.sharedobject/pom.xml +++ b/framework/bundles/org.eclipse.ecf.sharedobject/pom.xml @@ -10,6 +10,6 @@ </parent> <groupId>org.eclipse.ecf</groupId> <artifactId>org.eclipse.ecf.sharedobject</artifactId> - <version>2.6.0-SNAPSHOT</version> + <version>2.6.200-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/schema/sharedObjectFactory.exsd b/framework/bundles/org.eclipse.ecf.sharedobject/schema/sharedObjectFactory.exsd index 5dca5be47..625718b11 100644 --- a/framework/bundles/org.eclipse.ecf.sharedobject/schema/sharedObjectFactory.exsd +++ b/framework/bundles/org.eclipse.ecf.sharedobject/schema/sharedObjectFactory.exsd @@ -1,6 +1,6 @@ <?xml version='1.0' encoding='UTF-8'?> <!-- Schema file written by PDE --> -<schema targetNamespace="org.eclipse.ecf"> +<schema targetNamespace="org.eclipse.ecf" xmlns="http://www.w3.org/2001/XMLSchema"> <annotation> <appInfo> <meta.schema plugin="org.eclipse.ecf" id="sharedObjectFactory" name="ECF Shared Object Factory"/> @@ -12,45 +12,49 @@ extensions must implement: <pre> public interface ISharedObjectInstantiator { - /** - * Create instance of ISharedObject. This is the interface that plugin - * implementations must implement for the sharedObjectFactory extension - * point. The caller may optionally specify both argument types and - * arguments that will be passed into this method (and therefore to the - * provider implementation implementing this method). For example: - * <p> - * </p> - * <p> - * <b> - * SharedObjectFactory.getDefault().createSharedObject("foosharedobject",new - * String [] { java.lang.String }, new Object { "hello" });</b> - * </p> - * <p> - * </p> - * - * @param typeDescription - * the SharedObjectTypeDescription associated with the registered - * shared object provider implementation plugin - * @param args - * arguments specified by the caller. May be null if no arguments - * are passed in by caller to - * SharedObjectFactory.getDefault().createSharedObject(...) - * @return ISharedObject instance. The provider implementation must return a - * valid object implementing ISharedObject OR throw a - * SharedObjectCreateException - * @throws SharedObjectCreateException - * if shared object instance cannot be created - */ - public ISharedObject createInstance( - SharedObjectTypeDescription typeDescription, Object[] args) - throws SharedObjectCreateException; + /** + * Create instance of ISharedObject. This is the interface that plugin + * implementations must implement for the sharedObjectFactory extension + * point. The caller may optionally specify both argument types and + * arguments that will be passed into this method (and therefore to the + * provider implementation implementing this method). For example: + * <p> + * </p> + * <p> + * <b> + * SharedObjectFactory.getDefault().createSharedObject("foosharedobject",new + * String [] { java.lang.String }, new Object { "hello" });</b> + * </p> + * <p> + * </p> + * + * @param typeDescription + * the SharedObjectTypeDescription associated with the registered + * shared object provider implementation plugin + * @param args + * arguments specified by the caller. May be null if no arguments + * are passed in by caller to + * SharedObjectFactory.getDefault().createSharedObject(...) + * @return ISharedObject instance. The provider implementation must return a + * valid object implementing ISharedObject OR throw a + * SharedObjectCreateException + * @throws SharedObjectCreateException + * if shared object instance cannot be created + */ + public ISharedObject createInstance( + SharedObjectTypeDescription typeDescription, Object[] args) + throws SharedObjectCreateException; } </pre> - </documentation> </annotation> <element name="extension"> + <annotation> + <appInfo> + <meta.element /> + </appInfo> + </annotation> <complexType> <sequence> <element ref="sharedObjectFactory" minOccurs="1" maxOccurs="unbounded"/> @@ -165,10 +169,10 @@ and the TestSharedObjectInstantiator is defined: <pre> public class TestSharedObjectInstantiator implements ISharedObjectInstantiator { - public ISharedObject createInstance(SharedObjectTypeDescription description, Object[] args) throws SharedObjectCreateException { - System.out.println("createInstance("+description+","+((args==null)?"null":Arrays.asList(args).toString())); - return new TestSharedObject(); - } + public ISharedObject createInstance(SharedObjectTypeDescription description, Object[] args) throws SharedObjectCreateException { + System.out.println("createInstance("+description+","+((args==null)?"null":Arrays.asList(args).toString())); + return new TestSharedObject(); + } } </pre> @@ -179,9 +183,6 @@ Clients may use the extension via calls such as: <pre> ISharedObject obj = SharedObjectFactory.getDefault().createSharedObject("ecf.test.sharedobjectfactory"); </pre> - - - </documentation> </annotation> @@ -197,145 +198,135 @@ Here is the <b>org.eclipse.ecf.core.sharedobject.ISharedObjectFactory</ <pre> public interface ISharedObjectFactory { - /* - * Add a SharedObjectTypeDescription to the set of known - * SharedObjectTypeDescriptions. - * - * @param scd the SharedObjectTypeDescription to add to this factory @return - * SharedObjectTypeDescription the old description of the same name, null if - * none found - */ - public SharedObjectTypeDescription addDescription( - SharedObjectTypeDescription description); - - /** - * Get a collection of the SharedObjectTypeDescriptions currently known to - * this factory. This allows clients to query the factory to determine what - * if any other SharedObjectTypeDescriptions are currently registered with - * the factory, and if so, what they are. - * - * @return List of SharedObjectTypeDescription instances. Will not be null. - */ - public List getDescriptions(); - - /** - * Check to see if a given named description is already contained by this - * factory - * - * @param description - * the SharedObjectTypeDescription to look for - * @return true if description is already known to factory, false otherwise - */ - public boolean containsDescription(SharedObjectTypeDescription description); - - /** - * Get the known SharedObjectTypeDescription given it's name. - * - * @param name - * @return SharedObjectTypeDescription found. Null if description not found. - * @throws SharedObjectCreateException - */ - public SharedObjectTypeDescription getDescriptionByName(String name) - throws SharedObjectCreateException; - - /** - * Create ISharedObject instance. Given a SharedObjectTypeDescription - * object, a String [] of argument types, and an Object [] of parameters, - * this method will - * <p> - * <ul> - * <li>lookup the known SharedObjectTypeDescriptions to find one of - * matching name</li> - * <li>if found, will retrieve or create an ISharedObjectInstantiator for - * that description</li> - * <li>Call the ISharedObjectInstantiator.createInstance method to return - * an instance of ISharedObject</li> - * </ul> - * - * @param typeDescription - * the SharedObjectTypeDescription to use to create the instance - * @param args - * an Object [] of arguments passed to the createInstance method - * of the ISharedObjectInstantiator - * @return a valid instance of ISharedObject. Will not be null. - * @throws SharedObjectCreateException - * if shared object cannot be created - */ - public ISharedObject createSharedObject( - SharedObjectTypeDescription typeDescription, Object[] args) - throws SharedObjectCreateException; - - /** - * Create ISharedObject instance. Given a SharedObjectTypeDescription name, - * this method will - * <p> - * <ul> - * <li>lookup the known SharedObjectTypeDescriptions to find one of - * matching name</li> - * <li>if found, will retrieve or create an ISharedObjectInstantiator for - * that description</li> - * <li>Call the ISharedObjectInstantiator.createInstance method to return - * an instance of ISharedObject</li> - * </ul> - * - * @param descriptionName - * the SharedObjectTypeDescription name to lookup - * @return a valid instance of ISharedObject. Will not be null. - * @throws SharedObjectCreateException - */ - public ISharedObject createSharedObject(String descriptionName) - throws SharedObjectCreateException; - - /** - * Create ISharedObject instance. Given a SharedObjectTypeDescription name, - * this method will - * <p> - * <ul> - * <li>lookup the known SharedObjectTypeDescriptions to find one of - * matching name</li> - * <li>if found, will retrieve or create an ISharedObjectInstantiator for - * that description</li> - * <li>Call the ISharedObjectInstantiator.createInstance method to return - * an instance of ISharedObject</li> - * </ul> - * - * @param descriptionName - * the SharedObjectTypeDescription name to lookup - * @param args - * the Object [] of arguments passed to the - * ISharedObjectInstantiator.createInstance method - * @return a valid instance of IContainer. Will not be null. - * @throws SharedObjectCreateException - */ - public ISharedObject createSharedObject(String descriptionName, - Object[] args) throws SharedObjectCreateException; - - /** - * Remove given description from set known to this factory. - * - * @param scd - * the SharedObjectTypeDescription to remove - * @return the removed SharedObjectTypeDescription, null if nothing removed - */ - public SharedObjectTypeDescription removeDescription( - SharedObjectTypeDescription scd); + /* + * Add a SharedObjectTypeDescription to the set of known + * SharedObjectTypeDescriptions. + * + * @param scd the SharedObjectTypeDescription to add to this factory @return + * SharedObjectTypeDescription the old description of the same name, null if + * none found + */ + public SharedObjectTypeDescription addDescription( + SharedObjectTypeDescription description); + + /** + * Get a collection of the SharedObjectTypeDescriptions currently known to + * this factory. This allows clients to query the factory to determine what + * if any other SharedObjectTypeDescriptions are currently registered with + * the factory, and if so, what they are. + * + * @return List of SharedObjectTypeDescription instances. Will not be null. + */ + public List getDescriptions(); + + /** + * Check to see if a given named description is already contained by this + * factory + * + * @param description + * the SharedObjectTypeDescription to look for + * @return true if description is already known to factory, false otherwise + */ + public boolean containsDescription(SharedObjectTypeDescription description); + + /** + * Get the known SharedObjectTypeDescription given it's name. + * + * @param name + * @return SharedObjectTypeDescription found. Null if description not found. + * @throws SharedObjectCreateException + */ + public SharedObjectTypeDescription getDescriptionByName(String name) + throws SharedObjectCreateException; + + /** + * Create ISharedObject instance. Given a SharedObjectTypeDescription + * object, a String [] of argument types, and an Object [] of parameters, + * this method will + * <p> + * <ul> + * <li>lookup the known SharedObjectTypeDescriptions to find one of + * matching name</li> + * <li>if found, will retrieve or create an ISharedObjectInstantiator for + * that description</li> + * <li>Call the ISharedObjectInstantiator.createInstance method to return + * an instance of ISharedObject</li> + * </ul> + * + * @param typeDescription + * the SharedObjectTypeDescription to use to create the instance + * @param args + * an Object [] of arguments passed to the createInstance method + * of the ISharedObjectInstantiator + * @return a valid instance of ISharedObject. Will not be null. + * @throws SharedObjectCreateException + * if shared object cannot be created + */ + public ISharedObject createSharedObject( + SharedObjectTypeDescription typeDescription, Object[] args) + throws SharedObjectCreateException; + + /** + * Create ISharedObject instance. Given a SharedObjectTypeDescription name, + * this method will + * <p> + * <ul> + * <li>lookup the known SharedObjectTypeDescriptions to find one of + * matching name</li> + * <li>if found, will retrieve or create an ISharedObjectInstantiator for + * that description</li> + * <li>Call the ISharedObjectInstantiator.createInstance method to return + * an instance of ISharedObject</li> + * </ul> + * + * @param descriptionName + * the SharedObjectTypeDescription name to lookup + * @return a valid instance of ISharedObject. Will not be null. + * @throws SharedObjectCreateException + */ + public ISharedObject createSharedObject(String descriptionName) + throws SharedObjectCreateException; + + /** + * Create ISharedObject instance. Given a SharedObjectTypeDescription name, + * this method will + * <p> + * <ul> + * <li>lookup the known SharedObjectTypeDescriptions to find one of + * matching name</li> + * <li>if found, will retrieve or create an ISharedObjectInstantiator for + * that description</li> + * <li>Call the ISharedObjectInstantiator.createInstance method to return + * an instance of ISharedObject</li> + * </ul> + * + * @param descriptionName + * the SharedObjectTypeDescription name to lookup + * @param args + * the Object [] of arguments passed to the + * ISharedObjectInstantiator.createInstance method + * @return a valid instance of IContainer. Will not be null. + * @throws SharedObjectCreateException + */ + public ISharedObject createSharedObject(String descriptionName, + Object[] args) throws SharedObjectCreateException; + + /** + * Remove given description from set known to this factory. + * + * @param scd + * the SharedObjectTypeDescription to remove + * @return the removed SharedObjectTypeDescription, null if nothing removed + */ + public SharedObjectTypeDescription removeDescription( + SharedObjectTypeDescription scd); } </pre> See the "Examples" page for an example usage of the extension point. - - </documentation> </annotation> - <annotation> - <appInfo> - <meta.section type="implementation"/> - </appInfo> - <documentation> - - </documentation> - </annotation> <annotation> <appInfo> @@ -343,7 +334,13 @@ See the "Examples" page for an example usage of the extension point. </appInfo> <documentation> Copyright (c) 2004 Composent, Inc. and others. -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: Composent, Inc. - initial API and implementation + +This program and the accompanying materials are made +available under the terms of the Eclipse Public License 2.0 +which is available at https://www.eclipse.org/legal/epl-2.0/ + +SPDX-License-Identifier: EPL-2.0 + </documentation> </annotation> diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/AbstractSharedObjectContainerAdapterFactory.java b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/AbstractSharedObjectContainerAdapterFactory.java index 894bf8e29..cd3cf4c37 100644 --- a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/AbstractSharedObjectContainerAdapterFactory.java +++ b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/AbstractSharedObjectContainerAdapterFactory.java @@ -1,13 +1,15 @@ -/******************************************************************************* +/**************************************************************************** * Copyright (c) 2004, 2007 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.sharedobject; import java.util.Map; diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/BaseSharedObject.java b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/BaseSharedObject.java index 1485077b8..3966fea01 100644 --- a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/BaseSharedObject.java +++ b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/BaseSharedObject.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.core.sharedobject; diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/IReplicaSharedObjectDescriptionFactory.java b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/IReplicaSharedObjectDescriptionFactory.java index db54deac9..8ff5645f5 100644 --- a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/IReplicaSharedObjectDescriptionFactory.java +++ b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/IReplicaSharedObjectDescriptionFactory.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.sharedobject; import org.eclipse.ecf.core.identity.ID; diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/ISharedObject.java b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/ISharedObject.java index 33de73988..47e78da25 100644 --- a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/ISharedObject.java +++ b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/ISharedObject.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.sharedobject; import org.eclipse.core.runtime.IAdaptable; diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/ISharedObjectConfig.java b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/ISharedObjectConfig.java index 93353a8ae..63f8809e8 100644 --- a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/ISharedObjectConfig.java +++ b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/ISharedObjectConfig.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.sharedobject; import java.util.Map; diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/ISharedObjectConnector.java b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/ISharedObjectConnector.java index 63b32dd71..1def8849e 100644 --- a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/ISharedObjectConnector.java +++ b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/ISharedObjectConnector.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.sharedobject; import org.eclipse.ecf.core.identity.ID; diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/ISharedObjectContainer.java b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/ISharedObjectContainer.java index 64a71ea28..3b95b5027 100644 --- a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/ISharedObjectContainer.java +++ b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/ISharedObjectContainer.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.sharedobject; import org.eclipse.ecf.core.IReliableContainer; diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/ISharedObjectContainerClient.java b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/ISharedObjectContainerClient.java index 582dc0fa4..2a10b727a 100644 --- a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/ISharedObjectContainerClient.java +++ b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/ISharedObjectContainerClient.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.sharedobject; import org.eclipse.ecf.core.security.IConnectInitiatorPolicy; diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/ISharedObjectContainerConfig.java b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/ISharedObjectContainerConfig.java index 0efaf3b42..f32234c43 100644 --- a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/ISharedObjectContainerConfig.java +++ b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/ISharedObjectContainerConfig.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.sharedobject; import java.util.Map; diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/ISharedObjectContainerFactory.java b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/ISharedObjectContainerFactory.java index 33b3e6b29..c78920301 100644 --- a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/ISharedObjectContainerFactory.java +++ b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/ISharedObjectContainerFactory.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.sharedobject; import org.eclipse.ecf.core.ContainerCreateException; diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/ISharedObjectContainerGroupManager.java b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/ISharedObjectContainerGroupManager.java index 2dc323c1d..7a536ccad 100644 --- a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/ISharedObjectContainerGroupManager.java +++ b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/ISharedObjectContainerGroupManager.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.sharedobject; import java.io.Serializable; diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/ISharedObjectContainerTransaction.java b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/ISharedObjectContainerTransaction.java index fac54c844..1bf84df80 100644 --- a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/ISharedObjectContainerTransaction.java +++ b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/ISharedObjectContainerTransaction.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.sharedobject; /** diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/ISharedObjectContext.java b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/ISharedObjectContext.java index 1f7444325..20353ebfb 100644 --- a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/ISharedObjectContext.java +++ b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/ISharedObjectContext.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.sharedobject; import java.io.IOException; diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/ISharedObjectFactory.java b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/ISharedObjectFactory.java index 01c8a0488..2342c286a 100644 --- a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/ISharedObjectFactory.java +++ b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/ISharedObjectFactory.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.sharedobject; import java.util.List; diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/ISharedObjectManager.java b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/ISharedObjectManager.java index dc5716d93..7643be347 100644 --- a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/ISharedObjectManager.java +++ b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/ISharedObjectManager.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.sharedobject; import java.util.List; diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/ISharedObjectTransactionConfig.java b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/ISharedObjectTransactionConfig.java index c8f2bebe8..1af44ce3f 100644 --- a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/ISharedObjectTransactionConfig.java +++ b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/ISharedObjectTransactionConfig.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.core.sharedobject; diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/ISharedObjectTransactionParticipantsFilter.java b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/ISharedObjectTransactionParticipantsFilter.java index e5a9597c6..423b6d676 100644 --- a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/ISharedObjectTransactionParticipantsFilter.java +++ b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/ISharedObjectTransactionParticipantsFilter.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.core.sharedobject; diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/OptimisticSharedObject.java b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/OptimisticSharedObject.java index 8fdaea4b6..65c3470a4 100644 --- a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/OptimisticSharedObject.java +++ b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/OptimisticSharedObject.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.core.sharedobject; diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/ReplicaSharedObjectDescription.java b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/ReplicaSharedObjectDescription.java index 082ed3d5c..20accddd3 100644 --- a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/ReplicaSharedObjectDescription.java +++ b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/ReplicaSharedObjectDescription.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.sharedobject; import java.io.Serializable; diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/SharedObjectAddAbortException.java b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/SharedObjectAddAbortException.java index c5ae770e9..e0d82147a 100644 --- a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/SharedObjectAddAbortException.java +++ b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/SharedObjectAddAbortException.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.sharedobject; import java.util.List; diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/SharedObjectAddException.java b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/SharedObjectAddException.java index 63b10c4aa..ef70dc0eb 100644 --- a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/SharedObjectAddException.java +++ b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/SharedObjectAddException.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.sharedobject; import org.eclipse.core.runtime.IStatus; diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/SharedObjectConnectException.java b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/SharedObjectConnectException.java index 236370c5a..434ec3bee 100644 --- a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/SharedObjectConnectException.java +++ b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/SharedObjectConnectException.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.sharedobject; import org.eclipse.core.runtime.IStatus; diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/SharedObjectContainerFactory.java b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/SharedObjectContainerFactory.java index 273f63f04..667add8b5 100644 --- a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/SharedObjectContainerFactory.java +++ b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/SharedObjectContainerFactory.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.sharedobject; import org.eclipse.ecf.core.*; diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/SharedObjectCreateException.java b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/SharedObjectCreateException.java index b8e182972..50a0615d8 100644 --- a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/SharedObjectCreateException.java +++ b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/SharedObjectCreateException.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.sharedobject; import org.eclipse.core.runtime.IStatus; diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/SharedObjectDescription.java b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/SharedObjectDescription.java index f935deb24..23a088f7b 100644 --- a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/SharedObjectDescription.java +++ b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/SharedObjectDescription.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.sharedobject; import java.io.Serializable; diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/SharedObjectDisconnectException.java b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/SharedObjectDisconnectException.java index 7e946adb5..2c85d00ea 100644 --- a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/SharedObjectDisconnectException.java +++ b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/SharedObjectDisconnectException.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.sharedobject; import org.eclipse.core.runtime.IStatus; diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/SharedObjectFactory.java b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/SharedObjectFactory.java index 1d06bcbb3..e66458947 100644 --- a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/SharedObjectFactory.java +++ b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/SharedObjectFactory.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.sharedobject; import java.util.*; diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/SharedObjectInitException.java b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/SharedObjectInitException.java index b2e3ec18b..f21035e9c 100644 --- a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/SharedObjectInitException.java +++ b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/SharedObjectInitException.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.sharedobject; import org.eclipse.core.runtime.IStatus; diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/SharedObjectMsg.java b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/SharedObjectMsg.java index bffab89b2..42d11246b 100644 --- a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/SharedObjectMsg.java +++ b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/SharedObjectMsg.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.core.sharedobject; diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/SharedObjectMsgEvent.java b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/SharedObjectMsgEvent.java index 3f5c18b42..57f6b871c 100644 --- a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/SharedObjectMsgEvent.java +++ b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/SharedObjectMsgEvent.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.core.sharedobject; diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/SharedObjectMsgEventProcessor.java b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/SharedObjectMsgEventProcessor.java index 9200dce94..06aa7054b 100644 --- a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/SharedObjectMsgEventProcessor.java +++ b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/SharedObjectMsgEventProcessor.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.core.sharedobject; diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/SharedObjectTypeDescription.java b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/SharedObjectTypeDescription.java index 5ddf84192..c2a37b65f 100644 --- a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/SharedObjectTypeDescription.java +++ b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/SharedObjectTypeDescription.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.sharedobject; import java.io.Serializable; diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/TransactionSharedObject.java b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/TransactionSharedObject.java index eb84c3f23..19189f09c 100644 --- a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/TransactionSharedObject.java +++ b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/TransactionSharedObject.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.core.sharedobject; diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/TransactionSharedObjectConfiguration.java b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/TransactionSharedObjectConfiguration.java index ee88c53f8..e31c04d4d 100644 --- a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/TransactionSharedObjectConfiguration.java +++ b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/TransactionSharedObjectConfiguration.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.core.sharedobject; diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/TwoPhaseCommitEventProcessor.java b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/TwoPhaseCommitEventProcessor.java index 08b6d2557..b564e53f7 100644 --- a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/TwoPhaseCommitEventProcessor.java +++ b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/TwoPhaseCommitEventProcessor.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.core.sharedobject; diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/ContainerSharedObjectMessageReceivingEvent.java b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/ContainerSharedObjectMessageReceivingEvent.java index 1dda0fc9e..30cf7fc47 100644 --- a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/ContainerSharedObjectMessageReceivingEvent.java +++ b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/ContainerSharedObjectMessageReceivingEvent.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.core.sharedobject.events; diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/ContainerSharedObjectMessageSendingEvent.java b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/ContainerSharedObjectMessageSendingEvent.java index 20640ad12..fd9f01a1a 100644 --- a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/ContainerSharedObjectMessageSendingEvent.java +++ b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/ContainerSharedObjectMessageSendingEvent.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.core.sharedobject.events; diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/IContainerSharedObjectMessageReceivingEvent.java b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/IContainerSharedObjectMessageReceivingEvent.java index 98b44095c..4126df082 100644 --- a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/IContainerSharedObjectMessageReceivingEvent.java +++ b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/IContainerSharedObjectMessageReceivingEvent.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.core.sharedobject.events; diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/IContainerSharedObjectMessageSendingEvent.java b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/IContainerSharedObjectMessageSendingEvent.java index 843d9e996..7294b2bab 100644 --- a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/IContainerSharedObjectMessageSendingEvent.java +++ b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/IContainerSharedObjectMessageSendingEvent.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.core.sharedobject.events; diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/ISharedObjectActivatedEvent.java b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/ISharedObjectActivatedEvent.java index 14c37e9ba..b93f74efb 100644 --- a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/ISharedObjectActivatedEvent.java +++ b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/ISharedObjectActivatedEvent.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.sharedobject.events; import org.eclipse.ecf.core.events.IContainerEvent; diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/ISharedObjectCallEvent.java b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/ISharedObjectCallEvent.java index c1e4e49dc..a8a8a4c7d 100644 --- a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/ISharedObjectCallEvent.java +++ b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/ISharedObjectCallEvent.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.sharedobject.events; import org.eclipse.equinox.concurrent.future.IFuture; diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/ISharedObjectCommitEvent.java b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/ISharedObjectCommitEvent.java index 697a1b628..cc737735e 100644 --- a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/ISharedObjectCommitEvent.java +++ b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/ISharedObjectCommitEvent.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.sharedobject.events; public interface ISharedObjectCommitEvent extends ISharedObjectEvent { diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/ISharedObjectCreateResponseEvent.java b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/ISharedObjectCreateResponseEvent.java index f5035bbe3..51441bc2b 100644 --- a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/ISharedObjectCreateResponseEvent.java +++ b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/ISharedObjectCreateResponseEvent.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.sharedobject.events; public interface ISharedObjectCreateResponseEvent extends diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/ISharedObjectDeactivatedEvent.java b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/ISharedObjectDeactivatedEvent.java index 112fcdefc..d331cb7aa 100644 --- a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/ISharedObjectDeactivatedEvent.java +++ b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/ISharedObjectDeactivatedEvent.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.sharedobject.events; import org.eclipse.ecf.core.events.IContainerEvent; diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/ISharedObjectEvent.java b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/ISharedObjectEvent.java index 16dc3ce2e..638d576d7 100644 --- a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/ISharedObjectEvent.java +++ b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/ISharedObjectEvent.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.sharedobject.events; import org.eclipse.ecf.core.identity.ID; diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/ISharedObjectManagerConnectionEvent.java b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/ISharedObjectManagerConnectionEvent.java index c952f8931..5bcc581f5 100644 --- a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/ISharedObjectManagerConnectionEvent.java +++ b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/ISharedObjectManagerConnectionEvent.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.sharedobject.events; import org.eclipse.ecf.core.sharedobject.ISharedObjectConnector; diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/ISharedObjectManagerEvent.java b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/ISharedObjectManagerEvent.java index 3063eb825..f06c218ec 100644 --- a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/ISharedObjectManagerEvent.java +++ b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/ISharedObjectManagerEvent.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.sharedobject.events; import org.eclipse.ecf.core.events.IContainerEvent; diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/ISharedObjectMessageEvent.java b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/ISharedObjectMessageEvent.java index a66ea811a..c5af68cbe 100644 --- a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/ISharedObjectMessageEvent.java +++ b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/ISharedObjectMessageEvent.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.sharedobject.events; import org.eclipse.ecf.core.identity.ID; diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/ISharedObjectMessageListener.java b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/ISharedObjectMessageListener.java index 4b785fbeb..b00f7407f 100644 --- a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/ISharedObjectMessageListener.java +++ b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/ISharedObjectMessageListener.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.core.sharedobject.events; diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/RemoteSharedObjectCreateResponseEvent.java b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/RemoteSharedObjectCreateResponseEvent.java index 5691bdf4c..ae56b5bed 100644 --- a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/RemoteSharedObjectCreateResponseEvent.java +++ b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/RemoteSharedObjectCreateResponseEvent.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.sharedobject.events; import org.eclipse.ecf.core.identity.ID; diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/RemoteSharedObjectEvent.java b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/RemoteSharedObjectEvent.java index 7cd537b7d..ee011c4c2 100644 --- a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/RemoteSharedObjectEvent.java +++ b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/RemoteSharedObjectEvent.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.sharedobject.events; import java.io.Serializable; diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/SharedObjectActivatedEvent.java b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/SharedObjectActivatedEvent.java index 32cd41637..7c90dd3fb 100644 --- a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/SharedObjectActivatedEvent.java +++ b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/SharedObjectActivatedEvent.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.sharedobject.events; import org.eclipse.ecf.core.identity.ID; diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/SharedObjectCallEvent.java b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/SharedObjectCallEvent.java index 3eddb835e..ea84e1477 100644 --- a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/SharedObjectCallEvent.java +++ b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/SharedObjectCallEvent.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.core.sharedobject.events; diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/SharedObjectCommitEvent.java b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/SharedObjectCommitEvent.java index 55c22faa8..fd12a7a3f 100644 --- a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/SharedObjectCommitEvent.java +++ b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/SharedObjectCommitEvent.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.sharedobject.events; import java.io.Serializable; diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/SharedObjectDeactivatedEvent.java b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/SharedObjectDeactivatedEvent.java index e36873b62..737abdb20 100644 --- a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/SharedObjectDeactivatedEvent.java +++ b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/SharedObjectDeactivatedEvent.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.sharedobject.events; import org.eclipse.ecf.core.identity.ID; diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/SharedObjectManagerAddEvent.java b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/SharedObjectManagerAddEvent.java index 452a83410..057202eb7 100644 --- a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/SharedObjectManagerAddEvent.java +++ b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/SharedObjectManagerAddEvent.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.sharedobject.events; import org.eclipse.ecf.core.identity.ID; diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/SharedObjectManagerConnectEvent.java b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/SharedObjectManagerConnectEvent.java index 95de775c2..cf0c25ccd 100644 --- a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/SharedObjectManagerConnectEvent.java +++ b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/SharedObjectManagerConnectEvent.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.sharedobject.events; import org.eclipse.ecf.core.identity.ID; diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/SharedObjectManagerCreateEvent.java b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/SharedObjectManagerCreateEvent.java index 46e4dd17c..8dc5fdd53 100644 --- a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/SharedObjectManagerCreateEvent.java +++ b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/SharedObjectManagerCreateEvent.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.sharedobject.events; import org.eclipse.ecf.core.identity.ID; diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/SharedObjectManagerDisconnectEvent.java b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/SharedObjectManagerDisconnectEvent.java index 44ad51347..9d9d1726b 100644 --- a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/SharedObjectManagerDisconnectEvent.java +++ b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/SharedObjectManagerDisconnectEvent.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.sharedobject.events; import org.eclipse.ecf.core.identity.ID; diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/SharedObjectManagerRemoveEvent.java b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/SharedObjectManagerRemoveEvent.java index 1a6be7dfc..2577baa17 100644 --- a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/SharedObjectManagerRemoveEvent.java +++ b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/SharedObjectManagerRemoveEvent.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.sharedobject.events; import org.eclipse.ecf.core.identity.ID; diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/model/ISharedModelEvent.java b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/model/ISharedModelEvent.java index 13c949933..0818a7999 100644 --- a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/model/ISharedModelEvent.java +++ b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/model/ISharedModelEvent.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2013 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2013 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.sharedobject.model; /** diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/model/ISharedModelListener.java b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/model/ISharedModelListener.java index 3858ca48a..2bb6b17e8 100644 --- a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/model/ISharedModelListener.java +++ b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/model/ISharedModelListener.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2013 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2013 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.sharedobject.model; /** diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/model/SharedModel.java b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/model/SharedModel.java index d8ab7c2d7..7fbccfdf7 100644 --- a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/model/SharedModel.java +++ b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/model/SharedModel.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2013 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2013 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.sharedobject.model; import java.io.IOException; diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/provider/ISharedObjectInstantiator.java b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/provider/ISharedObjectInstantiator.java index 76bcef980..a20ca1863 100644 --- a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/provider/ISharedObjectInstantiator.java +++ b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/provider/ISharedObjectInstantiator.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.sharedobject.provider; import org.eclipse.ecf.core.sharedobject.ISharedObject; diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/security/ISharedObjectPolicy.java b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/security/ISharedObjectPolicy.java index 8492995bf..b533eb56a 100644 --- a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/security/ISharedObjectPolicy.java +++ b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/security/ISharedObjectPolicy.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.sharedobject.security; import java.security.PermissionCollection; diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/util/IEnqueueProcessor.java b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/util/IEnqueueProcessor.java index 1b5820df0..e63289768 100644 --- a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/util/IEnqueueProcessor.java +++ b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/util/IEnqueueProcessor.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.sharedobject.util; import org.eclipse.ecf.core.util.Event; diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/util/IQueue.java b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/util/IQueue.java index bd991b984..316910d3a 100644 --- a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/util/IQueue.java +++ b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/util/IQueue.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.sharedobject.util; /** diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/util/IQueueDequeue.java b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/util/IQueueDequeue.java index 349b215f4..c05866e47 100644 --- a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/util/IQueueDequeue.java +++ b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/util/IQueueDequeue.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.sharedobject.util; import org.eclipse.ecf.core.util.Event; diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/util/IQueueEnqueue.java b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/util/IQueueEnqueue.java index 9935e16b0..edcbc962f 100644 --- a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/util/IQueueEnqueue.java +++ b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/util/IQueueEnqueue.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.sharedobject.util; import org.eclipse.ecf.core.util.Event; diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/util/ISharedObjectMessageSerializer.java b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/util/ISharedObjectMessageSerializer.java index a7486d142..b84b96faa 100644 --- a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/util/ISharedObjectMessageSerializer.java +++ b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/util/ISharedObjectMessageSerializer.java @@ -1,12 +1,15 @@ -/******************************************************************************* -* Copyright (c) 2009 EclipseSource and others. 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: -* EclipseSource - initial API and implementation -******************************************************************************/ +/**************************************************************************** + * Copyright (c) 2009 EclipseSource and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * Contributors: + * EclipseSource - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.sharedobject.util; import java.io.IOException; diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/util/ISimpleFIFOQueue.java b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/util/ISimpleFIFOQueue.java index 9528301aa..10a69607a 100644 --- a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/util/ISimpleFIFOQueue.java +++ b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/util/ISimpleFIFOQueue.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.sharedobject.util; /** diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/util/QueueEnqueueImpl.java b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/util/QueueEnqueueImpl.java index e1919afa5..9ec05a623 100644 --- a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/util/QueueEnqueueImpl.java +++ b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/util/QueueEnqueueImpl.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.core.sharedobject.util; diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/util/QueueException.java b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/util/QueueException.java index 5d50e2b1b..6964f9bbd 100644 --- a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/util/QueueException.java +++ b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/util/QueueException.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.sharedobject.util; import org.eclipse.core.runtime.IStatus; diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/util/SimpleFIFOQueue.java b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/util/SimpleFIFOQueue.java index 5dfd69cd0..86dc12e22 100644 --- a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/util/SimpleFIFOQueue.java +++ b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/util/SimpleFIFOQueue.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2007 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.core.sharedobject.util; diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/util/reflection/ClassUtil.java b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/util/reflection/ClassUtil.java index 0c8e0c181..e15121536 100644 --- a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/util/reflection/ClassUtil.java +++ b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/util/reflection/ClassUtil.java @@ -1,13 +1,15 @@ -/******************************************************************************* +/**************************************************************************** * Copyright (c) 2010 Markus Alexander Kuppe. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Markus Alexander Kuppe (ecf-dev_eclipse.org <at> lemmster <dot> de) - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.util.reflection; import java.lang.reflect.Method; diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/internal/core/sharedobject/SharedObjectDebugOptions.java b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/internal/core/sharedobject/SharedObjectDebugOptions.java index 320c9a64c..03359f44e 100644 --- a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/internal/core/sharedobject/SharedObjectDebugOptions.java +++ b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/internal/core/sharedobject/SharedObjectDebugOptions.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.internal.core.sharedobject; public interface SharedObjectDebugOptions { diff --git a/framework/bundles/org.eclipse.ecf.ssl/.settings/org.eclipse.jdt.core.prefs b/framework/bundles/org.eclipse.ecf.ssl/.settings/org.eclipse.jdt.core.prefs index 8609ba2ef..834a6aba9 100644 --- a/framework/bundles/org.eclipse.ecf.ssl/.settings/org.eclipse.jdt.core.prefs +++ b/framework/bundles/org.eclipse.ecf.ssl/.settings/org.eclipse.jdt.core.prefs @@ -16,7 +16,7 @@ org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.autoboxing=ignore org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning org.eclipse.jdt.core.compiler.problem.deadCode=warning -org.eclipse.jdt.core.compiler.problem.deprecation=warning +org.eclipse.jdt.core.compiler.problem.deprecation=ignore org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled org.eclipse.jdt.core.compiler.problem.discouragedReference=warning diff --git a/framework/bundles/org.eclipse.ecf.ssl/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.ssl/META-INF/MANIFEST.MF index 71edeb5bf..45ee4e4f4 100644 --- a/framework/bundles/org.eclipse.ecf.ssl/META-INF/MANIFEST.MF +++ b/framework/bundles/org.eclipse.ecf.ssl/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin.name Bundle-SymbolicName: org.eclipse.ecf.ssl Automatic-Module-Name: org.eclipse.ecf.ssl -Bundle-Version: 1.2.200.qualifier +Bundle-Version: 1.2.401.qualifier Fragment-Host: org.eclipse.ecf Bundle-RequiredExecutionEnvironment: J2SE-1.5 Import-Package: javax.net, diff --git a/framework/bundles/org.eclipse.ecf.ssl/about.html b/framework/bundles/org.eclipse.ecf.ssl/about.html index 4c79781a5..9f1dc0dd5 100644 --- a/framework/bundles/org.eclipse.ecf.ssl/about.html +++ b/framework/bundles/org.eclipse.ecf.ssl/about.html @@ -22,7 +22,7 @@ being redistributed by another party ("Redistributor") and different t apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise indicated below, the terms and conditions of the EPL still apply to any source code in the Content -and such source code may be obtained at <a href="/">http://www.eclipse.org</a>.</p> +and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p> </body> </html>
\ No newline at end of file diff --git a/framework/bundles/org.eclipse.ecf.ssl/plugin.properties b/framework/bundles/org.eclipse.ecf.ssl/plugin.properties index b6c8bde4d..a0c7047f3 100644 --- a/framework/bundles/org.eclipse.ecf.ssl/plugin.properties +++ b/framework/bundles/org.eclipse.ecf.ssl/plugin.properties @@ -1,10 +1,11 @@ ############################################################################ # Copyright (c) 2007 Composent Inc., IBM Corp, and others. -# 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 # +# This program and the accompanying materials are made +# available under the terms of the Eclipse Public License 2.0 +# which is available at https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 ############################################################################ plugin.name=ECF SSL Fragment plugin.provider=Eclipse.org - ECF diff --git a/framework/bundles/org.eclipse.ecf.ssl/pom.xml b/framework/bundles/org.eclipse.ecf.ssl/pom.xml index 2d3553907..db5c80145 100644 --- a/framework/bundles/org.eclipse.ecf.ssl/pom.xml +++ b/framework/bundles/org.eclipse.ecf.ssl/pom.xml @@ -10,6 +10,6 @@ </parent> <groupId>org.eclipse.ecf</groupId> <artifactId>org.eclipse.ecf.ssl</artifactId> - <version>1.2.200-SNAPSHOT</version> + <version>1.2.401-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/framework/bundles/org.eclipse.ecf.ssl/src/org/eclipse/ecf/internal/ssl/ECFCertificateException.java b/framework/bundles/org.eclipse.ecf.ssl/src/org/eclipse/ecf/internal/ssl/ECFCertificateException.java index 83aee55d2..9628ebdfd 100644 --- a/framework/bundles/org.eclipse.ecf.ssl/src/org/eclipse/ecf/internal/ssl/ECFCertificateException.java +++ b/framework/bundles/org.eclipse.ecf.ssl/src/org/eclipse/ecf/internal/ssl/ECFCertificateException.java @@ -1,13 +1,15 @@ -/******************************************************************************* +/**************************************************************************** * Copyright (c)2008 IBM Corporation and others. - * 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 - * + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: * IBM Corporation - initial API and implementation - *******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.internal.ssl; import java.security.cert.CertificateException; diff --git a/framework/bundles/org.eclipse.ecf.ssl/src/org/eclipse/ecf/internal/ssl/ECFSSLServerSocketFactory.java b/framework/bundles/org.eclipse.ecf.ssl/src/org/eclipse/ecf/internal/ssl/ECFSSLServerSocketFactory.java index 5b16165d2..5764c5e9f 100644 --- a/framework/bundles/org.eclipse.ecf.ssl/src/org/eclipse/ecf/internal/ssl/ECFSSLServerSocketFactory.java +++ b/framework/bundles/org.eclipse.ecf.ssl/src/org/eclipse/ecf/internal/ssl/ECFSSLServerSocketFactory.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2012 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.internal.ssl; diff --git a/framework/bundles/org.eclipse.ecf.ssl/src/org/eclipse/ecf/internal/ssl/ECFSSLSocketFactory.java b/framework/bundles/org.eclipse.ecf.ssl/src/org/eclipse/ecf/internal/ssl/ECFSSLSocketFactory.java index 110694939..ec58c7173 100644 --- a/framework/bundles/org.eclipse.ecf.ssl/src/org/eclipse/ecf/internal/ssl/ECFSSLSocketFactory.java +++ b/framework/bundles/org.eclipse.ecf.ssl/src/org/eclipse/ecf/internal/ssl/ECFSSLSocketFactory.java @@ -1,13 +1,15 @@ -/******************************************************************************* +/**************************************************************************** * Copyright (c)2008 IBM Corporation and others. - * 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 - * + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: * IBM Corporation - initial API and implementation - *******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.internal.ssl; import java.io.IOException; diff --git a/framework/bundles/org.eclipse.ecf.ssl/src/org/eclipse/ecf/internal/ssl/ECFTrustManager.java b/framework/bundles/org.eclipse.ecf.ssl/src/org/eclipse/ecf/internal/ssl/ECFTrustManager.java index 953137c45..2ff79e50d 100644 --- a/framework/bundles/org.eclipse.ecf.ssl/src/org/eclipse/ecf/internal/ssl/ECFTrustManager.java +++ b/framework/bundles/org.eclipse.ecf.ssl/src/org/eclipse/ecf/internal/ssl/ECFTrustManager.java @@ -1,13 +1,15 @@ -/******************************************************************************* +/**************************************************************************** * Copyright (c)2008 IBM Corporation and others. - * 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 - * + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: * IBM Corporation - initial API and implementation - *******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.internal.ssl; import java.io.IOException; @@ -31,12 +33,12 @@ public class ECFTrustManager implements X509TrustManager, BundleActivator { final TrustEngine[] engines = getTrustEngines(); Certificate foundCert = null; - for (int i = 0; i < engines.length; i++) { + for (TrustEngine engine : engines) { try { - foundCert = engines[i].findTrustAnchor(certs); + foundCert = engine.findTrustAnchor(certs); if (null != foundCert) return; // cert chain is trust - } catch (final IOException e) { + }catch (final IOException e) { final CertificateException ce = new ECFCertificateException( "Error occurs when finding trust anchor in the cert chain", certs, authType); //$NON-NLS-1$ ce.initCause(ce); diff --git a/framework/bundles/org.eclipse.ecf.ssl/src/org/eclipse/ecf/internal/ssl/SSLContextHelper.java b/framework/bundles/org.eclipse.ecf.ssl/src/org/eclipse/ecf/internal/ssl/SSLContextHelper.java index 54ac5b434..8d563d11e 100644 --- a/framework/bundles/org.eclipse.ecf.ssl/src/org/eclipse/ecf/internal/ssl/SSLContextHelper.java +++ b/framework/bundles/org.eclipse.ecf.ssl/src/org/eclipse/ecf/internal/ssl/SSLContextHelper.java @@ -1,10 +1,12 @@ -/******************************************************************************* - * Copyright (c) Composent, Inc. 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 - * - ******************************************************************************/ +/**************************************************************************** + * Copyright (c) Composent, Inc. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.internal.ssl; import java.security.SecureRandom; @@ -27,9 +29,11 @@ public class SSLContextHelper { // Now put into defaultProtocolsList in order of jreProtocols List<String> splitProtocolsList = Arrays.asList(httpsProtocols); List<String> defaultProtocolsList = new ArrayList(); - for (int i = 0; i < jreProtocols.length; i++) - if (splitProtocolsList.contains(jreProtocols[i])) - defaultProtocolsList.add(jreProtocols[i]); + for (String jreProtocol : jreProtocols) { + if (splitProtocolsList.contains(jreProtocol)) { + defaultProtocolsList.add(jreProtocol); + } + } // In order of jre protocols, attempt to create and init SSLContext for (String protocol : defaultProtocolsList) { try { diff --git a/framework/bundles/org.eclipse.ecf.storage/.settings/org.eclipse.jdt.core.prefs b/framework/bundles/org.eclipse.ecf.storage/.settings/org.eclipse.jdt.core.prefs index e35a80296..7c0cbbeb9 100644 --- a/framework/bundles/org.eclipse.ecf.storage/.settings/org.eclipse.jdt.core.prefs +++ b/framework/bundles/org.eclipse.ecf.storage/.settings/org.eclipse.jdt.core.prefs @@ -16,7 +16,7 @@ org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning org.eclipse.jdt.core.compiler.problem.autoboxing=ignore org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning org.eclipse.jdt.core.compiler.problem.deadCode=warning -org.eclipse.jdt.core.compiler.problem.deprecation=warning +org.eclipse.jdt.core.compiler.problem.deprecation=ignore org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled org.eclipse.jdt.core.compiler.problem.discouragedReference=warning diff --git a/framework/bundles/org.eclipse.ecf.storage/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.storage/META-INF/MANIFEST.MF index 1dc8bcc66..1b96f84b1 100644 --- a/framework/bundles/org.eclipse.ecf.storage/META-INF/MANIFEST.MF +++ b/framework/bundles/org.eclipse.ecf.storage/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin.name Bundle-SymbolicName: org.eclipse.ecf.storage;singleton:=true Automatic-Module-Name: org.eclipse.ecf.storage -Bundle-Version: 2.0.100.qualifier +Bundle-Version: 2.0.200.qualifier Bundle-Activator: org.eclipse.ecf.internal.storage.Activator Bundle-Vendor: %plugin.provider Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1, diff --git a/framework/bundles/org.eclipse.ecf.storage/about.html b/framework/bundles/org.eclipse.ecf.storage/about.html index 4c79781a5..9f1dc0dd5 100644 --- a/framework/bundles/org.eclipse.ecf.storage/about.html +++ b/framework/bundles/org.eclipse.ecf.storage/about.html @@ -22,7 +22,7 @@ being redistributed by another party ("Redistributor") and different t apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise indicated below, the terms and conditions of the EPL still apply to any source code in the Content -and such source code may be obtained at <a href="/">http://www.eclipse.org</a>.</p> +and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p> </body> </html>
\ No newline at end of file diff --git a/framework/bundles/org.eclipse.ecf.storage/plugin.properties b/framework/bundles/org.eclipse.ecf.storage/plugin.properties index b4da550e7..3db459088 100644 --- a/framework/bundles/org.eclipse.ecf.storage/plugin.properties +++ b/framework/bundles/org.eclipse.ecf.storage/plugin.properties @@ -1,10 +1,11 @@ ############################################################################ # Copyright (c) 2009 Composent Inc. and others. -# 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 # +# This program and the accompanying materials are made +# available under the terms of the Eclipse Public License 2.0 +# which is available at https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 ############################################################################ plugin.name=ECF Secure Storage API plugin.provider=Eclipse.org - ECF
\ No newline at end of file diff --git a/framework/bundles/org.eclipse.ecf.storage/pom.xml b/framework/bundles/org.eclipse.ecf.storage/pom.xml index be28505ca..ba9df0e1c 100644 --- a/framework/bundles/org.eclipse.ecf.storage/pom.xml +++ b/framework/bundles/org.eclipse.ecf.storage/pom.xml @@ -10,6 +10,6 @@ </parent> <groupId>org.eclipse.ecf</groupId> <artifactId>org.eclipse.ecf.storage</artifactId> - <version>2.0.100-SNAPSHOT</version> + <version>2.0.200-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/framework/bundles/org.eclipse.ecf.storage/src/org/eclipse/ecf/internal/storage/ContainerEntry.java b/framework/bundles/org.eclipse.ecf.storage/src/org/eclipse/ecf/internal/storage/ContainerEntry.java index 3eb008ca4..8ea5fe969 100644 --- a/framework/bundles/org.eclipse.ecf.storage/src/org/eclipse/ecf/internal/storage/ContainerEntry.java +++ b/framework/bundles/org.eclipse.ecf.storage/src/org/eclipse/ecf/internal/storage/ContainerEntry.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2008 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.internal.storage; diff --git a/framework/bundles/org.eclipse.ecf.storage/src/org/eclipse/ecf/internal/storage/ContainerStore.java b/framework/bundles/org.eclipse.ecf.storage/src/org/eclipse/ecf/internal/storage/ContainerStore.java index 5833401ee..65dfcad2e 100644 --- a/framework/bundles/org.eclipse.ecf.storage/src/org/eclipse/ecf/internal/storage/ContainerStore.java +++ b/framework/bundles/org.eclipse.ecf.storage/src/org/eclipse/ecf/internal/storage/ContainerStore.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2008 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.internal.storage; diff --git a/framework/bundles/org.eclipse.ecf.storage/src/org/eclipse/ecf/internal/storage/IDEntry.java b/framework/bundles/org.eclipse.ecf.storage/src/org/eclipse/ecf/internal/storage/IDEntry.java index 1dc2442dd..6ec46143b 100644 --- a/framework/bundles/org.eclipse.ecf.storage/src/org/eclipse/ecf/internal/storage/IDEntry.java +++ b/framework/bundles/org.eclipse.ecf.storage/src/org/eclipse/ecf/internal/storage/IDEntry.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2008 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.internal.storage; diff --git a/framework/bundles/org.eclipse.ecf.storage/src/org/eclipse/ecf/internal/storage/IDStore.java b/framework/bundles/org.eclipse.ecf.storage/src/org/eclipse/ecf/internal/storage/IDStore.java index dca66d918..b84fe0724 100644 --- a/framework/bundles/org.eclipse.ecf.storage/src/org/eclipse/ecf/internal/storage/IDStore.java +++ b/framework/bundles/org.eclipse.ecf.storage/src/org/eclipse/ecf/internal/storage/IDStore.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2008 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.internal.storage; diff --git a/framework/bundles/org.eclipse.ecf.storage/src/org/eclipse/ecf/internal/storage/NamespaceEntry.java b/framework/bundles/org.eclipse.ecf.storage/src/org/eclipse/ecf/internal/storage/NamespaceEntry.java index 54584dc57..e2be544e8 100644 --- a/framework/bundles/org.eclipse.ecf.storage/src/org/eclipse/ecf/internal/storage/NamespaceEntry.java +++ b/framework/bundles/org.eclipse.ecf.storage/src/org/eclipse/ecf/internal/storage/NamespaceEntry.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2008 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.internal.storage; diff --git a/framework/bundles/org.eclipse.ecf.storage/src/org/eclipse/ecf/internal/storage/StorableBaseContainer.java b/framework/bundles/org.eclipse.ecf.storage/src/org/eclipse/ecf/internal/storage/StorableBaseContainer.java index 9754e6e2e..efe0b9aa4 100644 --- a/framework/bundles/org.eclipse.ecf.storage/src/org/eclipse/ecf/internal/storage/StorableBaseContainer.java +++ b/framework/bundles/org.eclipse.ecf.storage/src/org/eclipse/ecf/internal/storage/StorableBaseContainer.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2008 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.internal.storage; diff --git a/framework/bundles/org.eclipse.ecf.storage/src/org/eclipse/ecf/storage/IContainerEntry.java b/framework/bundles/org.eclipse.ecf.storage/src/org/eclipse/ecf/storage/IContainerEntry.java index f7b603e9c..27568caf4 100644 --- a/framework/bundles/org.eclipse.ecf.storage/src/org/eclipse/ecf/storage/IContainerEntry.java +++ b/framework/bundles/org.eclipse.ecf.storage/src/org/eclipse/ecf/storage/IContainerEntry.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2008 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.storage; diff --git a/framework/bundles/org.eclipse.ecf.storage/src/org/eclipse/ecf/storage/IContainerStore.java b/framework/bundles/org.eclipse.ecf.storage/src/org/eclipse/ecf/storage/IContainerStore.java index 2d6da15dc..a3566331f 100644 --- a/framework/bundles/org.eclipse.ecf.storage/src/org/eclipse/ecf/storage/IContainerStore.java +++ b/framework/bundles/org.eclipse.ecf.storage/src/org/eclipse/ecf/storage/IContainerStore.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2008 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.storage; diff --git a/framework/bundles/org.eclipse.ecf.storage/src/org/eclipse/ecf/storage/IDStoreException.java b/framework/bundles/org.eclipse.ecf.storage/src/org/eclipse/ecf/storage/IDStoreException.java index 84b6ba22f..e5d942a29 100644 --- a/framework/bundles/org.eclipse.ecf.storage/src/org/eclipse/ecf/storage/IDStoreException.java +++ b/framework/bundles/org.eclipse.ecf.storage/src/org/eclipse/ecf/storage/IDStoreException.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2008 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.storage; diff --git a/framework/bundles/org.eclipse.ecf.storage/src/org/eclipse/ecf/storage/IIDEntry.java b/framework/bundles/org.eclipse.ecf.storage/src/org/eclipse/ecf/storage/IIDEntry.java index 2291e13b7..56d3d230b 100644 --- a/framework/bundles/org.eclipse.ecf.storage/src/org/eclipse/ecf/storage/IIDEntry.java +++ b/framework/bundles/org.eclipse.ecf.storage/src/org/eclipse/ecf/storage/IIDEntry.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2008 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.storage; diff --git a/framework/bundles/org.eclipse.ecf.storage/src/org/eclipse/ecf/storage/IIDStore.java b/framework/bundles/org.eclipse.ecf.storage/src/org/eclipse/ecf/storage/IIDStore.java index 942e14522..6a814314d 100644 --- a/framework/bundles/org.eclipse.ecf.storage/src/org/eclipse/ecf/storage/IIDStore.java +++ b/framework/bundles/org.eclipse.ecf.storage/src/org/eclipse/ecf/storage/IIDStore.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2008 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.storage; diff --git a/framework/bundles/org.eclipse.ecf.storage/src/org/eclipse/ecf/storage/IIDStoreAdapter.java b/framework/bundles/org.eclipse.ecf.storage/src/org/eclipse/ecf/storage/IIDStoreAdapter.java index d7ff20f38..3d1795d80 100644 --- a/framework/bundles/org.eclipse.ecf.storage/src/org/eclipse/ecf/storage/IIDStoreAdapter.java +++ b/framework/bundles/org.eclipse.ecf.storage/src/org/eclipse/ecf/storage/IIDStoreAdapter.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2008 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.storage; diff --git a/framework/bundles/org.eclipse.ecf.storage/src/org/eclipse/ecf/storage/INamespaceEntry.java b/framework/bundles/org.eclipse.ecf.storage/src/org/eclipse/ecf/storage/INamespaceEntry.java index ce088dc04..81d3062a5 100644 --- a/framework/bundles/org.eclipse.ecf.storage/src/org/eclipse/ecf/storage/INamespaceEntry.java +++ b/framework/bundles/org.eclipse.ecf.storage/src/org/eclipse/ecf/storage/INamespaceEntry.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2008 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.storage; diff --git a/framework/bundles/org.eclipse.ecf.storage/src/org/eclipse/ecf/storage/INamespaceStoreAdapter.java b/framework/bundles/org.eclipse.ecf.storage/src/org/eclipse/ecf/storage/INamespaceStoreAdapter.java index 827d4508d..75e56b313 100644 --- a/framework/bundles/org.eclipse.ecf.storage/src/org/eclipse/ecf/storage/INamespaceStoreAdapter.java +++ b/framework/bundles/org.eclipse.ecf.storage/src/org/eclipse/ecf/storage/INamespaceStoreAdapter.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2008 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.storage; diff --git a/framework/bundles/org.eclipse.ecf.storage/src/org/eclipse/ecf/storage/IStorableContainerAdapter.java b/framework/bundles/org.eclipse.ecf.storage/src/org/eclipse/ecf/storage/IStorableContainerAdapter.java index 2dfbc4e4a..3b6289760 100644 --- a/framework/bundles/org.eclipse.ecf.storage/src/org/eclipse/ecf/storage/IStorableContainerAdapter.java +++ b/framework/bundles/org.eclipse.ecf.storage/src/org/eclipse/ecf/storage/IStorableContainerAdapter.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2008 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.storage; diff --git a/framework/bundles/org.eclipse.ecf.sync/.settings/org.eclipse.jdt.core.prefs b/framework/bundles/org.eclipse.ecf.sync/.settings/org.eclipse.jdt.core.prefs index 7c8c37cd7..857168e9b 100644 --- a/framework/bundles/org.eclipse.ecf.sync/.settings/org.eclipse.jdt.core.prefs +++ b/framework/bundles/org.eclipse.ecf.sync/.settings/org.eclipse.jdt.core.prefs @@ -16,7 +16,7 @@ org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning org.eclipse.jdt.core.compiler.problem.autoboxing=ignore org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning org.eclipse.jdt.core.compiler.problem.deadCode=warning -org.eclipse.jdt.core.compiler.problem.deprecation=warning +org.eclipse.jdt.core.compiler.problem.deprecation=ignore org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled org.eclipse.jdt.core.compiler.problem.discouragedReference=warning diff --git a/framework/bundles/org.eclipse.ecf.sync/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.sync/META-INF/MANIFEST.MF index 331bec12d..d5b73f68a 100644 --- a/framework/bundles/org.eclipse.ecf.sync/META-INF/MANIFEST.MF +++ b/framework/bundles/org.eclipse.ecf.sync/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin.name Bundle-SymbolicName: org.eclipse.ecf.sync Automatic-Module-Name: org.eclipse.ecf.sync -Bundle-Version: 2.0.200.qualifier +Bundle-Version: 2.0.301.qualifier Bundle-Activator: org.eclipse.ecf.internal.sync.Activator Bundle-Vendor: %plugin.provider Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1, diff --git a/framework/bundles/org.eclipse.ecf.sync/about.html b/framework/bundles/org.eclipse.ecf.sync/about.html index 6a60a262f..7e02a356d 100644 --- a/framework/bundles/org.eclipse.ecf.sync/about.html +++ b/framework/bundles/org.eclipse.ecf.sync/about.html @@ -22,7 +22,7 @@ being redistributed by another party ("Redistributor") and different t apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise indicated below, the terms and conditions of the EPL still apply to any source code in the Content -and such source code may be obtained at <a href="/">http://www.eclipse.org</a>.</p> +and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p> </body> </html>
\ No newline at end of file diff --git a/framework/bundles/org.eclipse.ecf.sync/plugin.properties b/framework/bundles/org.eclipse.ecf.sync/plugin.properties index 4aba46c3d..a59867800 100644 --- a/framework/bundles/org.eclipse.ecf.sync/plugin.properties +++ b/framework/bundles/org.eclipse.ecf.sync/plugin.properties @@ -1,12 +1,11 @@ -################################################################################ +############################################################################ # Copyright (c) 2008 Composent, Inc. and others. -# 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: -# Composent, Inc. - initial API and implementation -################################################################################ +# +# This program and the accompanying materials are made +# available under the terms of the Eclipse Public License 2.0 +# which is available at https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 +############################################################################ plugin.provider = Eclipse.org - ECF plugin.name = ECF Synchronization API
\ No newline at end of file diff --git a/framework/bundles/org.eclipse.ecf.sync/pom.xml b/framework/bundles/org.eclipse.ecf.sync/pom.xml index 5b5548862..584c6ddc5 100644 --- a/framework/bundles/org.eclipse.ecf.sync/pom.xml +++ b/framework/bundles/org.eclipse.ecf.sync/pom.xml @@ -10,6 +10,6 @@ </parent> <groupId>org.eclipse.ecf</groupId> <artifactId>org.eclipse.ecf.sync</artifactId> - <version>2.0.200-SNAPSHOT</version> + <version>2.0.301-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/framework/bundles/org.eclipse.ecf.sync/src/org/eclipse/ecf/internal/sync/Activator.java b/framework/bundles/org.eclipse.ecf.sync/src/org/eclipse/ecf/internal/sync/Activator.java index 2a16f7f48..05ed1946f 100644 --- a/framework/bundles/org.eclipse.ecf.sync/src/org/eclipse/ecf/internal/sync/Activator.java +++ b/framework/bundles/org.eclipse.ecf.sync/src/org/eclipse/ecf/internal/sync/Activator.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2008 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.internal.sync; @@ -96,7 +98,7 @@ public class Activator implements BundleActivator { // Register cola synchronizer service final Dictionary colaServiceProps = new Properties(); //OSGi container will return the service with the highest ranking, so by default the Cola SynchStrategie is returned - colaServiceProps.put(Constants.SERVICE_RANKING, new Integer(1)); + colaServiceProps.put(Constants.SERVICE_RANKING, Integer.valueOf(1)); colaServiceProps.put(IServiceConstants.SYNCSTRATEGY_TYPE_PROPERTY, ColaSynchronizationStrategyFactory.SYNCHSTRATEGY_TYPE); colaServiceProps.put(IServiceConstants.SYNCSTRATEGY_PROVIDER_PROPETY, ColaSynchronizationStrategyFactory.SYNCHSTRATEGY_PROVIDER); colaServiceRegistration = this.context.registerService(IDocumentSynchronizationStrategyFactory.class.getName(), this.cola, colaServiceProps); diff --git a/framework/bundles/org.eclipse.ecf.sync/src/org/eclipse/ecf/internal/sync/SyncDebugOptions.java b/framework/bundles/org.eclipse.ecf.sync/src/org/eclipse/ecf/internal/sync/SyncDebugOptions.java index cb8dc9038..6b37aff8e 100644 --- a/framework/bundles/org.eclipse.ecf.sync/src/org/eclipse/ecf/internal/sync/SyncDebugOptions.java +++ b/framework/bundles/org.eclipse.ecf.sync/src/org/eclipse/ecf/internal/sync/SyncDebugOptions.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2008 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2008 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.internal.sync; public interface SyncDebugOptions { diff --git a/framework/bundles/org.eclipse.ecf.sync/src/org/eclipse/ecf/internal/sync/doc/cola/ColaDeletionTransformationStrategy.java b/framework/bundles/org.eclipse.ecf.sync/src/org/eclipse/ecf/internal/sync/doc/cola/ColaDeletionTransformationStrategy.java index fb4613a71..2a6ae233e 100644 --- a/framework/bundles/org.eclipse.ecf.sync/src/org/eclipse/ecf/internal/sync/doc/cola/ColaDeletionTransformationStrategy.java +++ b/framework/bundles/org.eclipse.ecf.sync/src/org/eclipse/ecf/internal/sync/doc/cola/ColaDeletionTransformationStrategy.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2008 Mustafa K. Isik and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Mustafa K. Isik - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.internal.sync.doc.cola; diff --git a/framework/bundles/org.eclipse.ecf.sync/src/org/eclipse/ecf/internal/sync/doc/cola/ColaDocumentChangeMessage.java b/framework/bundles/org.eclipse.ecf.sync/src/org/eclipse/ecf/internal/sync/doc/cola/ColaDocumentChangeMessage.java index 7bd069f57..3e0f7d3b4 100644 --- a/framework/bundles/org.eclipse.ecf.sync/src/org/eclipse/ecf/internal/sync/doc/cola/ColaDocumentChangeMessage.java +++ b/framework/bundles/org.eclipse.ecf.sync/src/org/eclipse/ecf/internal/sync/doc/cola/ColaDocumentChangeMessage.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2008 Mustafa K. Isik and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Mustafa K. Isik - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.internal.sync.doc.cola; diff --git a/framework/bundles/org.eclipse.ecf.sync/src/org/eclipse/ecf/internal/sync/doc/cola/ColaInsertionTransformationStategy.java b/framework/bundles/org.eclipse.ecf.sync/src/org/eclipse/ecf/internal/sync/doc/cola/ColaInsertionTransformationStategy.java index b653b51df..8dd4a6296 100644 --- a/framework/bundles/org.eclipse.ecf.sync/src/org/eclipse/ecf/internal/sync/doc/cola/ColaInsertionTransformationStategy.java +++ b/framework/bundles/org.eclipse.ecf.sync/src/org/eclipse/ecf/internal/sync/doc/cola/ColaInsertionTransformationStategy.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2008 Mustafa K. Isik and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Mustafa K. Isik - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.internal.sync.doc.cola; diff --git a/framework/bundles/org.eclipse.ecf.sync/src/org/eclipse/ecf/internal/sync/doc/cola/ColaReplacementTransformationStategy.java b/framework/bundles/org.eclipse.ecf.sync/src/org/eclipse/ecf/internal/sync/doc/cola/ColaReplacementTransformationStategy.java index 370c68f00..5fe76b1fa 100644 --- a/framework/bundles/org.eclipse.ecf.sync/src/org/eclipse/ecf/internal/sync/doc/cola/ColaReplacementTransformationStategy.java +++ b/framework/bundles/org.eclipse.ecf.sync/src/org/eclipse/ecf/internal/sync/doc/cola/ColaReplacementTransformationStategy.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2008 Mustafa K. Isik and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Mustafa K. Isik - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.internal.sync.doc.cola; diff --git a/framework/bundles/org.eclipse.ecf.sync/src/org/eclipse/ecf/internal/sync/doc/cola/ColaSynchronizationStrategy.java b/framework/bundles/org.eclipse.ecf.sync/src/org/eclipse/ecf/internal/sync/doc/cola/ColaSynchronizationStrategy.java index fe3656ca8..73cf3b62e 100644 --- a/framework/bundles/org.eclipse.ecf.sync/src/org/eclipse/ecf/internal/sync/doc/cola/ColaSynchronizationStrategy.java +++ b/framework/bundles/org.eclipse.ecf.sync/src/org/eclipse/ecf/internal/sync/doc/cola/ColaSynchronizationStrategy.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2008 Mustafa K. Isik and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Mustafa K. Isik - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.internal.sync.doc.cola; diff --git a/framework/bundles/org.eclipse.ecf.sync/src/org/eclipse/ecf/internal/sync/doc/cola/ColaSynchronizationStrategyFactory.java b/framework/bundles/org.eclipse.ecf.sync/src/org/eclipse/ecf/internal/sync/doc/cola/ColaSynchronizationStrategyFactory.java index 1a2ade662..0891daa1d 100644 --- a/framework/bundles/org.eclipse.ecf.sync/src/org/eclipse/ecf/internal/sync/doc/cola/ColaSynchronizationStrategyFactory.java +++ b/framework/bundles/org.eclipse.ecf.sync/src/org/eclipse/ecf/internal/sync/doc/cola/ColaSynchronizationStrategyFactory.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2008 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.internal.sync.doc.cola; diff --git a/framework/bundles/org.eclipse.ecf.sync/src/org/eclipse/ecf/internal/sync/doc/cola/ColaTransformationStrategy.java b/framework/bundles/org.eclipse.ecf.sync/src/org/eclipse/ecf/internal/sync/doc/cola/ColaTransformationStrategy.java index 64542cfe7..324b29351 100644 --- a/framework/bundles/org.eclipse.ecf.sync/src/org/eclipse/ecf/internal/sync/doc/cola/ColaTransformationStrategy.java +++ b/framework/bundles/org.eclipse.ecf.sync/src/org/eclipse/ecf/internal/sync/doc/cola/ColaTransformationStrategy.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2008 Mustafa K. Isik and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Mustafa K. Isik - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.internal.sync.doc.cola; diff --git a/framework/bundles/org.eclipse.ecf.sync/src/org/eclipse/ecf/internal/sync/doc/identity/IdentitySynchronizationStrategy.java b/framework/bundles/org.eclipse.ecf.sync/src/org/eclipse/ecf/internal/sync/doc/identity/IdentitySynchronizationStrategy.java index feef0d902..3ed403542 100644 --- a/framework/bundles/org.eclipse.ecf.sync/src/org/eclipse/ecf/internal/sync/doc/identity/IdentitySynchronizationStrategy.java +++ b/framework/bundles/org.eclipse.ecf.sync/src/org/eclipse/ecf/internal/sync/doc/identity/IdentitySynchronizationStrategy.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2008 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.internal.sync.doc.identity; diff --git a/framework/bundles/org.eclipse.ecf.sync/src/org/eclipse/ecf/internal/sync/doc/identity/IdentitySynchronizationStrategyFactory.java b/framework/bundles/org.eclipse.ecf.sync/src/org/eclipse/ecf/internal/sync/doc/identity/IdentitySynchronizationStrategyFactory.java index fcd314c31..0dc435db8 100644 --- a/framework/bundles/org.eclipse.ecf.sync/src/org/eclipse/ecf/internal/sync/doc/identity/IdentitySynchronizationStrategyFactory.java +++ b/framework/bundles/org.eclipse.ecf.sync/src/org/eclipse/ecf/internal/sync/doc/identity/IdentitySynchronizationStrategyFactory.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2008 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.internal.sync.doc.identity; diff --git a/framework/bundles/org.eclipse.ecf.sync/src/org/eclipse/ecf/sync/IModelChange.java b/framework/bundles/org.eclipse.ecf.sync/src/org/eclipse/ecf/sync/IModelChange.java index 7d79965f1..77d875cfb 100644 --- a/framework/bundles/org.eclipse.ecf.sync/src/org/eclipse/ecf/sync/IModelChange.java +++ b/framework/bundles/org.eclipse.ecf.sync/src/org/eclipse/ecf/sync/IModelChange.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2008 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.sync; diff --git a/framework/bundles/org.eclipse.ecf.sync/src/org/eclipse/ecf/sync/IModelChangeMessage.java b/framework/bundles/org.eclipse.ecf.sync/src/org/eclipse/ecf/sync/IModelChangeMessage.java index 39a2a50b5..627e5ab90 100644 --- a/framework/bundles/org.eclipse.ecf.sync/src/org/eclipse/ecf/sync/IModelChangeMessage.java +++ b/framework/bundles/org.eclipse.ecf.sync/src/org/eclipse/ecf/sync/IModelChangeMessage.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2008 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.sync; diff --git a/framework/bundles/org.eclipse.ecf.sync/src/org/eclipse/ecf/sync/IModelSynchronizationStrategy.java b/framework/bundles/org.eclipse.ecf.sync/src/org/eclipse/ecf/sync/IModelSynchronizationStrategy.java index 0f133a4f6..bbcdfa681 100644 --- a/framework/bundles/org.eclipse.ecf.sync/src/org/eclipse/ecf/sync/IModelSynchronizationStrategy.java +++ b/framework/bundles/org.eclipse.ecf.sync/src/org/eclipse/ecf/sync/IModelSynchronizationStrategy.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2008 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.sync; diff --git a/framework/bundles/org.eclipse.ecf.sync/src/org/eclipse/ecf/sync/IServiceConstants.java b/framework/bundles/org.eclipse.ecf.sync/src/org/eclipse/ecf/sync/IServiceConstants.java index 3b99c6298..92aa53649 100644 --- a/framework/bundles/org.eclipse.ecf.sync/src/org/eclipse/ecf/sync/IServiceConstants.java +++ b/framework/bundles/org.eclipse.ecf.sync/src/org/eclipse/ecf/sync/IServiceConstants.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2008 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.sync; diff --git a/framework/bundles/org.eclipse.ecf.sync/src/org/eclipse/ecf/sync/SerializationException.java b/framework/bundles/org.eclipse.ecf.sync/src/org/eclipse/ecf/sync/SerializationException.java index 9ad43bc36..0e642ff00 100644 --- a/framework/bundles/org.eclipse.ecf.sync/src/org/eclipse/ecf/sync/SerializationException.java +++ b/framework/bundles/org.eclipse.ecf.sync/src/org/eclipse/ecf/sync/SerializationException.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2008 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.sync; diff --git a/framework/bundles/org.eclipse.ecf.sync/src/org/eclipse/ecf/sync/doc/DocumentChangeMessage.java b/framework/bundles/org.eclipse.ecf.sync/src/org/eclipse/ecf/sync/doc/DocumentChangeMessage.java index 02a46e2d3..3b7bbd711 100644 --- a/framework/bundles/org.eclipse.ecf.sync/src/org/eclipse/ecf/sync/doc/DocumentChangeMessage.java +++ b/framework/bundles/org.eclipse.ecf.sync/src/org/eclipse/ecf/sync/doc/DocumentChangeMessage.java @@ -1,13 +1,15 @@ /**************************************************************************** * Copyright (c) 2008 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation * Mustafa K. Isik + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.sync.doc; diff --git a/framework/bundles/org.eclipse.ecf.sync/src/org/eclipse/ecf/sync/doc/IDocumentChange.java b/framework/bundles/org.eclipse.ecf.sync/src/org/eclipse/ecf/sync/doc/IDocumentChange.java index 874d8da4f..52acb89fb 100644 --- a/framework/bundles/org.eclipse.ecf.sync/src/org/eclipse/ecf/sync/doc/IDocumentChange.java +++ b/framework/bundles/org.eclipse.ecf.sync/src/org/eclipse/ecf/sync/doc/IDocumentChange.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2008 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.sync.doc; diff --git a/framework/bundles/org.eclipse.ecf.sync/src/org/eclipse/ecf/sync/doc/IDocumentSynchronizationStrategyFactory.java b/framework/bundles/org.eclipse.ecf.sync/src/org/eclipse/ecf/sync/doc/IDocumentSynchronizationStrategyFactory.java index e6fbad662..16793a0de 100644 --- a/framework/bundles/org.eclipse.ecf.sync/src/org/eclipse/ecf/sync/doc/IDocumentSynchronizationStrategyFactory.java +++ b/framework/bundles/org.eclipse.ecf.sync/src/org/eclipse/ecf/sync/doc/IDocumentSynchronizationStrategyFactory.java @@ -1,24 +1,16 @@ /**************************************************************************** * Copyright (c) 2008 Composent, Inc. and others. - * 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: - * Composent, Inc. - initial API and implementation - *****************************************************************************/ - -/**************************************************************************** - * Copyright (c) 2008 Composent, Inc. and others. - * 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 + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ + package org.eclipse.ecf.sync.doc; import org.eclipse.ecf.core.identity.ID; diff --git a/framework/bundles/org.eclipse.ecf.telephony.call.ui/.settings/org.eclipse.jdt.core.prefs b/framework/bundles/org.eclipse.ecf.telephony.call.ui/.settings/org.eclipse.jdt.core.prefs index c8184c716..fdc83a0dc 100644 --- a/framework/bundles/org.eclipse.ecf.telephony.call.ui/.settings/org.eclipse.jdt.core.prefs +++ b/framework/bundles/org.eclipse.ecf.telephony.call.ui/.settings/org.eclipse.jdt.core.prefs @@ -16,7 +16,7 @@ org.eclipse.jdt.core.compiler.problem.assertIdentifier=ignore org.eclipse.jdt.core.compiler.problem.autoboxing=ignore org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning org.eclipse.jdt.core.compiler.problem.deadCode=warning -org.eclipse.jdt.core.compiler.problem.deprecation=warning +org.eclipse.jdt.core.compiler.problem.deprecation=ignore org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled org.eclipse.jdt.core.compiler.problem.discouragedReference=warning diff --git a/framework/bundles/org.eclipse.ecf.telephony.call.ui/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.telephony.call.ui/META-INF/MANIFEST.MF index c9f7c2914..e1d738a63 100644 --- a/framework/bundles/org.eclipse.ecf.telephony.call.ui/META-INF/MANIFEST.MF +++ b/framework/bundles/org.eclipse.ecf.telephony.call.ui/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin.name Bundle-SymbolicName: org.eclipse.ecf.telephony.call.ui Automatic-Module-Name: org.eclipse.ecf.telephony.call.ui -Bundle-Version: 1.3.100.qualifier +Bundle-Version: 1.3.200.qualifier Bundle-Activator: org.eclipse.ecf.internal.telephony.call.ui.Activator Bundle-Vendor: %plugin.provider Eclipse-LazyStart: true diff --git a/framework/bundles/org.eclipse.ecf.telephony.call.ui/about.html b/framework/bundles/org.eclipse.ecf.telephony.call.ui/about.html index 4c79781a5..9f1dc0dd5 100644 --- a/framework/bundles/org.eclipse.ecf.telephony.call.ui/about.html +++ b/framework/bundles/org.eclipse.ecf.telephony.call.ui/about.html @@ -22,7 +22,7 @@ being redistributed by another party ("Redistributor") and different t apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise indicated below, the terms and conditions of the EPL still apply to any source code in the Content -and such source code may be obtained at <a href="/">http://www.eclipse.org</a>.</p> +and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p> </body> </html>
\ No newline at end of file diff --git a/framework/bundles/org.eclipse.ecf.telephony.call.ui/build.properties b/framework/bundles/org.eclipse.ecf.telephony.call.ui/build.properties index 7acca17d0..e096bc66c 100644 --- a/framework/bundles/org.eclipse.ecf.telephony.call.ui/build.properties +++ b/framework/bundles/org.eclipse.ecf.telephony.call.ui/build.properties @@ -5,5 +5,5 @@ bin.includes = META-INF/,\ about.html,\ plugin.properties src.includes = about.html -jre.compilation.profile = J2SE-1.4 +jre.compilation.profile = J2SE-1.3 javacWarnings.. = -assertIdentifier,-enumIdentifier diff --git a/framework/bundles/org.eclipse.ecf.telephony.call.ui/plugin.properties b/framework/bundles/org.eclipse.ecf.telephony.call.ui/plugin.properties index 6cb8deabf..5bea9874c 100644 --- a/framework/bundles/org.eclipse.ecf.telephony.call.ui/plugin.properties +++ b/framework/bundles/org.eclipse.ecf.telephony.call.ui/plugin.properties @@ -1,10 +1,11 @@ ############################################################################ # Copyright (c) 2007 Composent Inc., IBM Corp, and others. -# 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 # +# This program and the accompanying materials are made +# available under the terms of the Eclipse Public License 2.0 +# which is available at https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 ############################################################################ plugin.name=ECF Call UI plugin.provider=Eclipse.org - ECF diff --git a/framework/bundles/org.eclipse.ecf.telephony.call.ui/pom.xml b/framework/bundles/org.eclipse.ecf.telephony.call.ui/pom.xml index e2364435a..f5622b196 100644 --- a/framework/bundles/org.eclipse.ecf.telephony.call.ui/pom.xml +++ b/framework/bundles/org.eclipse.ecf.telephony.call.ui/pom.xml @@ -10,6 +10,6 @@ </parent> <groupId>org.eclipse.ecf</groupId> <artifactId>org.eclipse.ecf.telephony.call.ui</artifactId> - <version>1.3.100-SNAPSHOT</version> + <version>1.3.200-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/framework/bundles/org.eclipse.ecf.telephony.call.ui/src/org/eclipse/ecf/internal/telephony/call/ui/Messages.java b/framework/bundles/org.eclipse.ecf.telephony.call.ui/src/org/eclipse/ecf/internal/telephony/call/ui/Messages.java index 4f4817e9e..28e00d100 100644 --- a/framework/bundles/org.eclipse.ecf.telephony.call.ui/src/org/eclipse/ecf/internal/telephony/call/ui/Messages.java +++ b/framework/bundles/org.eclipse.ecf.telephony.call.ui/src/org/eclipse/ecf/internal/telephony/call/ui/Messages.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.internal.telephony.call.ui; diff --git a/framework/bundles/org.eclipse.ecf.telephony.call.ui/src/org/eclipse/ecf/telephony/call/ui/actions/AbstractCallAction.java b/framework/bundles/org.eclipse.ecf.telephony.call.ui/src/org/eclipse/ecf/telephony/call/ui/actions/AbstractCallAction.java index 611784cc6..0ceab94f5 100644 --- a/framework/bundles/org.eclipse.ecf.telephony.call.ui/src/org/eclipse/ecf/telephony/call/ui/actions/AbstractCallAction.java +++ b/framework/bundles/org.eclipse.ecf.telephony.call.ui/src/org/eclipse/ecf/telephony/call/ui/actions/AbstractCallAction.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.telephony.call.ui.actions; diff --git a/framework/bundles/org.eclipse.ecf.telephony.call/.settings/org.eclipse.jdt.core.prefs b/framework/bundles/org.eclipse.ecf.telephony.call/.settings/org.eclipse.jdt.core.prefs index c8184c716..fdc83a0dc 100644 --- a/framework/bundles/org.eclipse.ecf.telephony.call/.settings/org.eclipse.jdt.core.prefs +++ b/framework/bundles/org.eclipse.ecf.telephony.call/.settings/org.eclipse.jdt.core.prefs @@ -16,7 +16,7 @@ org.eclipse.jdt.core.compiler.problem.assertIdentifier=ignore org.eclipse.jdt.core.compiler.problem.autoboxing=ignore org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning org.eclipse.jdt.core.compiler.problem.deadCode=warning -org.eclipse.jdt.core.compiler.problem.deprecation=warning +org.eclipse.jdt.core.compiler.problem.deprecation=ignore org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled org.eclipse.jdt.core.compiler.problem.discouragedReference=warning diff --git a/framework/bundles/org.eclipse.ecf.telephony.call/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.telephony.call/META-INF/MANIFEST.MF index 415cfe434..585284d6b 100644 --- a/framework/bundles/org.eclipse.ecf.telephony.call/META-INF/MANIFEST.MF +++ b/framework/bundles/org.eclipse.ecf.telephony.call/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin.name Bundle-SymbolicName: org.eclipse.ecf.telephony.call Automatic-Module-Name: org.eclipse.ecf.telephony.call -Bundle-Version: 2.0.100.qualifier +Bundle-Version: 2.0.200.qualifier Bundle-Activator: org.eclipse.ecf.internal.telephony.call.Activator Bundle-Vendor: %plugin.provider Eclipse-LazyStart: true diff --git a/framework/bundles/org.eclipse.ecf.telephony.call/about.html b/framework/bundles/org.eclipse.ecf.telephony.call/about.html index 4c79781a5..9f1dc0dd5 100644 --- a/framework/bundles/org.eclipse.ecf.telephony.call/about.html +++ b/framework/bundles/org.eclipse.ecf.telephony.call/about.html @@ -22,7 +22,7 @@ being redistributed by another party ("Redistributor") and different t apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise indicated below, the terms and conditions of the EPL still apply to any source code in the Content -and such source code may be obtained at <a href="/">http://www.eclipse.org</a>.</p> +and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p> </body> </html>
\ No newline at end of file diff --git a/framework/bundles/org.eclipse.ecf.telephony.call/build.properties b/framework/bundles/org.eclipse.ecf.telephony.call/build.properties index 7eb9a2746..162586d2f 100644 --- a/framework/bundles/org.eclipse.ecf.telephony.call/build.properties +++ b/framework/bundles/org.eclipse.ecf.telephony.call/build.properties @@ -1,13 +1,12 @@ -############################################################################### +############################################################################ # Copyright (c) 2005, 2007 Composent, Inc. and others. -# 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: -# Composent, Inc. - initial API and implementation -############################################################################### +# This program and the accompanying materials are made +# available under the terms of the Eclipse Public License 2.0 +# which is available at https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 +############################################################################ bin.includes = .,\ META-INF/,\ about.html,\ @@ -15,5 +14,5 @@ bin.includes = .,\ src.includes = about.html source.. = src/ output.. = bin/ -jre.compilation.profile = J2SE-1.4 +jre.compilation.profile = J2SE-1.3 javacWarnings.. = -assertIdentifier,-enumIdentifier diff --git a/framework/bundles/org.eclipse.ecf.telephony.call/plugin.properties b/framework/bundles/org.eclipse.ecf.telephony.call/plugin.properties index f51321fea..ea06daae0 100644 --- a/framework/bundles/org.eclipse.ecf.telephony.call/plugin.properties +++ b/framework/bundles/org.eclipse.ecf.telephony.call/plugin.properties @@ -1,10 +1,11 @@ ############################################################################ # Copyright (c) 2007 Composent Inc., IBM Corp, and others. -# 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 # +# This program and the accompanying materials are made +# available under the terms of the Eclipse Public License 2.0 +# which is available at https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 ############################################################################ plugin.name=ECF Telephony Call API plugin.provider=Eclipse.org - ECF diff --git a/framework/bundles/org.eclipse.ecf.telephony.call/pom.xml b/framework/bundles/org.eclipse.ecf.telephony.call/pom.xml index 969498248..0065ef107 100644 --- a/framework/bundles/org.eclipse.ecf.telephony.call/pom.xml +++ b/framework/bundles/org.eclipse.ecf.telephony.call/pom.xml @@ -10,6 +10,6 @@ </parent> <groupId>org.eclipse.ecf</groupId> <artifactId>org.eclipse.ecf.telephony.call</artifactId> - <version>2.0.100-SNAPSHOT</version> + <version>2.0.200-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/framework/bundles/org.eclipse.ecf.telephony.call/src/org/eclipse/ecf/telephony/call/CallException.java b/framework/bundles/org.eclipse.ecf.telephony.call/src/org/eclipse/ecf/telephony/call/CallException.java index 7381c21ed..85a9d8998 100644 --- a/framework/bundles/org.eclipse.ecf.telephony.call/src/org/eclipse/ecf/telephony/call/CallException.java +++ b/framework/bundles/org.eclipse.ecf.telephony.call/src/org/eclipse/ecf/telephony/call/CallException.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.telephony.call; diff --git a/framework/bundles/org.eclipse.ecf.telephony.call/src/org/eclipse/ecf/telephony/call/CallSessionFailureReason.java b/framework/bundles/org.eclipse.ecf.telephony.call/src/org/eclipse/ecf/telephony/call/CallSessionFailureReason.java index 59f4fd55c..beb6168ce 100644 --- a/framework/bundles/org.eclipse.ecf.telephony.call/src/org/eclipse/ecf/telephony/call/CallSessionFailureReason.java +++ b/framework/bundles/org.eclipse.ecf.telephony.call/src/org/eclipse/ecf/telephony/call/CallSessionFailureReason.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.telephony.call; diff --git a/framework/bundles/org.eclipse.ecf.telephony.call/src/org/eclipse/ecf/telephony/call/CallSessionState.java b/framework/bundles/org.eclipse.ecf.telephony.call/src/org/eclipse/ecf/telephony/call/CallSessionState.java index d37a5e15e..0a0a0780d 100644 --- a/framework/bundles/org.eclipse.ecf.telephony.call/src/org/eclipse/ecf/telephony/call/CallSessionState.java +++ b/framework/bundles/org.eclipse.ecf.telephony.call/src/org/eclipse/ecf/telephony/call/CallSessionState.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.telephony.call; diff --git a/framework/bundles/org.eclipse.ecf.telephony.call/src/org/eclipse/ecf/telephony/call/ICallSession.java b/framework/bundles/org.eclipse.ecf.telephony.call/src/org/eclipse/ecf/telephony/call/ICallSession.java index 57c3b5f98..87194f676 100644 --- a/framework/bundles/org.eclipse.ecf.telephony.call/src/org/eclipse/ecf/telephony/call/ICallSession.java +++ b/framework/bundles/org.eclipse.ecf.telephony.call/src/org/eclipse/ecf/telephony/call/ICallSession.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc.. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc.. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.telephony.call; diff --git a/framework/bundles/org.eclipse.ecf.telephony.call/src/org/eclipse/ecf/telephony/call/ICallSessionContainerAdapter.java b/framework/bundles/org.eclipse.ecf.telephony.call/src/org/eclipse/ecf/telephony/call/ICallSessionContainerAdapter.java index 32df44afe..ba888f22b 100644 --- a/framework/bundles/org.eclipse.ecf.telephony.call/src/org/eclipse/ecf/telephony/call/ICallSessionContainerAdapter.java +++ b/framework/bundles/org.eclipse.ecf.telephony.call/src/org/eclipse/ecf/telephony/call/ICallSessionContainerAdapter.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc.. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc.. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.telephony.call; import java.util.Map; diff --git a/framework/bundles/org.eclipse.ecf.telephony.call/src/org/eclipse/ecf/telephony/call/ICallSessionListener.java b/framework/bundles/org.eclipse.ecf.telephony.call/src/org/eclipse/ecf/telephony/call/ICallSessionListener.java index 44ac7473c..51ab47de7 100644 --- a/framework/bundles/org.eclipse.ecf.telephony.call/src/org/eclipse/ecf/telephony/call/ICallSessionListener.java +++ b/framework/bundles/org.eclipse.ecf.telephony.call/src/org/eclipse/ecf/telephony/call/ICallSessionListener.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc.. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc.. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.telephony.call; import org.eclipse.ecf.telephony.call.events.ICallSessionEvent; diff --git a/framework/bundles/org.eclipse.ecf.telephony.call/src/org/eclipse/ecf/telephony/call/ICallSessionRequestListener.java b/framework/bundles/org.eclipse.ecf.telephony.call/src/org/eclipse/ecf/telephony/call/ICallSessionRequestListener.java index 43a218ade..5f966845a 100644 --- a/framework/bundles/org.eclipse.ecf.telephony.call/src/org/eclipse/ecf/telephony/call/ICallSessionRequestListener.java +++ b/framework/bundles/org.eclipse.ecf.telephony.call/src/org/eclipse/ecf/telephony/call/ICallSessionRequestListener.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.telephony.call; diff --git a/framework/bundles/org.eclipse.ecf.telephony.call/src/org/eclipse/ecf/telephony/call/dtmf/IDTMFCallSessionAdapter.java b/framework/bundles/org.eclipse.ecf.telephony.call/src/org/eclipse/ecf/telephony/call/dtmf/IDTMFCallSessionAdapter.java index 5d91caa2f..6e81fb2c0 100644 --- a/framework/bundles/org.eclipse.ecf.telephony.call/src/org/eclipse/ecf/telephony/call/dtmf/IDTMFCallSessionAdapter.java +++ b/framework/bundles/org.eclipse.ecf.telephony.call/src/org/eclipse/ecf/telephony/call/dtmf/IDTMFCallSessionAdapter.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2008 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.telephony.call.dtmf; diff --git a/framework/bundles/org.eclipse.ecf.telephony.call/src/org/eclipse/ecf/telephony/call/events/ICallSessionEvent.java b/framework/bundles/org.eclipse.ecf.telephony.call/src/org/eclipse/ecf/telephony/call/events/ICallSessionEvent.java index cbddde435..777e46621 100644 --- a/framework/bundles/org.eclipse.ecf.telephony.call/src/org/eclipse/ecf/telephony/call/events/ICallSessionEvent.java +++ b/framework/bundles/org.eclipse.ecf.telephony.call/src/org/eclipse/ecf/telephony/call/events/ICallSessionEvent.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc.. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc.. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.telephony.call.events; import org.eclipse.ecf.telephony.call.CallSessionState; diff --git a/framework/bundles/org.eclipse.ecf.telephony.call/src/org/eclipse/ecf/telephony/call/events/ICallSessionRequestEvent.java b/framework/bundles/org.eclipse.ecf.telephony.call/src/org/eclipse/ecf/telephony/call/events/ICallSessionRequestEvent.java index 2c5a62503..7e0339900 100644 --- a/framework/bundles/org.eclipse.ecf.telephony.call/src/org/eclipse/ecf/telephony/call/events/ICallSessionRequestEvent.java +++ b/framework/bundles/org.eclipse.ecf.telephony.call/src/org/eclipse/ecf/telephony/call/events/ICallSessionRequestEvent.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.telephony.call.events; diff --git a/framework/bundles/org.eclipse.ecf.telephony.call/src/org/eclipse/ecf/telephony/call/service/ICallSessionService.java b/framework/bundles/org.eclipse.ecf.telephony.call/src/org/eclipse/ecf/telephony/call/service/ICallSessionService.java index 60f55f488..43d738472 100644 --- a/framework/bundles/org.eclipse.ecf.telephony.call/src/org/eclipse/ecf/telephony/call/service/ICallSessionService.java +++ b/framework/bundles/org.eclipse.ecf.telephony.call/src/org/eclipse/ecf/telephony/call/service/ICallSessionService.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.telephony.call.service; diff --git a/framework/bundles/org.eclipse.ecf.ui.capabilities/.settings/org.eclipse.pde.prefs b/framework/bundles/org.eclipse.ecf.ui.capabilities/.settings/org.eclipse.pde.prefs index 9d216114c..59d8b401c 100644 --- a/framework/bundles/org.eclipse.ecf.ui.capabilities/.settings/org.eclipse.pde.prefs +++ b/framework/bundles/org.eclipse.ecf.ui.capabilities/.settings/org.eclipse.pde.prefs @@ -1,9 +1,10 @@ -#Sat Apr 24 17:39:11 PDT 2010 compilers.f.unresolved-features=1 compilers.f.unresolved-plugins=1 compilers.incompatible-environment=2 compilers.p.build=1 compilers.p.build.bin.includes=1 +compilers.p.build.encodings=2 +compilers.p.build.java.compiler=2 compilers.p.build.java.compliance=1 compilers.p.build.missing.output=2 compilers.p.build.output.library=1 @@ -11,17 +12,20 @@ compilers.p.build.source.library=1 compilers.p.build.src.includes=1 compilers.p.deprecated=1 compilers.p.discouraged-class=0 +compilers.p.exec-env-too-low=2 compilers.p.internal=1 compilers.p.missing-packages=2 compilers.p.missing-version-export-package=2 compilers.p.missing-version-import-package=2 compilers.p.missing-version-require-bundle=2 compilers.p.no-required-att=0 +compilers.p.no.automatic.module=1 compilers.p.not-externalized-att=2 +compilers.p.service.component.without.lazyactivation=1 compilers.p.unknown-attribute=1 compilers.p.unknown-class=1 compilers.p.unknown-element=1 -compilers.p.unknown-identifier=1 +compilers.p.unknown-identifier=2 compilers.p.unknown-resource=1 compilers.p.unresolved-ex-points=0 compilers.p.unresolved-import=0 diff --git a/framework/bundles/org.eclipse.ecf.ui.capabilities/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.ui.capabilities/META-INF/MANIFEST.MF index 6e5f05a64..62f5f5a69 100644 --- a/framework/bundles/org.eclipse.ecf.ui.capabilities/META-INF/MANIFEST.MF +++ b/framework/bundles/org.eclipse.ecf.ui.capabilities/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin.name Bundle-SymbolicName: org.eclipse.ecf.ui.capabilities;singleton:=true Automatic-Module-Name: org.eclipse.ecf.ui.capabilities -Bundle-Version: 1.0.100.qualifier +Bundle-Version: 1.0.200.qualifier Bundle-Vendor: %plugin.provider Bundle-Localization: plugin Require-Bundle: org.eclipse.ui diff --git a/framework/bundles/org.eclipse.ecf.ui.capabilities/about.html b/framework/bundles/org.eclipse.ecf.ui.capabilities/about.html index 4c79781a5..9f1dc0dd5 100644 --- a/framework/bundles/org.eclipse.ecf.ui.capabilities/about.html +++ b/framework/bundles/org.eclipse.ecf.ui.capabilities/about.html @@ -22,7 +22,7 @@ being redistributed by another party ("Redistributor") and different t apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise indicated below, the terms and conditions of the EPL still apply to any source code in the Content -and such source code may be obtained at <a href="/">http://www.eclipse.org</a>.</p> +and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p> </body> </html>
\ No newline at end of file diff --git a/framework/bundles/org.eclipse.ecf.ui.capabilities/plugin.properties b/framework/bundles/org.eclipse.ecf.ui.capabilities/plugin.properties index 96cc8ac63..6c3041757 100644 --- a/framework/bundles/org.eclipse.ecf.ui.capabilities/plugin.properties +++ b/framework/bundles/org.eclipse.ecf.ui.capabilities/plugin.properties @@ -1,13 +1,12 @@ -################################################################################ +############################################################################ # Copyright (c) 2009 Remy Chi Jian Suen and others. -# 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: -# Remy Chi Jian Suen <remy.suen@gmail.com> - initial API and implementation -################################################################################ +# This program and the accompanying materials are made +# available under the terms of the Eclipse Public License 2.0 +# which is available at https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 +############################################################################ plugin.name = ECF Capabilities plugin.provider = Eclipse.org - ECF diff --git a/framework/bundles/org.eclipse.ecf.ui.capabilities/pom.xml b/framework/bundles/org.eclipse.ecf.ui.capabilities/pom.xml index ed5833abe..071b829d5 100644 --- a/framework/bundles/org.eclipse.ecf.ui.capabilities/pom.xml +++ b/framework/bundles/org.eclipse.ecf.ui.capabilities/pom.xml @@ -10,6 +10,6 @@ </parent> <groupId>org.eclipse.ecf</groupId> <artifactId>org.eclipse.ecf.ui.capabilities</artifactId> - <version>1.0.100-SNAPSHOT</version> + <version>1.0.200-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/framework/bundles/org.eclipse.ecf.ui/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.ui/META-INF/MANIFEST.MF index 0e0c028a3..4ebc05aad 100644 --- a/framework/bundles/org.eclipse.ecf.ui/META-INF/MANIFEST.MF +++ b/framework/bundles/org.eclipse.ecf.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-Name: %plugin.name Bundle-SymbolicName: org.eclipse.ecf.ui;singleton:=true Automatic-Module-Name: org.eclipse.ecf.ui -Bundle-Version: 2.2.100.qualifier +Bundle-Version: 2.2.200.qualifier Bundle-Activator: org.eclipse.ecf.internal.ui.Activator Bundle-Vendor: %plugin.provider Bundle-Localization: plugin diff --git a/framework/bundles/org.eclipse.ecf.ui/about.html b/framework/bundles/org.eclipse.ecf.ui/about.html index 4c79781a5..9f1dc0dd5 100644 --- a/framework/bundles/org.eclipse.ecf.ui/about.html +++ b/framework/bundles/org.eclipse.ecf.ui/about.html @@ -22,7 +22,7 @@ being redistributed by another party ("Redistributor") and different t apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise indicated below, the terms and conditions of the EPL still apply to any source code in the Content -and such source code may be obtained at <a href="/">http://www.eclipse.org</a>.</p> +and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p> </body> </html>
\ No newline at end of file diff --git a/framework/bundles/org.eclipse.ecf.ui/plugin.properties b/framework/bundles/org.eclipse.ecf.ui/plugin.properties index 82975eee2..ba6db351f 100644 --- a/framework/bundles/org.eclipse.ecf.ui/plugin.properties +++ b/framework/bundles/org.eclipse.ecf.ui/plugin.properties @@ -1,10 +1,11 @@ ############################################################################ # Copyright (c) 2007 Composent Inc., IBM Corp, and others. -# 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 # +# This program and the accompanying materials are made +# available under the terms of the Eclipse Public License 2.0 +# which is available at https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 ############################################################################ plugin.name=ECF UI plugin.provider=Eclipse.org - ECF diff --git a/framework/bundles/org.eclipse.ecf.ui/pom.xml b/framework/bundles/org.eclipse.ecf.ui/pom.xml index 3cf6cef46..6646b2f6f 100644 --- a/framework/bundles/org.eclipse.ecf.ui/pom.xml +++ b/framework/bundles/org.eclipse.ecf.ui/pom.xml @@ -10,6 +10,6 @@ </parent> <groupId>org.eclipse.ecf</groupId> <artifactId>org.eclipse.ecf.ui</artifactId> - <version>2.2.100-SNAPSHOT</version> + <version>2.2.200-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/framework/bundles/org.eclipse.ecf.ui/schema/configurationWizards.exsd b/framework/bundles/org.eclipse.ecf.ui/schema/configurationWizards.exsd index f7bd6d5b1..752720831 100644 --- a/framework/bundles/org.eclipse.ecf.ui/schema/configurationWizards.exsd +++ b/framework/bundles/org.eclipse.ecf.ui/schema/configurationWizards.exsd @@ -1,6 +1,6 @@ <?xml version='1.0' encoding='UTF-8'?> <!-- Schema file written by PDE --> -<schema targetNamespace="org.eclipse.ecf.ui"> +<schema targetNamespace="org.eclipse.ecf.ui" xmlns="http://www.w3.org/2001/XMLSchema"> <annotation> <appInfo> <meta.schema plugin="org.eclipse.ecf.ui" id="configurationWizards" name="ECF Configuration Wizards"/> @@ -12,6 +12,11 @@ instances. </annotation> <element name="extension"> + <annotation> + <appInfo> + <meta.element /> + </appInfo> + </annotation> <complexType> <choice minOccurs="0" maxOccurs="unbounded"> <element ref="category"/> @@ -190,8 +195,6 @@ of the export engine functionality. </wizard> </extension> </pre> - - </documentation> </annotation> @@ -211,58 +214,45 @@ of the export engine functionality. */ public interface IConfigurationWizard extends IWizard { - /** - * Initialize the wizard with the workbench and the desired container type - * description - * - * @param workbench - * the workbench for the wizard. Will not be null. - * @param description - * the {@link ContainerTypeDescription} to use to - * create/configure the new IContainer instance - */ - public void init(IWorkbench workbench, - ContainerTypeDescription description); + /** + * Initialize the wizard with the workbench and the desired container type + * description + * + * @param workbench + * the workbench for the wizard. Will not be null. + * @param description + * the {@link ContainerTypeDescription} to use to + * create/configure the new IContainer instance + */ + public void init(IWorkbench workbench, + ContainerTypeDescription description); - /** - * Get result of configuration. - * - * @return ContainerHolder the result of the configuration. If null, the container could not be - * created. - */ - public ContainerHolder getConfigurationResult(); + /** + * Get result of configuration. + * + * @return ContainerHolder the result of the configuration. If null, the container could not be + * created. + */ + public ContainerHolder getConfigurationResult(); } </pre> - </documentation> </annotation> - <annotation> - <appInfo> - <meta.section type="implementation"/> - </appInfo> - <documentation> - - </documentation> - </annotation> <annotation> <appInfo> <meta.section type="copyright"/> </appInfo> <documentation> - /**************************************************************************** - * Copyright (c) 2004 Composent, Inc. and others. - * 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: - * Composent, Inc. - initial API and implementation - *****************************************************************************/ + Copyright (c) 2004 Composent, Inc. and others. + +This program and the accompanying materials are made +available under the terms of the Eclipse Public License 2.0 +which is available at https://www.eclipse.org/legal/epl-2.0/ +SPDX-License-Identifier: EPL-2.0 </documentation> </annotation> diff --git a/framework/bundles/org.eclipse.ecf.ui/schema/connectWizards.exsd b/framework/bundles/org.eclipse.ecf.ui/schema/connectWizards.exsd index ff3a2b3e5..c09725919 100644 --- a/framework/bundles/org.eclipse.ecf.ui/schema/connectWizards.exsd +++ b/framework/bundles/org.eclipse.ecf.ui/schema/connectWizards.exsd @@ -1,6 +1,6 @@ <?xml version='1.0' encoding='UTF-8'?> <!-- Schema file written by PDE --> -<schema targetNamespace="org.eclipse.ecf.ui"> +<schema targetNamespace="org.eclipse.ecf.ui" xmlns="http://www.w3.org/2001/XMLSchema"> <annotation> <appInfo> <meta.schema plugin="org.eclipse.ecf.ui" id="connectWizards" name="ECF Connect Wizard"/> @@ -12,6 +12,11 @@ instances. </annotation> <element name="extension"> + <annotation> + <appInfo> + <meta.element /> + </appInfo> + </annotation> <complexType> <choice minOccurs="0" maxOccurs="unbounded"> <element ref="category"/> @@ -190,7 +195,6 @@ of the export engine functionality. </wizard> </extension> </pre> - </documentation> </annotation> @@ -210,48 +214,34 @@ of the export engine functionality. */ public interface IConnectWizard extends IWizard { - /** - * Initialize the connect wizard. - * - * @param workbench - * the currently working workbench instance. Will not be null. - * @param container - * the container that is to be connected. Will not be null. - */ - public void init(IWorkbench workbench, IContainer container); + /** + * Initialize the connect wizard. + * + * @param workbench + * the currently working workbench instance. Will not be null. + * @param container + * the container that is to be connected. Will not be null. + */ + public void init(IWorkbench workbench, IContainer container); } </pre> - - </documentation> </annotation> - <annotation> - <appInfo> - <meta.section type="implementation"/> - </appInfo> - <documentation> - - </documentation> - </annotation> <annotation> <appInfo> <meta.section type="copyright"/> </appInfo> <documentation> - /**************************************************************************** - * Copyright (c) 2004 Composent, Inc. and others. - * 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: - * Composent, Inc. - initial API and implementation - *****************************************************************************/ + Copyright (c) 2004 Composent, Inc. and others. + +This program and the accompanying materials are made +available under the terms of the Eclipse Public License 2.0 +which is available at https://www.eclipse.org/legal/epl-2.0/ +SPDX-License-Identifier: EPL-2.0 </documentation> </annotation> diff --git a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/internal/ui/Activator.java b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/internal/ui/Activator.java index 136a75747..7cdab5e80 100644 --- a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/internal/ui/Activator.java +++ b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/internal/ui/Activator.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004, 2007 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.internal.ui; diff --git a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/internal/ui/CategoryPreferencePage.java b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/internal/ui/CategoryPreferencePage.java index 13e776865..e9d5b6149 100644 --- a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/internal/ui/CategoryPreferencePage.java +++ b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/internal/ui/CategoryPreferencePage.java @@ -1,14 +1,16 @@ -/******************************************************************************* +/**************************************************************************** * Copyright (c) 2007 Chris Aniszczyk and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Chris Aniszczyk <caniszczyk@gmail.com> - initial API and implementation - * Jörn Dinkla <devnull@dinkla.com> - bug 192574 - ******************************************************************************/ +Binary file (standard input) matches + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.internal.ui; import org.eclipse.jface.preference.PreferencePage; diff --git a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/internal/ui/IImageFiles.java b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/internal/ui/IImageFiles.java index 3e22687bb..a3e21827a 100644 --- a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/internal/ui/IImageFiles.java +++ b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/internal/ui/IImageFiles.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004, 2007 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.internal.ui; diff --git a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/internal/ui/Messages.java b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/internal/ui/Messages.java index 8a589d73e..01406bff4 100644 --- a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/internal/ui/Messages.java +++ b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/internal/ui/Messages.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.internal.ui; diff --git a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/internal/ui/UIDebugOptions.java b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/internal/ui/UIDebugOptions.java index d68090d0b..03256a743 100644 --- a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/internal/ui/UIDebugOptions.java +++ b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/internal/ui/UIDebugOptions.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.internal.ui; diff --git a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/internal/ui/UIPreferenceInitializer.java b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/internal/ui/UIPreferenceInitializer.java index b9992a17d..1415892f5 100644 --- a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/internal/ui/UIPreferenceInitializer.java +++ b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/internal/ui/UIPreferenceInitializer.java @@ -1,13 +1,15 @@ -/******************************************************************************* +/**************************************************************************** * Copyright (c) 2004, 2007 Remy Suen, Composent, Inc., and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Remy Suen <remy.suen@gmail.com> - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.internal.ui; import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer; diff --git a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/internal/ui/actions/SelectProviderAction.java b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/internal/ui/actions/SelectProviderAction.java index f0083ae53..02d341f99 100644 --- a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/internal/ui/actions/SelectProviderAction.java +++ b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/internal/ui/actions/SelectProviderAction.java @@ -1,14 +1,16 @@ -/******************************************************************************* +/**************************************************************************** * Copyright (c) 2007 Remy Suen, Composent, Inc., and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Remy Suen <remy.suen@gmail.com> - initial API and implementation * Scott Lewis <slewis@composent.com> - error checking - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.internal.ui.actions; import java.util.*; diff --git a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/internal/ui/messages.properties b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/internal/ui/messages.properties index 1839819a5..972c35a86 100644 --- a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/internal/ui/messages.properties +++ b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/internal/ui/messages.properties @@ -1,13 +1,12 @@ -################################################################################ +############################################################################ # Copyright (c) 2007 Composent, Inc. and others. -# 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: -# Composent, Inc. - initial API and implementation -################################################################################ +# This program and the accompanying materials are made +# available under the terms of the Eclipse Public License 2.0 +# which is available at https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 +############################################################################ ########################## # Messages for EN locale # diff --git a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/internal/ui/perspectives/CommunicationPerspective.java b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/internal/ui/perspectives/CommunicationPerspective.java index bd523a1b4..1336eaf15 100644 --- a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/internal/ui/perspectives/CommunicationPerspective.java +++ b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/internal/ui/perspectives/CommunicationPerspective.java @@ -1,13 +1,15 @@ -/******************************************************************************* +/**************************************************************************** * Copyright (c) 2000, 2007 IBM Corporation and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * IBM Corporation - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.internal.ui.perspectives; import org.eclipse.ui.*; diff --git a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/internal/ui/wizards/Category.java b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/internal/ui/wizards/Category.java index c7ea537e5..0e0acb7a7 100644 --- a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/internal/ui/wizards/Category.java +++ b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/internal/ui/wizards/Category.java @@ -1,13 +1,15 @@ -/******************************************************************************* +/**************************************************************************** * Copyright (c) 2000, 2006 IBM Corporation and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * IBM Corporation - initial API and implementation - *******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.internal.ui.wizards; import java.util.ArrayList; diff --git a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/internal/ui/wizards/ConfigurationWizardNode.java b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/internal/ui/wizards/ConfigurationWizardNode.java index 8f49f19fe..4706d2bdd 100644 --- a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/internal/ui/wizards/ConfigurationWizardNode.java +++ b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/internal/ui/wizards/ConfigurationWizardNode.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.internal.ui.wizards; diff --git a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/internal/ui/wizards/ConnectWizardNode.java b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/internal/ui/wizards/ConnectWizardNode.java index 38c106661..16a1316a5 100644 --- a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/internal/ui/wizards/ConnectWizardNode.java +++ b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/internal/ui/wizards/ConnectWizardNode.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.internal.ui.wizards; diff --git a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/internal/ui/wizards/IWizardRegistryConstants.java b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/internal/ui/wizards/IWizardRegistryConstants.java index e0e6763ab..24670b84e 100644 --- a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/internal/ui/wizards/IWizardRegistryConstants.java +++ b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/internal/ui/wizards/IWizardRegistryConstants.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004, 2007 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.internal.ui.wizards; diff --git a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/internal/ui/wizards/RegistryReader.java b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/internal/ui/wizards/RegistryReader.java index b6fe238fb..887dee5ac 100644 --- a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/internal/ui/wizards/RegistryReader.java +++ b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/internal/ui/wizards/RegistryReader.java @@ -1,13 +1,15 @@ -/******************************************************************************* +/**************************************************************************** * Copyright (c) 2000, 2006 IBM Corporation and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * IBM Corporation - initial API and implementation - *******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.internal.ui.wizards; import java.util.*; diff --git a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/internal/ui/wizards/WizardActivityFilter.java b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/internal/ui/wizards/WizardActivityFilter.java index 763561f82..eb828560a 100644 --- a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/internal/ui/wizards/WizardActivityFilter.java +++ b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/internal/ui/wizards/WizardActivityFilter.java @@ -1,13 +1,15 @@ -/******************************************************************************* +/**************************************************************************** * Copyright (c) 2000, 2006 IBM Corporation and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * IBM Corporation - initial API and implementation - *******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.internal.ui.wizards; import org.eclipse.jface.viewers.AbstractTreeViewer; diff --git a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/internal/ui/wizards/WizardCollectionElement.java b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/internal/ui/wizards/WizardCollectionElement.java index 235c0382d..15a901408 100644 --- a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/internal/ui/wizards/WizardCollectionElement.java +++ b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/internal/ui/wizards/WizardCollectionElement.java @@ -1,13 +1,15 @@ -/******************************************************************************* +/**************************************************************************** * Copyright (c) 2000, 2006 IBM Corporation and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * IBM Corporation - initial API and implementation - *******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.internal.ui.wizards; import java.util.Iterator; diff --git a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/internal/ui/wizards/WizardContentProvider.java b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/internal/ui/wizards/WizardContentProvider.java index bdc9d1444..b5120f624 100644 --- a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/internal/ui/wizards/WizardContentProvider.java +++ b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/internal/ui/wizards/WizardContentProvider.java @@ -1,13 +1,15 @@ -/******************************************************************************* +/**************************************************************************** * Copyright (c) 2000, 2006 IBM Corporation and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * IBM Corporation - initial API and implementation - *******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.internal.ui.wizards; import java.util.ArrayList; diff --git a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/internal/ui/wizards/WizardNode.java b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/internal/ui/wizards/WizardNode.java index b9e95b148..c3cce4f0f 100644 --- a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/internal/ui/wizards/WizardNode.java +++ b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/internal/ui/wizards/WizardNode.java @@ -1,13 +1,15 @@ -/******************************************************************************* +/**************************************************************************** * Copyright (c) 2000, 2006 IBM Corporation and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * IBM Corporation - initial API and implementation - *******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.internal.ui.wizards; import org.eclipse.core.runtime.*; diff --git a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/internal/ui/wizards/WizardsRegistryReader.java b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/internal/ui/wizards/WizardsRegistryReader.java index ea935c8d4..d05196024 100644 --- a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/internal/ui/wizards/WizardsRegistryReader.java +++ b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/internal/ui/wizards/WizardsRegistryReader.java @@ -1,13 +1,15 @@ -/******************************************************************************* +/**************************************************************************** * Copyright (c) 2000, 2006 IBM Corporation and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * IBM Corporation - initial API and implementation - *******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.internal.ui.wizards; import java.util.*; diff --git a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/internal/ui/wizards/WorkbenchLabelProvider.java b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/internal/ui/wizards/WorkbenchLabelProvider.java index 89946cce9..2bf4b3e6d 100644 --- a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/internal/ui/wizards/WorkbenchLabelProvider.java +++ b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/internal/ui/wizards/WorkbenchLabelProvider.java @@ -1,13 +1,15 @@ -/******************************************************************************* +/**************************************************************************** * Copyright (c) 2000, 2006 IBM Corporation and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * IBM Corporation - initial API and implementation - *******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.internal.ui.wizards; import org.eclipse.core.runtime.Assert; diff --git a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/internal/ui/wizards/WorkbenchWizardElement.java b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/internal/ui/wizards/WorkbenchWizardElement.java index 97de84fd3..540f4521f 100644 --- a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/internal/ui/wizards/WorkbenchWizardElement.java +++ b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/internal/ui/wizards/WorkbenchWizardElement.java @@ -1,13 +1,15 @@ -/******************************************************************************* +/**************************************************************************** * Copyright (c) 2000, 2006 IBM Corporation and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * IBM Corporation - initial API and implementation - *******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.internal.ui.wizards; import org.eclipse.core.runtime.*; diff --git a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/ContainerConfigurationResult.java b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/ContainerConfigurationResult.java index 8dbfd0ae9..bf50ae91a 100644 --- a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/ContainerConfigurationResult.java +++ b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/ContainerConfigurationResult.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.ui; diff --git a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/IConfigurationWizard.java b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/IConfigurationWizard.java index ac58c0ac8..004b6b803 100644 --- a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/IConfigurationWizard.java +++ b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/IConfigurationWizard.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.ui; diff --git a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/IConnectWizard.java b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/IConnectWizard.java index 24b2eee55..020a69379 100644 --- a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/IConnectWizard.java +++ b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/IConnectWizard.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004, 2009 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.ui; diff --git a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/SharedImages.java b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/SharedImages.java index 335019e8a..3bf3be870 100644 --- a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/SharedImages.java +++ b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/SharedImages.java @@ -1,13 +1,15 @@ -/******************************************************************************* +/**************************************************************************** * Copyright (c) 2007 Remy Suen, Composent, Inc., and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Remy Suen <remy.suen@gmail.com> - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.ui; import org.eclipse.ecf.internal.ui.Activator; diff --git a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/actions/AsynchContainerConnectAction.java b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/actions/AsynchContainerConnectAction.java index 8eeaaaab1..b9c1e71c1 100644 --- a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/actions/AsynchContainerConnectAction.java +++ b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/actions/AsynchContainerConnectAction.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.ui.actions; import org.eclipse.core.runtime.*; diff --git a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/dialogs/ConfigurationWizardDialog.java b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/dialogs/ConfigurationWizardDialog.java index 3de82143d..2ed95543b 100644 --- a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/dialogs/ConfigurationWizardDialog.java +++ b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/dialogs/ConfigurationWizardDialog.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.ui.dialogs; diff --git a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/dialogs/ContainerConnectErrorDialog.java b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/dialogs/ContainerConnectErrorDialog.java index e11fb1f19..fd58a0e70 100644 --- a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/dialogs/ContainerConnectErrorDialog.java +++ b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/dialogs/ContainerConnectErrorDialog.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.ui.dialogs; diff --git a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/dialogs/ContainerConnectWizardDialog.java b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/dialogs/ContainerConnectWizardDialog.java index 23b59d10e..e385b5214 100644 --- a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/dialogs/ContainerConnectWizardDialog.java +++ b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/dialogs/ContainerConnectWizardDialog.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.ui.dialogs; diff --git a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/dialogs/ContainerCreateErrorDialog.java b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/dialogs/ContainerCreateErrorDialog.java index e673c9502..e67db3b2e 100644 --- a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/dialogs/ContainerCreateErrorDialog.java +++ b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/dialogs/ContainerCreateErrorDialog.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.ui.dialogs; diff --git a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/dialogs/IDCreateErrorDialog.java b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/dialogs/IDCreateErrorDialog.java index 7136c81c7..0a0623a89 100644 --- a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/dialogs/IDCreateErrorDialog.java +++ b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/dialogs/IDCreateErrorDialog.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.ui.dialogs; diff --git a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/hyperlink/AbstractURLHyperlink.java b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/hyperlink/AbstractURLHyperlink.java index 878abe92c..a29c2eaa0 100644 --- a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/hyperlink/AbstractURLHyperlink.java +++ b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/hyperlink/AbstractURLHyperlink.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.ui.hyperlink; diff --git a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/hyperlink/AbstractURLHyperlinkDetector.java b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/hyperlink/AbstractURLHyperlinkDetector.java index 6ac4e1ecf..7841e535c 100644 --- a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/hyperlink/AbstractURLHyperlinkDetector.java +++ b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/hyperlink/AbstractURLHyperlinkDetector.java @@ -1,13 +1,15 @@ /**************************************************************************** * Copyright (c) 2004, 2007 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation * Abner Ballardo <modlost@modlost.net> - bug 198731 + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.ui.hyperlink; diff --git a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/screencapture/IImageSender.java b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/screencapture/IImageSender.java index e98b3cf5b..c4e9c5d5f 100644 --- a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/screencapture/IImageSender.java +++ b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/screencapture/IImageSender.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2007 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.ui.screencapture; diff --git a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/screencapture/ImageWrapper.java b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/screencapture/ImageWrapper.java index 187b1bdfd..edac2cf2e 100644 --- a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/screencapture/ImageWrapper.java +++ b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/screencapture/ImageWrapper.java @@ -1,13 +1,15 @@ -/******************************************************************************* +/**************************************************************************** * Copyright (c) 2004, 2007 Remy Suen, Composent, Inc., and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Remy Suen <remy.suen@gmail.com> - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.ui.screencapture; import java.io.Serializable; diff --git a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/screencapture/ScreenCaptureConfirmationDialog.java b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/screencapture/ScreenCaptureConfirmationDialog.java index ad57003a5..cde63358e 100644 --- a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/screencapture/ScreenCaptureConfirmationDialog.java +++ b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/screencapture/ScreenCaptureConfirmationDialog.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2007 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.ui.screencapture; diff --git a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/screencapture/ScreenCaptureJob.java b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/screencapture/ScreenCaptureJob.java index f6217be27..0fd076275 100644 --- a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/screencapture/ScreenCaptureJob.java +++ b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/screencapture/ScreenCaptureJob.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2007 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.ui.screencapture; diff --git a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/screencapture/ScreenCaptureUtil.java b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/screencapture/ScreenCaptureUtil.java index 1aff38a4a..a4e6b92fc 100644 --- a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/screencapture/ScreenCaptureUtil.java +++ b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/screencapture/ScreenCaptureUtil.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2007 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.ui.screencapture; diff --git a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/screencapture/ShowImageShell.java b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/screencapture/ShowImageShell.java index 259b7e121..f8e6d4a41 100644 --- a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/screencapture/ShowImageShell.java +++ b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/screencapture/ShowImageShell.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2007, 2009 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.ui.screencapture; diff --git a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/util/PasswordCacheHelper.java b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/util/PasswordCacheHelper.java index 3d47a5884..25bbb80be 100644 --- a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/util/PasswordCacheHelper.java +++ b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/util/PasswordCacheHelper.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.ui.util; diff --git a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/wizards/AbstractConnectWizardPage.java b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/wizards/AbstractConnectWizardPage.java index 5e6e8db36..8072453bf 100644 --- a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/wizards/AbstractConnectWizardPage.java +++ b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/wizards/AbstractConnectWizardPage.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2006 Remy Suen, Composent, Inc., and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Remy Suen <remy.suen@gmail.com> - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.ui.wizards; diff --git a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/wizards/ConfigurationWizardSelectionPage.java b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/wizards/ConfigurationWizardSelectionPage.java index 947e352fc..b69892500 100644 --- a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/wizards/ConfigurationWizardSelectionPage.java +++ b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/wizards/ConfigurationWizardSelectionPage.java @@ -1,13 +1,15 @@ -/******************************************************************************* +/**************************************************************************** * Copyright (c) 2000, 2006 IBM Corporation, Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * IBM Corporation - initial API and implementation - *******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.ui.wizards; import java.util.ArrayList; diff --git a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/wizards/ConfigurationWizardSelectionWizard.java b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/wizards/ConfigurationWizardSelectionWizard.java index 12f93beb1..dc77608c2 100644 --- a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/wizards/ConfigurationWizardSelectionWizard.java +++ b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/wizards/ConfigurationWizardSelectionWizard.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.ui.wizards; diff --git a/framework/bundles/org.eclipse.ecf/.project b/framework/bundles/org.eclipse.ecf/.project index 9c23f0c25..d4d083ad5 100644 --- a/framework/bundles/org.eclipse.ecf/.project +++ b/framework/bundles/org.eclipse.ecf/.project @@ -29,7 +29,6 @@ <natures> <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> - <nature>com.composent.client.collabnature</nature> <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> </natures> </projectDescription> diff --git a/framework/bundles/org.eclipse.ecf/.settings/org.eclipse.jdt.core.prefs b/framework/bundles/org.eclipse.ecf/.settings/org.eclipse.jdt.core.prefs index dec3ebdd5..ff7531f69 100644 --- a/framework/bundles/org.eclipse.ecf/.settings/org.eclipse.jdt.core.prefs +++ b/framework/bundles/org.eclipse.ecf/.settings/org.eclipse.jdt.core.prefs @@ -6,6 +6,15 @@ 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.annotation.inheritNullAnnotations=disabled +org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore +org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull +org.eclipse.jdt.core.compiler.annotation.nonnull.secondary= +org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault +org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary= +org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable +org.eclipse.jdt.core.compiler.annotation.nullable.secondary= +org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve @@ -15,17 +24,20 @@ 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.APILeak=warning +org.eclipse.jdt.core.compiler.problem.annotatedTypeArgumentToUnannotated=info org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.autoboxing=ignore org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning org.eclipse.jdt.core.compiler.problem.deadCode=warning -org.eclipse.jdt.core.compiler.problem.deprecation=warning +org.eclipse.jdt.core.compiler.problem.deprecation=ignore org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore org.eclipse.jdt.core.compiler.problem.emptyStatement=warning org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled org.eclipse.jdt.core.compiler.problem.fieldHiding=warning @@ -44,7 +56,9 @@ org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled 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.missingDefaultCase=ignore org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore +org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled @@ -60,13 +74,22 @@ org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignor 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.nonnullParameterAnnotationDropped=warning +org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning +org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error org.eclipse.jdt.core.compiler.problem.nullReference=warning +org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error +org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore +org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore +org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore +org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore +org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore @@ -74,19 +97,28 @@ org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled +org.eclipse.jdt.core.compiler.problem.suppressWarningsNotFullyAnalysed=info +org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning +org.eclipse.jdt.core.compiler.problem.terminalDeprecation=warning org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore +org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning +org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=warning +org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled +org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=info 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.unstableAutoModuleName=warning org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=enabled +org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedImport=error org.eclipse.jdt.core.compiler.problem.unusedLabel=warning org.eclipse.jdt.core.compiler.problem.unusedLocal=warning @@ -96,7 +128,8 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference= org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=enabled org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=enabled org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning -org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning +org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore +org.eclipse.jdt.core.compiler.problem.unusedWarningToken=ignore org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.source=1.5 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false diff --git a/framework/bundles/org.eclipse.ecf/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf/META-INF/MANIFEST.MF index 9a25cf6a0..d8659d380 100644 --- a/framework/bundles/org.eclipse.ecf/META-INF/MANIFEST.MF +++ b/framework/bundles/org.eclipse.ecf/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-Name: %plugin.name Bundle-SymbolicName: org.eclipse.ecf;singleton:=true Automatic-Module-Name: org.eclipse.ecf -Bundle-Version: 3.9.3.qualifier +Bundle-Version: 3.10.0.qualifier Bundle-Activator: org.eclipse.ecf.internal.core.ECFPlugin Bundle-Vendor: %plugin.provider Bundle-Localization: plugin @@ -12,7 +12,7 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5 Export-Package: org.eclipse.ecf.core;version="3.0.0", org.eclipse.ecf.core.events;version="3.1.0", org.eclipse.ecf.core.jobs;version="1.1.0", - org.eclipse.ecf.core.provider;version="3.2.0", + org.eclipse.ecf.core.provider;version="3.3.0", org.eclipse.ecf.core.security;version="3.1.0", org.eclipse.ecf.core.start;version="3.1.0", org.eclipse.ecf.core.status;version="1.1.0", @@ -22,7 +22,6 @@ Export-Package: org.eclipse.ecf.core;version="3.0.0", org.eclipse.ecf.internal.core;x-internal:=true Import-Package: org.eclipse.core.runtime.jobs, org.eclipse.equinox.concurrent.future;version="[1.0.0,2.0.0)";x-installation:=greedy, - org.osgi.dto;version="1.0.0", org.osgi.framework;version="[1.3.0,2.0.0)", org.osgi.service.log;version="[1.3.0,2.0.0)", org.osgi.util.tracker;version="[1.3.2,2.0.0)" diff --git a/framework/bundles/org.eclipse.ecf/OSGI-INF/permissions.perm b/framework/bundles/org.eclipse.ecf/OSGI-INF/permissions.perm new file mode 100644 index 000000000..82aa9a47f --- /dev/null +++ b/framework/bundles/org.eclipse.ecf/OSGI-INF/permissions.perm @@ -0,0 +1,39 @@ +# Requires +(org.osgi.framework.BundlePermission "org.eclipse.equinox.common" "require") +(org.osgi.framework.BundlePermission "org.eclipse.equinox.registry" "require") +(org.osgi.framework.BundlePermission "org.eclipse.ecf.identity" "require") +(org.osgi.framework.BundlePermission "org.eclipse.ecf" "provide") +# Imports +(org.osgi.framework.PackagePermission "org.eclipse.core.runtime.jobs" "import") +(org.osgi.framework.PackagePermission "org.eclipse.equinox.concurrent.future" "import") +(org.osgi.framework.PackagePermission "org.osgi.framework" "import") +(org.osgi.framework.PackagePermission "org.osgi.service.log" "import") +(org.osgi.framework.PackagePermission "org.osgi.util.tracker" "import") +# Exports +(org.osgi.framework.PackagePermission "org.eclipse.ecf.core" "export") +(org.osgi.framework.PackagePermission "org.eclipse.ecf.core.events" "export") +(org.osgi.framework.PackagePermission "org.eclipse.ecf.core.jobs" "export") +(org.osgi.framework.PackagePermission "org.eclipse.ecf.core.provider" "export") +(org.osgi.framework.PackagePermission "org.eclipse.ecf.core.security" "export") +(org.osgi.framework.PackagePermission "org.eclipse.ecf.core.start" "export") +(org.osgi.framework.PackagePermission "org.eclipse.ecf.core.status" "export") +(org.osgi.framework.PackagePermission "org.eclipse.ecf.core.user" "export") +(org.osgi.framework.PackagePermission "org.eclipse.ecf.core.util" "export") +(org.osgi.framework.PackagePermission "org.eclipse.ecf.core.util.reflection" "export") + +# services +(org.osgi.framework.ServicePermission "*" "get,register") +# +(java.io.SerializablePermission "enableSubclassImplementation") +(java.io.SerializablePermission "enableSubstitution") +(org.osgi.framework.AdaptPermission "*" "adapt") +(org.osgi.framework.AdminPermission "*" "*") +(org.eclipse.equinox.log.LogPermission "*" "log") +(java.util.PropertyPermission "*" "read") +(java.lang.RuntimePermission "*") +(java.net.SocketPermission "*" "accept") +(java.net.SocketPermission "*" "listen") +(java.net.SocketPermission "*" "connect") +(java.net.SocketPermission "*" "resolve") +(java.net.SocketPermission "*" "listen,resolve") +(org.osgi.framework.CapabilityPermission "*" "provide") diff --git a/framework/bundles/org.eclipse.ecf/about.html b/framework/bundles/org.eclipse.ecf/about.html index 4c79781a5..9f1dc0dd5 100644 --- a/framework/bundles/org.eclipse.ecf/about.html +++ b/framework/bundles/org.eclipse.ecf/about.html @@ -22,7 +22,7 @@ being redistributed by another party ("Redistributor") and different t apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise indicated below, the terms and conditions of the EPL still apply to any source code in the Content -and such source code may be obtained at <a href="/">http://www.eclipse.org</a>.</p> +and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p> </body> </html>
\ No newline at end of file diff --git a/framework/bundles/org.eclipse.ecf/about.properties b/framework/bundles/org.eclipse.ecf/about.properties index edc7fc3c9..9e274b830 100644 --- a/framework/bundles/org.eclipse.ecf/about.properties +++ b/framework/bundles/org.eclipse.ecf/about.properties @@ -1,12 +1,12 @@ -########################################################################## -# Copyright (c) 2004, 2007 Composent, Inc. and others. 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 +############################################################################ +# Copyright (c) 2004,2007 Composent, Inc. and others. # -# Contributors: Composent, Inc. - initial API and implementation -########################################################################## +# This program and the accompanying materials are made +# available under the terms of the Eclipse Public License 2.0 +# which is available at https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 +############################################################################ featureName=Eclipse Communication Framework (ECF) featureText=Eclipse Communication Framework (ECF)\n\ diff --git a/framework/bundles/org.eclipse.ecf/build.properties b/framework/bundles/org.eclipse.ecf/build.properties index 0ee7efb80..ad23da442 100644 --- a/framework/bundles/org.eclipse.ecf/build.properties +++ b/framework/bundles/org.eclipse.ecf/build.properties @@ -1,13 +1,12 @@ -############################################################################### +############################################################################ # Copyright (c) 2004, 2006. Composent, Inc. and others. -# 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: -# Composent Inc. - initial API and implementation -############################################################################### +# +# This program and the accompanying materials are made +# available under the terms of the Eclipse Public License 2.0 +# which is available at https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 +############################################################################ source.. = src/ output.. = bin/ bin.includes = META-INF/,\ @@ -18,7 +17,8 @@ bin.includes = META-INF/,\ schema/,\ about.properties,\ ecf32.png,\ - about.ini + about.ini,\ + OSGI-INF/ src.includes = about.html,\ schema/,\ about.properties,\ diff --git a/framework/bundles/org.eclipse.ecf/javadoc.xml b/framework/bundles/org.eclipse.ecf/javadoc.xml index f8242f0d8..50aa923f6 100644 --- a/framework/bundles/org.eclipse.ecf/javadoc.xml +++ b/framework/bundles/org.eclipse.ecf/javadoc.xml @@ -18,7 +18,7 @@ author="false" classpathref="files.classpath" destdir="${output}" - doctitle="Eclipse Communication Framework (ECF) 3.13.5" + doctitle="Eclipse Communication Framework (ECF) 3.14.7" nodeprecated="false" nodeprecatedlist="false" noindex="false" diff --git a/framework/bundles/org.eclipse.ecf/plugin.properties b/framework/bundles/org.eclipse.ecf/plugin.properties index b019fea0c..4f2564b0e 100644 --- a/framework/bundles/org.eclipse.ecf/plugin.properties +++ b/framework/bundles/org.eclipse.ecf/plugin.properties @@ -1,10 +1,11 @@ ############################################################################ # Copyright (c) 2010 Composent Inc., IBM and others. -# 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 # +# This program and the accompanying materials are made +# available under the terms of the Eclipse Public License 2.0 +# which is available at https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 ############################################################################ plugin.name=ECF Core API plugin.provider=Eclipse.org - ECF diff --git a/framework/bundles/org.eclipse.ecf/pom.xml b/framework/bundles/org.eclipse.ecf/pom.xml index 2f25d0eeb..7aa20adb0 100644 --- a/framework/bundles/org.eclipse.ecf/pom.xml +++ b/framework/bundles/org.eclipse.ecf/pom.xml @@ -10,6 +10,6 @@ </parent> <groupId>org.eclipse.ecf</groupId> <artifactId>org.eclipse.ecf</artifactId> - <version>3.9.3-SNAPSHOT</version> + <version>3.10.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/framework/bundles/org.eclipse.ecf/schema/container.exsd b/framework/bundles/org.eclipse.ecf/schema/container.exsd index c424608e3..dc47a7f94 100644 --- a/framework/bundles/org.eclipse.ecf/schema/container.exsd +++ b/framework/bundles/org.eclipse.ecf/schema/container.exsd @@ -167,7 +167,13 @@ </appInfo> <documentation> Copyright (c) 2009 Composent, Inc. and others. -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: Composent, Inc. - initial API and implementation. + +This program and the accompanying materials are made +available under the terms of the Eclipse Public License 2.0 +which is available at https://www.eclipse.org/legal/epl-2.0/ + +SPDX-License-Identifier: EPL-2.0 + </documentation> </annotation> diff --git a/framework/bundles/org.eclipse.ecf/schema/containerFactory.exsd b/framework/bundles/org.eclipse.ecf/schema/containerFactory.exsd index 16dc504b4..a41a55b74 100644 --- a/framework/bundles/org.eclipse.ecf/schema/containerFactory.exsd +++ b/framework/bundles/org.eclipse.ecf/schema/containerFactory.exsd @@ -305,7 +305,13 @@ org.eclipse.ecf.provider.generic.GenericContainerInstantiator </appInfo> <documentation> Copyright (c) 2004 Composent, Inc. and others. -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: Composent, Inc. - initial API and implementation. + +This program and the accompanying materials are made +available under the terms of the Eclipse Public License 2.0 +which is available at https://www.eclipse.org/legal/epl-2.0/ + +SPDX-License-Identifier: EPL-2.0 + </documentation> </annotation> diff --git a/framework/bundles/org.eclipse.ecf/schema/start.exsd b/framework/bundles/org.eclipse.ecf/schema/start.exsd index d809ed9c7..d47685d71 100644 --- a/framework/bundles/org.eclipse.ecf/schema/start.exsd +++ b/framework/bundles/org.eclipse.ecf/schema/start.exsd @@ -1,16 +1,21 @@ <?xml version='1.0' encoding='UTF-8'?> <!-- Schema file written by PDE --> -<schema targetNamespace="org.eclipse.ecf"> +<schema targetNamespace="org.eclipse.ecf" xmlns="http://www.w3.org/2001/XMLSchema"> <annotation> <appInfo> <meta.schema plugin="org.eclipse.ecf" id="start" name="ECF start"/> </appInfo> <documentation> - ECF Core Start Extension Point. This extension point (<b>org.eclipse.ecf.start</b>) allows extensions to run upon ECF core bundle startup. Note that extensions will be run when the ECF core bundle (ID: <b>org.eclipse.ecf</b>) is started by the runtime, not necessarily upon platform startup. + ECF Core Start Extension Point. This extension point (<b>org.eclipse.ecf.start</b>) allows extensions to run upon ECF core bundle startup. Note that extensions will be run when the ECF core bundle (ID: <b>org.eclipse.ecf</b>) is started by the runtime, not necessarily upon platform startup. </documentation> </annotation> <element name="extension"> + <annotation> + <appInfo> + <meta.element /> + </appInfo> + </annotation> <complexType> <sequence minOccurs="1" maxOccurs="unbounded"> <element ref="run"/> @@ -152,7 +157,13 @@ public interface IECFStart { </appInfo> <documentation> Copyright (c) 2007 Composent, Inc. and others. -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: Composent, Inc. - initial API and implementation + +This program and the accompanying materials are made +available under the terms of the Eclipse Public License 2.0 +which is available at https://www.eclipse.org/legal/epl-2.0/ + +SPDX-License-Identifier: EPL-2.0 + </documentation> </annotation> diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/AbstractContainer.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/AbstractContainer.java index 6daa6c3fc..21e06d2bb 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/AbstractContainer.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/AbstractContainer.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2006 IBM, Inc and Composent, Inc. 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 - * +/**************************************************************************** + * Copyright (c) 2006 IBM, Inc and Composent, Inc. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Chris Aniszczyk <zx@us.ibm.com> - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core; import java.util.*; @@ -62,17 +65,17 @@ public abstract class AbstractContainer implements IContainer { } } - public Object getAdapter(Class serviceType) { + public <T> T getAdapter(Class<T> serviceType) { if (serviceType == null) return null; if (serviceType.isInstance(this)) { - return this; + return serviceType.cast(this); } ECFPlugin plugin = ECFPlugin.getDefault(); if (plugin == null) return null; IAdapterManager adapterManager = plugin.getAdapterManager(); - return (adapterManager == null) ? null : adapterManager.loadAdapter(this, serviceType.getName()); + return (T) ((adapterManager == null) ? null : adapterManager.loadAdapter(this, serviceType.getName())); } protected String getPasswordFromConnectContext(IConnectContext connectContext) throws ContainerConnectException { diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/AbstractContainerAdapterFactory.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/AbstractContainerAdapterFactory.java index 4bab37a35..d5b0f86c6 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/AbstractContainerAdapterFactory.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/AbstractContainerAdapterFactory.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.core; @@ -25,11 +27,11 @@ public abstract class AbstractContainerAdapterFactory implements IAdapterFactory * @see org.eclipse.core.runtime.IAdapterFactory#getAdapter(java.lang.Object, * java.lang.Class) */ - public Object getAdapter(Object adaptableObject, Class adapterType) { + public <T> T getAdapter(Object adaptableObject, Class<T> adapterType) { if (adaptableObject == null || adapterType == null) return null; if (IContainer.class.isInstance(adaptableObject)) - return getContainerAdapter((IContainer) adaptableObject, adapterType); + return adapterType.cast(getContainerAdapter((IContainer) adaptableObject, adapterType)); return null; } @@ -49,6 +51,6 @@ public abstract class AbstractContainerAdapterFactory implements IAdapterFactory * * @see org.eclipse.core.runtime.IAdapterFactory#getAdapterList() */ - public abstract Class[] getAdapterList(); + public abstract Class<?>[] getAdapterList(); } diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/BaseContainer.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/BaseContainer.java index e35c41a7c..81215d413 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/BaseContainer.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/BaseContainer.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.core; diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ContainerAuthenticationException.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ContainerAuthenticationException.java index 4ffc632d3..8563a6a8d 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ContainerAuthenticationException.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ContainerAuthenticationException.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core; /** diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ContainerConnectException.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ContainerConnectException.java index 220819649..230bfe09b 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ContainerConnectException.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ContainerConnectException.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core; import org.eclipse.core.runtime.IStatus; diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ContainerCreateException.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ContainerCreateException.java index 5ece183d2..13c1a6e5b 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ContainerCreateException.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ContainerCreateException.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core; import org.eclipse.core.runtime.IStatus; diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ContainerFactory.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ContainerFactory.java index 100df7067..68f18cc86 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ContainerFactory.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ContainerFactory.java @@ -1,13 +1,15 @@ -/******************************************************************************* +/**************************************************************************** * Copyright (c) 2004, 2007 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core; import java.util.*; diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ContainerTypeDescription.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ContainerTypeDescription.java index 0efea0df7..fb7d278dd 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ContainerTypeDescription.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ContainerTypeDescription.java @@ -1,13 +1,17 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core; +import java.lang.reflect.InvocationTargetException; import java.util.*; import org.eclipse.core.runtime.*; import org.eclipse.ecf.core.provider.IContainerInstantiator; @@ -121,7 +125,15 @@ public class ContainerTypeDescription { // Load instantiator class Class clazz = Class.forName(instantiatorClass); // Make new instance - instantiator = (IContainerInstantiator) clazz.newInstance(); + try { + instantiator = (IContainerInstantiator) clazz.getDeclaredConstructor().newInstance(); + } catch (InvocationTargetException e) { + throw new ClassNotFoundException("Invocation target exception accessing null constructor for class=" + clazz, e); //$NON-NLS-1$ + } catch (NoSuchMethodException e) { + throw new ClassNotFoundException("No null constructor found on class=" + clazz, e); //$NON-NLS-1$ + } catch (SecurityException e) { + throw new ClassNotFoundException("Security exception accessing null constructor for class=" + clazz, e); //$NON-NLS-1$ + } } /** @@ -168,9 +180,7 @@ public class ContainerTypeDescription { traceAndLogException(IStatus.ERROR, "getSupportedAdapterTypes", e); //$NON-NLS-1$ } List resultList = new ArrayList(); - for (int i = 0; i < result.length; i++) { - resultList.add(result[i]); - } + resultList.addAll(Arrays.asList(result)); if (!resultList.contains(IContainer.class.getName())) resultList.add(IContainer.class.getName()); return (String[]) resultList.toArray(new String[] {}); diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/IContainer.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/IContainer.java index 5c28a4446..5b5618a46 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/IContainer.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/IContainer.java @@ -1,13 +1,15 @@ -/******************************************************************************* +/**************************************************************************** * Copyright (c) 2004, 2007 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core; import org.eclipse.core.runtime.IAdaptable; @@ -158,7 +160,7 @@ public interface IContainer extends IAdaptable, IIdentifiable { * <code>null</code> if this container does not support the given * service */ - public Object getAdapter(Class serviceType); + public <T> T getAdapter(Class<T> serviceType); /** * Dispose this IContainer instance. The container instance will be made diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/IContainerFactory.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/IContainerFactory.java index 2fa6ccee5..a8bc67ff3 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/IContainerFactory.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/IContainerFactory.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core; import java.util.List; diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/IContainerListener.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/IContainerListener.java index eb00c59a7..40b179afb 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/IContainerListener.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/IContainerListener.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core; import org.eclipse.ecf.core.events.IContainerEvent; diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/IContainerManager.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/IContainerManager.java index 6e4f885cb..a8cd2f170 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/IContainerManager.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/IContainerManager.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.core; diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/IContainerManagerListener.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/IContainerManagerListener.java index 3fffc3e1f..5cfa6f0e1 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/IContainerManagerListener.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/IContainerManagerListener.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.core; diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/IReliableContainer.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/IReliableContainer.java index ddd3fa428..4ca8b66d2 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/IReliableContainer.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/IReliableContainer.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core; import org.eclipse.ecf.core.identity.ID; diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/ContainerConnectedEvent.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/ContainerConnectedEvent.java index 79deb2a4b..2c6db38e8 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/ContainerConnectedEvent.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/ContainerConnectedEvent.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.events; import org.eclipse.ecf.core.identity.ID; diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/ContainerConnectingEvent.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/ContainerConnectingEvent.java index e7d68e1bd..3bb0e2942 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/ContainerConnectingEvent.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/ContainerConnectingEvent.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.events; import org.eclipse.ecf.core.identity.ID; diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/ContainerDisconnectedEvent.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/ContainerDisconnectedEvent.java index ce8e6a4f1..8b96f157f 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/ContainerDisconnectedEvent.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/ContainerDisconnectedEvent.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004, 2007 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.core.events; diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/ContainerDisconnectingEvent.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/ContainerDisconnectingEvent.java index c5497bee3..7211c71ac 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/ContainerDisconnectingEvent.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/ContainerDisconnectingEvent.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.events; import org.eclipse.ecf.core.identity.ID; diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/ContainerDisposeEvent.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/ContainerDisposeEvent.java index 583729a14..f968e9fe0 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/ContainerDisposeEvent.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/ContainerDisposeEvent.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.events; import org.eclipse.ecf.core.identity.ID; diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/ContainerEjectedEvent.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/ContainerEjectedEvent.java index 79ee375c7..49c8b54ac 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/ContainerEjectedEvent.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/ContainerEjectedEvent.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.events; import java.io.Serializable; diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/IContainerConnectedEvent.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/IContainerConnectedEvent.java index 22c12d058..766ee7a7f 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/IContainerConnectedEvent.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/IContainerConnectedEvent.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.events; import org.eclipse.ecf.core.identity.ID; diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/IContainerConnectingEvent.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/IContainerConnectingEvent.java index 56f4d4ba4..ee5f84098 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/IContainerConnectingEvent.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/IContainerConnectingEvent.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.events; import org.eclipse.ecf.core.identity.ID; diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/IContainerDisconnectedEvent.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/IContainerDisconnectedEvent.java index 9a33ca736..f78bd017e 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/IContainerDisconnectedEvent.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/IContainerDisconnectedEvent.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.events; import org.eclipse.ecf.core.identity.ID; diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/IContainerDisconnectingEvent.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/IContainerDisconnectingEvent.java index 2f15dfc31..d5a4a2a09 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/IContainerDisconnectingEvent.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/IContainerDisconnectingEvent.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.events; import org.eclipse.ecf.core.identity.ID; diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/IContainerDisposeEvent.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/IContainerDisposeEvent.java index cc8628691..0d72aa38f 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/IContainerDisposeEvent.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/IContainerDisposeEvent.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.events; /** diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/IContainerEjectedEvent.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/IContainerEjectedEvent.java index ca968ef71..3789f2251 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/IContainerEjectedEvent.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/IContainerEjectedEvent.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.events; import java.io.Serializable; diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/IContainerEvent.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/IContainerEvent.java index f8fbe5332..e0e8048f5 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/IContainerEvent.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/IContainerEvent.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.events; import org.eclipse.ecf.core.identity.ID; diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/jobs/JobsExecutor.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/jobs/JobsExecutor.java index 7f832689e..7ca01f8c0 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/jobs/JobsExecutor.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/jobs/JobsExecutor.java @@ -1,13 +1,16 @@ -/******************************************************************************* -* Copyright (c) 2008 EclipseSource, IBM, and others. 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: -* EclipseSource - initial API and implementation -* IBM Corporation - initial API and implementation -******************************************************************************/ +/**************************************************************************** + * Copyright (c) 2008 EclipseSource, IBM, and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * Contributors: + * EclipseSource - initial API and implementation + * IBM Corporation - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.jobs; import org.eclipse.core.runtime.*; diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/provider/BaseContainerInstantiator.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/provider/BaseContainerInstantiator.java index 7a8938cfc..42f57616b 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/provider/BaseContainerInstantiator.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/provider/BaseContainerInstantiator.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.core.provider; @@ -39,7 +41,7 @@ public class BaseContainerInstantiator implements IContainerInstantiator { if (arg instanceof Integer) return (Integer) arg; else if (arg instanceof String) { - return new Integer((String) arg); + return Integer.valueOf((String) arg); } else throw new IllegalArgumentException("arg=" + arg + " is not of integer type"); //$NON-NLS-1$ //$NON-NLS-2$ } diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/provider/BaseRemoteServiceContainerInstantiator.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/provider/BaseRemoteServiceContainerInstantiator.java index 360225432..65b5b012f 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/provider/BaseRemoteServiceContainerInstantiator.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/provider/BaseRemoteServiceContainerInstantiator.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.core.provider; diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/provider/ContainerInstantiatorUtils.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/provider/ContainerInstantiatorUtils.java index 72e469d03..77853c695 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/provider/ContainerInstantiatorUtils.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/provider/ContainerInstantiatorUtils.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.core.provider; diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/provider/ContainerIntentException.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/provider/ContainerIntentException.java index bc1ce5e8b..f6661ed81 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/provider/ContainerIntentException.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/provider/ContainerIntentException.java @@ -1,12 +1,15 @@ -/******************************************************************************* -* Copyright (c) 2018 Composent, Inc. and others. 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: -* Composent, Inc. - initial API and implementation -******************************************************************************/ +/**************************************************************************** + * Copyright (c) 2018 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * Contributors: + * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.provider; import org.eclipse.core.runtime.IStatus; diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/provider/IContainerInstantiator.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/provider/IContainerInstantiator.java index a541110d2..0e1b85f96 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/provider/IContainerInstantiator.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/provider/IContainerInstantiator.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.provider; import org.eclipse.ecf.core.*; diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/provider/IRemoteServiceContainerInstantiator.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/provider/IRemoteServiceContainerInstantiator.java index 00cfc8928..e76905053 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/provider/IRemoteServiceContainerInstantiator.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/provider/IRemoteServiceContainerInstantiator.java @@ -1,12 +1,15 @@ -/******************************************************************************* -* Copyright (c) 2009 Composent, Inc. and others. 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: -* Composent, Inc. - initial API and implementation -******************************************************************************/ +/**************************************************************************** + * Copyright (c) 2009 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * Contributors: + * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.provider; import java.util.Dictionary; diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/security/BooleanCallback.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/security/BooleanCallback.java index f7176aa90..dc4e5f3b2 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/security/BooleanCallback.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/security/BooleanCallback.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.security; /** diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/security/Callback.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/security/Callback.java index dc8ffb803..3a1fa5c84 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/security/Callback.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/security/Callback.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.security; public interface Callback { diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/security/CallbackHandler.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/security/CallbackHandler.java index dad313239..b04a7c4c6 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/security/CallbackHandler.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/security/CallbackHandler.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.security; public interface CallbackHandler { diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/security/ConnectContextFactory.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/security/ConnectContextFactory.java index 18a469ed6..053e0c234 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/security/ConnectContextFactory.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/security/ConnectContextFactory.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.security; import java.io.IOException; diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/security/IConnectContext.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/security/IConnectContext.java index a5bd2b428..3b785d69a 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/security/IConnectContext.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/security/IConnectContext.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.security; /** diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/security/IConnectHandlerPolicy.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/security/IConnectHandlerPolicy.java index bac48a6d1..48427e07c 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/security/IConnectHandlerPolicy.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/security/IConnectHandlerPolicy.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.security; import java.security.PermissionCollection; diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/security/IConnectInitiatorPolicy.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/security/IConnectInitiatorPolicy.java index 43c3d0fdd..f2a61b501 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/security/IConnectInitiatorPolicy.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/security/IConnectInitiatorPolicy.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.security; import org.eclipse.ecf.core.IContainer; diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/security/IContainerPolicy.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/security/IContainerPolicy.java index 6b4019742..3e70a2143 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/security/IContainerPolicy.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/security/IContainerPolicy.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.security; public interface IContainerPolicy { diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/security/NameCallback.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/security/NameCallback.java index 0e0115c95..419aa02ca 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/security/NameCallback.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/security/NameCallback.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.security; /** diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/security/ObjectCallback.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/security/ObjectCallback.java index 72c346d07..ef2360272 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/security/ObjectCallback.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/security/ObjectCallback.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.security; /** diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/security/PassphraseCallback.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/security/PassphraseCallback.java index 67d2c7a60..f3c824257 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/security/PassphraseCallback.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/security/PassphraseCallback.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.security; /** diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/security/PasswordCallback.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/security/PasswordCallback.java index 92a1c81c4..f0f6e78ea 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/security/PasswordCallback.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/security/PasswordCallback.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.security; /** diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/security/UnsupportedCallbackException.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/security/UnsupportedCallbackException.java index 761275b4c..5a2055e3c 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/security/UnsupportedCallbackException.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/security/UnsupportedCallbackException.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.security; public class UnsupportedCallbackException extends Exception { diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/start/ECFStartJob.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/start/ECFStartJob.java index fa07b84ec..a0ce785dd 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/start/ECFStartJob.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/start/ECFStartJob.java @@ -1,13 +1,15 @@ -/******************************************************************************* +/**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.start; import org.eclipse.core.runtime.IProgressMonitor; diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/start/IECFStart.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/start/IECFStart.java index 6e36cd7c0..8fdbc0553 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/start/IECFStart.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/start/IECFStart.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.start; import org.eclipse.core.runtime.IProgressMonitor; diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/status/SerializableMultiStatus.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/status/SerializableMultiStatus.java index 8c30df7cc..f095dd8ad 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/status/SerializableMultiStatus.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/status/SerializableMultiStatus.java @@ -1,12 +1,15 @@ -/******************************************************************************* - * Copyright (c) 2008 EclipseSource and others. 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 +/**************************************************************************** + * Copyright (c) 2008 EclipseSource and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * EclipseSource - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.status; import org.eclipse.core.runtime.*; diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/status/SerializableStatus.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/status/SerializableStatus.java index 16ea24a39..b60075d04 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/status/SerializableStatus.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/status/SerializableStatus.java @@ -1,12 +1,15 @@ -/******************************************************************************* - * Copyright (c) 2008 EclipseSource and others. 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 +/**************************************************************************** + * Copyright (c) 2008 EclipseSource and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * EclipseSource - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.status; import java.io.*; diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/user/IUser.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/user/IUser.java index 56d548e8f..e8aed6dd8 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/user/IUser.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/user/IUser.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.core.user; diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/user/User.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/user/User.java index 0b142b0bc..7330432c7 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/user/User.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/user/User.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.core.user; @@ -88,14 +90,14 @@ public class User implements IUser { this.nickname = nickname; } - public Object getAdapter(Class adapter) { + public <T> T getAdapter(Class<T> adapter) { if (adapter.isInstance(this)) { - return this; + return adapter.cast(this); } IAdapterManager adapterManager = ECFPlugin.getDefault().getAdapterManager(); if (adapterManager == null) return null; - return adapterManager.loadAdapter(this, adapter.getName()); + return (T) adapterManager.loadAdapter(this, adapter.getName()); } public String toString() { diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/AdapterContainerFilter.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/AdapterContainerFilter.java index 2c8b89892..843b32b6b 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/AdapterContainerFilter.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/AdapterContainerFilter.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2008 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.core.util; diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/BundleClassResolver.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/BundleClassResolver.java index 017e42a4e..7f0467bb8 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/BundleClassResolver.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/BundleClassResolver.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2015 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2015 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.util; import java.io.ObjectStreamClass; diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/ClassResolverObjectInputStream.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/ClassResolverObjectInputStream.java index 00d35d6be..553d7b6d7 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/ClassResolverObjectInputStream.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/ClassResolverObjectInputStream.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2015 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2015 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.util; import java.io.*; @@ -80,16 +83,6 @@ public class ClassResolverObjectInputStream extends ObjectInputStream { return this.bundleContext; } - private IClassResolver getClassResolver() { - IClassResolver result = null; - if (this.classResolverST != null) { - this.classResolverST.open(); - result = this.classResolverST.getService(); - this.classResolverST.close(); - } - return result; - } - @SuppressWarnings("unused") @Override protected Class<?> resolveClass(ObjectStreamClass desc) throws IOException, ClassNotFoundException { diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/ConnectedContainerFilter.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/ConnectedContainerFilter.java index 1f4e97891..ef28b50c0 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/ConnectedContainerFilter.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/ConnectedContainerFilter.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2008 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.core.util; diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/ContainerFactoryTracker.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/ContainerFactoryTracker.java index 872b875ca..875198ac2 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/ContainerFactoryTracker.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/ContainerFactoryTracker.java @@ -1,12 +1,15 @@ -/******************************************************************************* -* Copyright (c) 2009 EclipseSource and others. 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: -* EclipseSource - initial API and implementation -******************************************************************************/ +/**************************************************************************** + * Copyright (c) 2009 EclipseSource and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * Contributors: + * EclipseSource - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.util; import org.eclipse.ecf.core.IContainerFactory; diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/ContainerManagerTracker.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/ContainerManagerTracker.java index 5ffb3b081..e9b51d246 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/ContainerManagerTracker.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/ContainerManagerTracker.java @@ -1,12 +1,15 @@ -/******************************************************************************* -* Copyright (c) 2009 EclipseSource and others. 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: -* EclipseSource - initial API and implementation -******************************************************************************/ +/**************************************************************************** + * Copyright (c) 2009 EclipseSource and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * Contributors: + * EclipseSource - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.util; import org.eclipse.ecf.core.IContainerManager; diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/Event.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/Event.java index d1143dbca..d56a2c2a8 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/Event.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/Event.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.util; /** diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/IClassResolver.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/IClassResolver.java index 88972cf9f..a74fab53c 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/IClassResolver.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/IClassResolver.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2015 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2015 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.util; import java.io.ObjectStreamClass; diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/IContainerFilter.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/IContainerFilter.java index 10b8bddca..0d566db8c 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/IContainerFilter.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/IContainerFilter.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2008 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.core.util; diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/IEventProcessor.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/IEventProcessor.java index b3d70a402..fd8ba2f0d 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/IEventProcessor.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/IEventProcessor.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.util; /** diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/IExceptionHandler.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/IExceptionHandler.java index 5801397bc..6aa6ce102 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/IExceptionHandler.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/IExceptionHandler.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.util; import org.eclipse.core.runtime.IStatus; diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/OSGIObjectInputStream.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/OSGIObjectInputStream.java index 1d0c70293..c2057b6de 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/OSGIObjectInputStream.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/OSGIObjectInputStream.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2018 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2018, 2020 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.util; import java.io.*; @@ -20,14 +23,54 @@ import org.osgi.service.log.LogService; */ public class OSGIObjectInputStream extends ObjectInputStream implements OSGIObjectStreamConstants { - protected final ObjectInputStream in; + protected ObjectInputStream in; protected final Bundle b; protected LogService logger; + /** + * @since 3.10 + */ + ClassLoader classLoader; + + class ReplaceableObjectInputStream extends ObjectInputStream { + public ReplaceableObjectInputStream(InputStream ins) throws IOException { + super(ins); + enableResolveObject(true); + } + + @Override + protected Object resolveObject(Object obj) throws IOException { + if (obj instanceof SerVersion) { + return ((SerVersion) obj).toVersion(); + } + if (obj instanceof SerDTO) { + SerDTO serDTO = (SerDTO) obj; + String className = serDTO.getClassname(); + Class<?> clazz = null; + try { + clazz = loadClass(className); + } catch (Exception e) { + throw new IOException("Could not load class for instance of SerDTO with className=" + className); //$NON-NLS-1$ + } + return serDTO.readObject(clazz); + } + return super.resolveObject(obj); + } + + @Override + protected Class<?> resolveClass(ObjectStreamClass desc) throws IOException, ClassNotFoundException { + try { + return loadClass(desc.getName()); + } catch (Exception e) { + return super.resolveClass(desc); + } + } + } + public OSGIObjectInputStream(Bundle b, InputStream in, LogService logger) throws IOException { super(); this.b = b; - this.in = new ObjectInputStream(in); + this.in = new ReplaceableObjectInputStream(in); this.logger = logger; } @@ -35,6 +78,13 @@ public class OSGIObjectInputStream extends ObjectInputStream implements OSGIObje this(b, in, null); } + /** + * @since 3.10 + */ + public void setClassLoader(ClassLoader cl) { + this.classLoader = cl; + } + public void setLogService(LogService log) { this.logger = log; } @@ -48,7 +98,15 @@ public class OSGIObjectInputStream extends ObjectInputStream implements OSGIObje } protected Class loadClass(String classname) throws ClassNotFoundException { + ClassLoader cl = this.classLoader; Bundle bundle = b; + if (cl != null) { + try { + return Class.forName(classname, false, cl); + } catch (Exception e) { + // Try bundle loading + } + } return (bundle == null) ? Class.forName(classname) : bundle.loadClass(classname); } @@ -77,17 +135,13 @@ public class OSGIObjectInputStream extends ObjectInputStream implements OSGIObje final byte type = in.readByte(); switch (type) { case C_NULL : // null - trace("null"); //$NON-NLS-1$ return null; case C_SER : // Serializable - trace("readSerializedObject"); //$NON-NLS-1$ return readSerializedObject(); case C_VER : // Version - trace("readVersion"); //$NON-NLS-1$ return Version.parseVersion(in.readUTF()); case C_ARRAY : // Object[] // read array length - trace("readArray"); //$NON-NLS-1$ int ol = in.readInt(); // read component type and create array for that component type Class<?> clazz = getClassForType(in.readUTF()); @@ -95,11 +149,7 @@ public class OSGIObjectInputStream extends ObjectInputStream implements OSGIObje for (int i = 0; i < ol; i++) Array.set(oresult, i, readObjectOverride()); return oresult; - case C_DTO : // DTO - trace("readDTO"); //$NON-NLS-1$ - return readDTO(); case C_DICT : // Dictionary - trace("readDictionary"); //$NON-NLS-1$ Class<?> dictClazz = loadClass(in.readUTF()); Dictionary dict = null; Constructor cons; @@ -120,7 +170,6 @@ public class OSGIObjectInputStream extends ObjectInputStream implements OSGIObje case C_MAP : // Map // read map length int ms = in.readInt(); - trace("readMap=" + ms); //$NON-NLS-1$ Map mr = new HashMap(); for (int i = 0; i < ms; i++) { Object key = readObjectOverride(); @@ -130,28 +179,24 @@ public class OSGIObjectInputStream extends ObjectInputStream implements OSGIObje return mr; case C_LIST : // List int lsize = in.readInt(); - trace("readList=" + lsize); //$NON-NLS-1$ List l = new ArrayList(lsize); for (int i = 0; i < lsize; i++) l.add(readObjectOverride()); return l; case C_SET : // Set int ssize = in.readInt(); - trace("readSet=" + ssize); //$NON-NLS-1$ Set s = new HashSet(ssize); for (int i = 0; i < ssize; i++) s.add(readObjectOverride()); return s; case C_COLL : // Collection int csize = in.readInt(); - trace("readCol=" + csize); //$NON-NLS-1$ Collection c = new ArrayList(csize); for (int i = 0; i < csize; i++) c.add(readObjectOverride()); return c; case C_ITER : // Iterable int isize = in.readInt(); - trace("readIter=" + isize); //$NON-NLS-1$ List itr = new ArrayList(isize); for (int i = 0; i < isize; i++) itr.add(readObjectOverride()); @@ -159,42 +204,32 @@ public class OSGIObjectInputStream extends ObjectInputStream implements OSGIObje case C_EXTER : // Externalizable return in.readObject(); case C_STRING : // String - trace("readString"); //$NON-NLS-1$ return in.readUTF(); case C_LONG : case C_OLONG : - trace("readLong"); //$NON-NLS-1$ return in.readLong(); case C_INT : case C_OINT : - trace("readInt"); //$NON-NLS-1$ return in.readInt(); case C_SHORT : case C_OSHORT : - trace("readShort"); //$NON-NLS-1$ return in.readShort(); case C_BOOL : case C_OBOOL : - trace("readBool"); //$NON-NLS-1$ return in.readBoolean(); case C_BYTE : case C_OBYTE : - trace("readByte"); //$NON-NLS-1$ return in.readByte(); case C_CHAR : case C_OCHAR : - trace("readChar"); //$NON-NLS-1$ return in.readChar(); case C_DOUBLE : case C_ODOUBLE : - trace("readDouble"); //$NON-NLS-1$ return in.readDouble(); case C_FLOAT : case C_OFLOAT : - trace("readFloat"); //$NON-NLS-1$ return in.readFloat(); case C_ENUM : - trace("readEnum"); //$NON-NLS-1$ return Enum.valueOf(loadClass(in.readUTF()), in.readUTF()); case C_OBJECT : return readNonSerializedObject(); @@ -203,25 +238,6 @@ public class OSGIObjectInputStream extends ObjectInputStream implements OSGIObje } } - private Object readDTO() throws IOException, ClassNotFoundException { - Class<?> clazz = loadClass(in.readUTF()); - Object result = null; - try { - result = clazz.newInstance(); - for (Field f : clazz.getFields()) { - final int mod = f.getModifiers(); - // If it's static or transient then ignore - if (Modifier.isStatic(mod) || Modifier.isTransient(mod)) - continue; - // Else read and set value of field - f.set(result, readObjectOverride()); - } - } catch (Exception e) { - throw new IOException("Cannot deserialize DTO because of exception: " + e.getMessage()); //$NON-NLS-1$ - } - return result; - } - protected Object readExternalizable() throws ClassNotFoundException, IOException { return in.readObject(); } @@ -254,7 +270,7 @@ public class OSGIObjectInputStream extends ObjectInputStream implements OSGIObje protected Object createInstance(Class<?> clazz) throws IOException { try { - return clazz.newInstance(); + return clazz.getDeclaredConstructor().newInstance(); } catch (Exception e) { throw new IOException("Could create new instance of class=" + clazz.getName() + ". Class must have public no-arg constructor"); //$NON-NLS-1$ //$NON-NLS-2$ } diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/OSGIObjectOutputStream.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/OSGIObjectOutputStream.java index 25324866a..c6ab29cd7 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/OSGIObjectOutputStream.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/OSGIObjectOutputStream.java @@ -1,17 +1,19 @@ -/******************************************************************************* - * Copyright (c) 2018 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2018 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.util; import java.io.*; import java.lang.reflect.*; import java.util.*; -import org.osgi.dto.DTO; import org.osgi.framework.Version; import org.osgi.service.log.LogService; @@ -24,9 +26,27 @@ public class OSGIObjectOutputStream extends ObjectOutputStream implements OSGIOb protected LogService logger; protected boolean allowNonSerializable = false; + class ReplaceableObjectOutputStream extends ObjectOutputStream { + + public ReplaceableObjectOutputStream(OutputStream out) throws IOException { + super(out); + enableReplaceObject(true); + } + + @Override + protected Object replaceObject(Object obj) throws IOException { + if (obj instanceof Version) { + return new SerVersion(((Version) obj)); + } else if (!(obj instanceof Serializable)) { + return new SerDTO(obj); + } + return super.replaceObject(obj); + } + } + public OSGIObjectOutputStream(OutputStream out, boolean allowNonSerializable, LogService log) throws IOException { super(); - this.out = new ObjectOutputStream(out); + this.out = new ReplaceableObjectOutputStream(out); this.allowNonSerializable = allowNonSerializable; this.logger = log; } @@ -48,7 +68,6 @@ public class OSGIObjectOutputStream extends ObjectOutputStream implements OSGIOb } protected void writeExternalizable(Externalizable obj, Class<?> clazz) throws IOException { - trace("writeExternalizable " + clazz.getName()); //$NON-NLS-1$ out.writeObject(obj); } @@ -99,8 +118,6 @@ public class OSGIObjectOutputStream extends ObjectOutputStream implements OSGIOb } protected void writeNonSerializable(Object obj, Class<?> clazz) throws IOException { - // lookup object stream class - trace("writeNonSerializable " + clazz.getName()); //$NON-NLS-1$ // write class name out.writeObject(clazz.getName()); writeFields(obj, clazz); @@ -118,7 +135,6 @@ public class OSGIObjectOutputStream extends ObjectOutputStream implements OSGIOb } Class<?> clazz = obj.getClass(); if (clazz.isArray()) { - trace("writing array"); //$NON-NLS-1$ out.writeByte(C_ARRAY); int len = Array.getLength(obj); // write length @@ -130,88 +146,70 @@ public class OSGIObjectOutputStream extends ObjectOutputStream implements OSGIOb writeObjectOverride(Array.get(obj, i)); return; } else if (obj instanceof Long) { - trace("writing Long"); //$NON-NLS-1$ if (clazz.isPrimitive()) { - trace("writing long"); //$NON-NLS-1$ out.writeByte(C_LONG); } else { - trace("writing Long"); //$NON-NLS-1$ out.writeByte(C_OLONG); } out.writeLong((Long) obj); return; } else if (obj instanceof Integer) { if (clazz.isPrimitive()) { - trace("writing int"); //$NON-NLS-1$ out.writeByte(C_INT); } else { - trace("writing Integer"); //$NON-NLS-1$ out.writeByte(C_OINT); } out.writeInt((Integer) obj); return; } else if (obj instanceof Short) { if (clazz.isPrimitive()) { - trace("writing short"); //$NON-NLS-1$ out.writeByte(C_SHORT); } else { - trace("writing Short"); //$NON-NLS-1$ out.writeByte(C_OSHORT); } out.writeShort((Short) obj); return; } else if (obj instanceof Boolean) { if (clazz.isPrimitive()) { - trace("writing bool"); //$NON-NLS-1$ out.writeByte(C_BOOL); } else { - trace("writing Boolean"); //$NON-NLS-1$ out.writeByte(C_OBOOL); } out.writeBoolean((Boolean) obj); return; } else if (obj instanceof Byte) { if (clazz.isPrimitive()) { - trace("writing byte"); //$NON-NLS-1$ out.writeByte(C_BYTE); } else { - trace("writing Byte"); //$NON-NLS-1$ out.writeByte(C_OBYTE); } out.writeByte((Byte) obj); return; } else if (obj instanceof Character) { if (clazz.isPrimitive()) { - trace("writing char"); //$NON-NLS-1$ out.writeByte(C_CHAR); } else { - trace("writing Character"); //$NON-NLS-1$ out.writeByte(C_OCHAR); } out.writeChar((Character) obj); return; } else if (obj instanceof Float) { if (clazz.isPrimitive()) { - trace("writing float"); //$NON-NLS-1$ out.writeByte(C_FLOAT); } else { - trace("writing Float"); //$NON-NLS-1$ out.writeByte(C_OFLOAT); } out.writeFloat((Float) obj); return; } else if (obj instanceof Double) { if (clazz.isPrimitive()) { - trace("writing double"); //$NON-NLS-1$ out.writeByte(C_DOUBLE); } else { - trace("writing Double"); //$NON-NLS-1$ out.writeByte(C_ODOUBLE); } out.writeDouble((Double) obj); return; } else if (obj instanceof String) { - trace("writing String"); //$NON-NLS-1$ out.writeByte(C_STRING); out.writeUTF((String) obj); return; @@ -222,7 +220,6 @@ public class OSGIObjectOutputStream extends ObjectOutputStream implements OSGIOb Dictionary dict = (Dictionary) obj; // write size int ds = dict.size(); - trace("writing Dictionary=" + ds); //$NON-NLS-1$ out.writeInt(ds); // for each element in Map for (Enumeration e = dict.keys(); e.hasMoreElements();) { @@ -236,7 +233,6 @@ public class OSGIObjectOutputStream extends ObjectOutputStream implements OSGIOb Map map = (Map) obj; // write size int size = map.size(); - trace("writing Map=" + size); //$NON-NLS-1$ out.writeInt(size); // for each element in Map for (Object key : map.keySet()) { @@ -251,7 +247,6 @@ public class OSGIObjectOutputStream extends ObjectOutputStream implements OSGIOb List list = (List) obj; // write size int size = list.size(); - trace("writing List=" + size); //$NON-NLS-1$ out.writeInt(size); // write each element for (Object item : list) @@ -262,7 +257,6 @@ public class OSGIObjectOutputStream extends ObjectOutputStream implements OSGIOb Set set = (Set) obj; // write size int size = set.size(); - trace("writing Set=" + size); //$NON-NLS-1$ out.writeInt(size); // then elements for (Object item : set) @@ -273,7 +267,6 @@ public class OSGIObjectOutputStream extends ObjectOutputStream implements OSGIOb Collection col = (Collection) obj; // write size int size = col.size(); - trace("writing col=" + size); //$NON-NLS-1$ out.writeInt(size); // then elements for (Object item : col) @@ -288,7 +281,6 @@ public class OSGIObjectOutputStream extends ObjectOutputStream implements OSGIOb Object v : itr) size++; // write size - trace("writing Iterable=" + size); //$NON-NLS-1$ out.writeInt(size); // write elements for (Object item : itr) @@ -308,38 +300,10 @@ public class OSGIObjectOutputStream extends ObjectOutputStream implements OSGIOb writeSerializable(obj, clazz); return; } else if (obj instanceof Version) { - trace("writing Version"); //$NON-NLS-1$ - out.writeByte(C_VER); - out.writeUTF(((Version) obj).toString()); - return; - } else if (obj instanceof DTO) { - out.writeByte(C_DTO); - writeDTO(obj, clazz); - return; + writeObjectOverride(new SerVersion((Version) obj)); } else { - if (allowNonSerializable) { - out.writeByte(C_OBJECT); - writeNonSerializable(obj, clazz); - return; - } - throw new NotSerializableException("Cannot serialize instance of class=" + clazz.getName()); //$NON-NLS-1$ - } - } - - private void writeDTO(Object obj, Class<?> clazz) throws IOException { - trace("writing DTO"); //$NON-NLS-1$ - // Write out class name - out.writeUTF(clazz.getName()); - for (Field f : clazz.getFields()) { - final int mod = f.getModifiers(); - if (Modifier.isStatic(mod) || Modifier.isTransient(mod)) - continue; - try { - writeObjectOverride(f.get(obj)); - } catch (Exception e) { - // Should not happen for DTO - throw new NotSerializableException(clazz.getName()); - } + writeObjectOverride(new SerDTO(obj)); + return; } } diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/OSGIObjectStreamConstants.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/OSGIObjectStreamConstants.java index b1cfaaa77..7163854ba 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/OSGIObjectStreamConstants.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/OSGIObjectStreamConstants.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2018 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2018 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.util; /** diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/Proxy.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/Proxy.java index 786549ac4..8b99e8520 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/Proxy.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/Proxy.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.core.util; diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/ProxyAddress.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/ProxyAddress.java index 152b9d02e..d393ac181 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/ProxyAddress.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/ProxyAddress.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2004 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.ecf.core.util; diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/SerDTO.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/SerDTO.java new file mode 100644 index 000000000..876888455 --- /dev/null +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/SerDTO.java @@ -0,0 +1,79 @@ +/**************************************************************************** + * Copyright (c) 2021 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * Contributors: + * Composent, Inc. - initial API and implementation + * + *****************************************************************************/ +package org.eclipse.ecf.core.util; + +import java.io.IOException; +import java.io.Serializable; +import java.lang.reflect.Field; +import java.lang.reflect.Modifier; +import java.util.HashMap; +import java.util.Map; + +/** + * @since 3.10 + */ +public class SerDTO implements Serializable { + + private static final long serialVersionUID = -1739849704193630352L; + private String className; + private Map<String, Object> fields; + + public SerDTO(Object obj) { + Class<?> clazz = obj.getClass(); + this.className = clazz.getName(); + this.fields = new HashMap<String, Object>(); + for (Field f : clazz.getFields()) { + final int mod = f.getModifiers(); + if (Modifier.isStatic(mod) || Modifier.isTransient(mod)) + continue; + Object value = null; + try { + value = f.get(obj); + } catch (Exception e) { + // + } + if (value != null) { + fields.put(f.getName(), value); + } + } + } + + public String getClassname() { + return this.className; + } + + public Map<String, Object> getFields() { + return fields; + } + + public Object readObject(Class<?> clazz) throws IOException { + Object result = null; + try { + result = clazz.getConstructor(new Class[] {}).newInstance(); + for (Field f : clazz.getFields()) { + Object v = fields.get(f.getName()); + if (v != null) { + f.setAccessible(true); + try { + f.set(result, v); + } catch (Exception e) { + // ignore + } + } + } + } catch (Throwable e) { + throw new IOException("Unexpected exception reading DTO in SerDTO.readObject: " + e.getLocalizedMessage()); //$NON-NLS-1$ + } + return result; + + } +} diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/SerVersion.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/SerVersion.java new file mode 100644 index 000000000..dd20c732c --- /dev/null +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/SerVersion.java @@ -0,0 +1,31 @@ +/**************************************************************************** + * Copyright (c) 2021 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * Contributors: + * Composent, Inc. - initial API and implementation + * + *****************************************************************************/ +package org.eclipse.ecf.core.util; + +import java.io.Serializable; +import org.osgi.framework.Version; + +/** + * @since 3.10 + */ +public final class SerVersion implements Serializable { + private static final long serialVersionUID = 4785952431053485808L; + private String versionStr; + + public SerVersion(Version v) { + this.versionStr = v.toString(); + } + + public Version toVersion() { + return Version.parseVersion(this.versionStr); + } +}
\ No newline at end of file diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/reflection/ClassUtil.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/reflection/ClassUtil.java index 128ade165..92456b1a8 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/reflection/ClassUtil.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/reflection/ClassUtil.java @@ -1,13 +1,15 @@ -/******************************************************************************* +/**************************************************************************** * Copyright (c) 2010 Markus Alexander Kuppe. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Markus Alexander Kuppe (ecf-dev_eclipse.org <at> lemmster <dot> de) - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.core.util.reflection; import java.lang.reflect.Method; diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/internal/core/ECFDebugOptions.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/internal/core/ECFDebugOptions.java index 595f32ad3..6ae8fc32b 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/internal/core/ECFDebugOptions.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/internal/core/ECFDebugOptions.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.internal.core; public interface ECFDebugOptions { diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/internal/core/ECFPlugin.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/internal/core/ECFPlugin.java index 6610f8aaf..0ba112fff 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/internal/core/ECFPlugin.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/internal/core/ECFPlugin.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004, 2020 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.internal.core; import java.util.*; @@ -138,7 +141,7 @@ public class ECFPlugin implements BundleActivator { // initialize the default ssl socket factory try { Class ecfSocketFactoryClass = Class.forName("org.eclipse.ecf.internal.ssl.ECFTrustManager"); //$NON-NLS-1$ - ecfTrustManager = (BundleActivator) ecfSocketFactoryClass.newInstance(); + ecfTrustManager = (BundleActivator) ecfSocketFactoryClass.getDeclaredConstructor().newInstance(); ecfTrustManager.start(ctxt); } catch (ClassNotFoundException e) { // will occur if fragment is not installed or not on proper execution environment diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/internal/core/IDisposable.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/internal/core/IDisposable.java index e8b0318f8..54a4c2062 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/internal/core/IDisposable.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/internal/core/IDisposable.java @@ -1,11 +1,14 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. 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 - * +/**************************************************************************** + * Copyright (c) 2004 Composent, Inc. and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * * Contributors: Composent, Inc. - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.ecf.internal.core; public interface IDisposable { diff --git a/framework/bundles/org.eclipse.team.ecf.core/.settings/org.eclipse.jdt.core.prefs b/framework/bundles/org.eclipse.team.ecf.core/.settings/org.eclipse.jdt.core.prefs index d30c2b496..306ec255d 100644 --- a/framework/bundles/org.eclipse.team.ecf.core/.settings/org.eclipse.jdt.core.prefs +++ b/framework/bundles/org.eclipse.team.ecf.core/.settings/org.eclipse.jdt.core.prefs @@ -21,7 +21,7 @@ org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.autoboxing=ignore org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning org.eclipse.jdt.core.compiler.problem.deadCode=ignore -org.eclipse.jdt.core.compiler.problem.deprecation=warning +org.eclipse.jdt.core.compiler.problem.deprecation=ignore org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled org.eclipse.jdt.core.compiler.problem.discouragedReference=warning diff --git a/framework/bundles/org.eclipse.team.ecf.core/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.team.ecf.core/META-INF/MANIFEST.MF index c664ece7f..fd6c7a361 100644 --- a/framework/bundles/org.eclipse.team.ecf.core/META-INF/MANIFEST.MF +++ b/framework/bundles/org.eclipse.team.ecf.core/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin.name Bundle-SymbolicName: org.eclipse.team.ecf.core;singleton:=true Automatic-Module-Name: org.eclipse.team.ecf.core -Bundle-Version: 1.0.100.qualifier +Bundle-Version: 1.0.200.qualifier Bundle-Vendor: %plugin.provider Bundle-Activator: org.eclipse.team.internal.ecf.core.TeamSynchronization Require-Bundle: org.eclipse.core.runtime, diff --git a/framework/bundles/org.eclipse.team.ecf.core/plugin.properties b/framework/bundles/org.eclipse.team.ecf.core/plugin.properties index 45736f1fe..380438766 100644 --- a/framework/bundles/org.eclipse.team.ecf.core/plugin.properties +++ b/framework/bundles/org.eclipse.team.ecf.core/plugin.properties @@ -1,10 +1,11 @@ ############################################################################ # Copyright (c) 2007 Composent Inc., IBM Corp, and others. -# 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 # +# This program and the accompanying materials are made +# available under the terms of the Eclipse Public License 2.0 +# which is available at https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 ############################################################################ plugin.name=ECF Team Plug-in Core plugin.provider=Eclipse.org - ECF diff --git a/framework/bundles/org.eclipse.team.ecf.core/pom.xml b/framework/bundles/org.eclipse.team.ecf.core/pom.xml index 6db7ef134..550119228 100644 --- a/framework/bundles/org.eclipse.team.ecf.core/pom.xml +++ b/framework/bundles/org.eclipse.team.ecf.core/pom.xml @@ -10,6 +10,6 @@ </parent> <groupId>org.eclipse.ecf</groupId> <artifactId>org.eclipse.team.ecf.core</artifactId> - <version>1.0.100-SNAPSHOT</version> + <version>1.0.200-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/framework/bundles/org.eclipse.team.ecf.core/src/org/eclipse/team/internal/ecf/core/Messages.java b/framework/bundles/org.eclipse.team.ecf.core/src/org/eclipse/team/internal/ecf/core/Messages.java index 4c18fe92f..163765046 100644 --- a/framework/bundles/org.eclipse.team.ecf.core/src/org/eclipse/team/internal/ecf/core/Messages.java +++ b/framework/bundles/org.eclipse.team.ecf.core/src/org/eclipse/team/internal/ecf/core/Messages.java @@ -1,13 +1,15 @@ -/****************************************************************************** +/**************************************************************************** * Copyright (c) 2009 Remy Chi Jian Suen and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Remy Chi Jian Suen - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.team.internal.ecf.core; import org.eclipse.osgi.util.NLS; diff --git a/framework/bundles/org.eclipse.team.ecf.core/src/org/eclipse/team/internal/ecf/core/RemoteShare.java b/framework/bundles/org.eclipse.team.ecf.core/src/org/eclipse/team/internal/ecf/core/RemoteShare.java index df8708979..354a105dc 100644 --- a/framework/bundles/org.eclipse.team.ecf.core/src/org/eclipse/team/internal/ecf/core/RemoteShare.java +++ b/framework/bundles/org.eclipse.team.ecf.core/src/org/eclipse/team/internal/ecf/core/RemoteShare.java @@ -1,13 +1,15 @@ -/****************************************************************************** +/**************************************************************************** * Copyright (c) 2008, 2009 Versant Corporation and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Remy Chi Jian Suen (Versant Corporation) - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.team.internal.ecf.core; import java.io.*; diff --git a/framework/bundles/org.eclipse.team.ecf.core/src/org/eclipse/team/internal/ecf/core/RemoteSyncInfo.java b/framework/bundles/org.eclipse.team.ecf.core/src/org/eclipse/team/internal/ecf/core/RemoteSyncInfo.java index e081ee74c..d3548b496 100644 --- a/framework/bundles/org.eclipse.team.ecf.core/src/org/eclipse/team/internal/ecf/core/RemoteSyncInfo.java +++ b/framework/bundles/org.eclipse.team.ecf.core/src/org/eclipse/team/internal/ecf/core/RemoteSyncInfo.java @@ -1,13 +1,15 @@ -/****************************************************************************** +/**************************************************************************** * Copyright (c) 2008 Versant Corporation and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Remy Chi Jian Suen (Versant Corporation) - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.team.internal.ecf.core; import org.eclipse.core.resources.IResource; diff --git a/framework/bundles/org.eclipse.team.ecf.core/src/org/eclipse/team/internal/ecf/core/TeamSynchronization.java b/framework/bundles/org.eclipse.team.ecf.core/src/org/eclipse/team/internal/ecf/core/TeamSynchronization.java index b52fd8b27..563e36539 100644 --- a/framework/bundles/org.eclipse.team.ecf.core/src/org/eclipse/team/internal/ecf/core/TeamSynchronization.java +++ b/framework/bundles/org.eclipse.team.ecf.core/src/org/eclipse/team/internal/ecf/core/TeamSynchronization.java @@ -1,13 +1,15 @@ -/****************************************************************************** +/**************************************************************************** * Copyright (c) 2008, 2009 Versant Corporation and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Remy Chi Jian Suen (Versant Corporation) - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.team.internal.ecf.core; import java.io.IOException; diff --git a/framework/bundles/org.eclipse.team.ecf.core/src/org/eclipse/team/internal/ecf/core/messages.properties b/framework/bundles/org.eclipse.team.ecf.core/src/org/eclipse/team/internal/ecf/core/messages.properties index 5fa3d58ac..d756a084d 100644 --- a/framework/bundles/org.eclipse.team.ecf.core/src/org/eclipse/team/internal/ecf/core/messages.properties +++ b/framework/bundles/org.eclipse.team.ecf.core/src/org/eclipse/team/internal/ecf/core/messages.properties @@ -1,12 +1,11 @@ -################################################################################ +############################################################################ # Copyright (c) 2009 Remy Chi Jian Suen and others. -# 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: -# Remy Chi Jian Suen - initial API and implementation -################################################################################ +# This program and the accompanying materials are made +# available under the terms of the Eclipse Public License 2.0 +# which is available at https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 +############################################################################ RemoteShare_FetchingVariant = Fetching {0} diff --git a/framework/bundles/org.eclipse.team.ecf.core/src/org/eclipse/team/internal/ecf/core/messages/FetchResponse.java b/framework/bundles/org.eclipse.team.ecf.core/src/org/eclipse/team/internal/ecf/core/messages/FetchResponse.java index 11eb8204f..3159856c1 100644 --- a/framework/bundles/org.eclipse.team.ecf.core/src/org/eclipse/team/internal/ecf/core/messages/FetchResponse.java +++ b/framework/bundles/org.eclipse.team.ecf.core/src/org/eclipse/team/internal/ecf/core/messages/FetchResponse.java @@ -1,13 +1,15 @@ -/****************************************************************************** +/**************************************************************************** * Copyright (c) 2008 Versant Corporation and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Remy Chi Jian Suen (Versant Corporation) - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.team.internal.ecf.core.messages; import org.eclipse.team.core.variants.IResourceVariant; diff --git a/framework/bundles/org.eclipse.team.ecf.core/src/org/eclipse/team/internal/ecf/core/messages/FetchVariantRequest.java b/framework/bundles/org.eclipse.team.ecf.core/src/org/eclipse/team/internal/ecf/core/messages/FetchVariantRequest.java index e1bbc6515..7ae11d1ca 100644 --- a/framework/bundles/org.eclipse.team.ecf.core/src/org/eclipse/team/internal/ecf/core/messages/FetchVariantRequest.java +++ b/framework/bundles/org.eclipse.team.ecf.core/src/org/eclipse/team/internal/ecf/core/messages/FetchVariantRequest.java @@ -1,13 +1,15 @@ -/****************************************************************************** +/**************************************************************************** * Copyright (c) 2008 Versant Corporation and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Remy Chi Jian Suen (Versant Corporation) - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.team.internal.ecf.core.messages; import java.io.Serializable; diff --git a/framework/bundles/org.eclipse.team.ecf.core/src/org/eclipse/team/internal/ecf/core/messages/FetchVariantsRequest.java b/framework/bundles/org.eclipse.team.ecf.core/src/org/eclipse/team/internal/ecf/core/messages/FetchVariantsRequest.java index 21996f356..5b8d694bd 100644 --- a/framework/bundles/org.eclipse.team.ecf.core/src/org/eclipse/team/internal/ecf/core/messages/FetchVariantsRequest.java +++ b/framework/bundles/org.eclipse.team.ecf.core/src/org/eclipse/team/internal/ecf/core/messages/FetchVariantsRequest.java @@ -1,13 +1,15 @@ -/****************************************************************************** +/**************************************************************************** * Copyright (c) 2008 Versant Corporation and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Remy Chi Jian Suen (Versant Corporation) - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.team.internal.ecf.core.messages; import org.eclipse.ecf.core.identity.ID; diff --git a/framework/bundles/org.eclipse.team.ecf.core/src/org/eclipse/team/internal/ecf/core/messages/IResponse.java b/framework/bundles/org.eclipse.team.ecf.core/src/org/eclipse/team/internal/ecf/core/messages/IResponse.java index 0ce9c5da5..9f2ea1606 100644 --- a/framework/bundles/org.eclipse.team.ecf.core/src/org/eclipse/team/internal/ecf/core/messages/IResponse.java +++ b/framework/bundles/org.eclipse.team.ecf.core/src/org/eclipse/team/internal/ecf/core/messages/IResponse.java @@ -1,13 +1,15 @@ -/****************************************************************************** +/**************************************************************************** * Copyright (c) 2008 Versant Corporation and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Remy Chi Jian Suen (Versant Corporation) - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.team.internal.ecf.core.messages; import java.io.Serializable; diff --git a/framework/bundles/org.eclipse.team.ecf.core/src/org/eclipse/team/internal/ecf/core/messages/ShareRequest.java b/framework/bundles/org.eclipse.team.ecf.core/src/org/eclipse/team/internal/ecf/core/messages/ShareRequest.java index b32aff3ae..b7657e3b3 100644 --- a/framework/bundles/org.eclipse.team.ecf.core/src/org/eclipse/team/internal/ecf/core/messages/ShareRequest.java +++ b/framework/bundles/org.eclipse.team.ecf.core/src/org/eclipse/team/internal/ecf/core/messages/ShareRequest.java @@ -1,13 +1,15 @@ -/****************************************************************************** +/**************************************************************************** * Copyright (c) 2008 Versant Corporation and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Remy Chi Jian Suen (Versant Corporation) - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.team.internal.ecf.core.messages; import java.io.Serializable; diff --git a/framework/bundles/org.eclipse.team.ecf.core/src/org/eclipse/team/internal/ecf/core/messages/ShareResponse.java b/framework/bundles/org.eclipse.team.ecf.core/src/org/eclipse/team/internal/ecf/core/messages/ShareResponse.java index 644a1db97..d1d7666f3 100644 --- a/framework/bundles/org.eclipse.team.ecf.core/src/org/eclipse/team/internal/ecf/core/messages/ShareResponse.java +++ b/framework/bundles/org.eclipse.team.ecf.core/src/org/eclipse/team/internal/ecf/core/messages/ShareResponse.java @@ -1,13 +1,15 @@ -/****************************************************************************** +/**************************************************************************** * Copyright (c) 2008 Versant Corporation and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Remy Chi Jian Suen (Versant Corporation) - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.team.internal.ecf.core.messages; public class ShareResponse implements IResponse { diff --git a/framework/bundles/org.eclipse.team.ecf.core/src/org/eclipse/team/internal/ecf/core/variants/RemoteResourceVariant.java b/framework/bundles/org.eclipse.team.ecf.core/src/org/eclipse/team/internal/ecf/core/variants/RemoteResourceVariant.java index 3d4b29a1b..72596ce2d 100644 --- a/framework/bundles/org.eclipse.team.ecf.core/src/org/eclipse/team/internal/ecf/core/variants/RemoteResourceVariant.java +++ b/framework/bundles/org.eclipse.team.ecf.core/src/org/eclipse/team/internal/ecf/core/variants/RemoteResourceVariant.java @@ -1,13 +1,15 @@ -/****************************************************************************** +/**************************************************************************** * Copyright (c) 2008 Versant Corporation and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Remy Chi Jian Suen (Versant Corporation) - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.team.internal.ecf.core.variants; import java.io.Serializable; diff --git a/framework/bundles/org.eclipse.team.ecf.core/src/org/eclipse/team/internal/ecf/core/variants/RemoteResourceVariantComparator.java b/framework/bundles/org.eclipse.team.ecf.core/src/org/eclipse/team/internal/ecf/core/variants/RemoteResourceVariantComparator.java index 4568b4174..09fe92406 100644 --- a/framework/bundles/org.eclipse.team.ecf.core/src/org/eclipse/team/internal/ecf/core/variants/RemoteResourceVariantComparator.java +++ b/framework/bundles/org.eclipse.team.ecf.core/src/org/eclipse/team/internal/ecf/core/variants/RemoteResourceVariantComparator.java @@ -1,13 +1,15 @@ -/****************************************************************************** +/**************************************************************************** * Copyright (c) 2008 Versant Corporation and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Remy Chi Jian Suen (Versant Corporation) - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.team.internal.ecf.core.variants; import java.util.Arrays; diff --git a/framework/bundles/org.eclipse.team.ecf.core/src/org/eclipse/team/internal/ecf/core/variants/RemoteResourceVariantTree.java b/framework/bundles/org.eclipse.team.ecf.core/src/org/eclipse/team/internal/ecf/core/variants/RemoteResourceVariantTree.java index 5bb819a82..36ab7fb72 100644 --- a/framework/bundles/org.eclipse.team.ecf.core/src/org/eclipse/team/internal/ecf/core/variants/RemoteResourceVariantTree.java +++ b/framework/bundles/org.eclipse.team.ecf.core/src/org/eclipse/team/internal/ecf/core/variants/RemoteResourceVariantTree.java @@ -1,13 +1,15 @@ -/****************************************************************************** +/**************************************************************************** * Copyright (c) 2008 Versant Corporation and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Remy Chi Jian Suen (Versant Corporation) - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.team.internal.ecf.core.variants; import java.util.ArrayList; diff --git a/framework/bundles/org.eclipse.team.ecf.core/src/org/eclipse/team/internal/ecf/core/variants/RemoteResourceVariantTreeSubscriber.java b/framework/bundles/org.eclipse.team.ecf.core/src/org/eclipse/team/internal/ecf/core/variants/RemoteResourceVariantTreeSubscriber.java index 8e9b1eaa5..d0d75fc59 100644 --- a/framework/bundles/org.eclipse.team.ecf.core/src/org/eclipse/team/internal/ecf/core/variants/RemoteResourceVariantTreeSubscriber.java +++ b/framework/bundles/org.eclipse.team.ecf.core/src/org/eclipse/team/internal/ecf/core/variants/RemoteResourceVariantTreeSubscriber.java @@ -1,13 +1,15 @@ -/****************************************************************************** +/**************************************************************************** * Copyright (c) 2008 Versant Corporation and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Remy Chi Jian Suen (Versant Corporation) - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.team.internal.ecf.core.variants; import org.eclipse.core.resources.IResource; diff --git a/framework/bundles/org.eclipse.team.ecf.core/src/org/eclipse/team/internal/ecf/core/variants/RemoteStorage.java b/framework/bundles/org.eclipse.team.ecf.core/src/org/eclipse/team/internal/ecf/core/variants/RemoteStorage.java index 600f52dae..6fae14069 100644 --- a/framework/bundles/org.eclipse.team.ecf.core/src/org/eclipse/team/internal/ecf/core/variants/RemoteStorage.java +++ b/framework/bundles/org.eclipse.team.ecf.core/src/org/eclipse/team/internal/ecf/core/variants/RemoteStorage.java @@ -1,13 +1,15 @@ -/****************************************************************************** +/**************************************************************************** * Copyright (c) 2008 Versant Corporation and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Remy Chi Jian Suen (Versant Corporation) - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.team.internal.ecf.core.variants; import java.io.*; diff --git a/framework/bundles/org.eclipse.team.ecf.ui/.settings/org.eclipse.jdt.core.prefs b/framework/bundles/org.eclipse.team.ecf.ui/.settings/org.eclipse.jdt.core.prefs index d30c2b496..306ec255d 100644 --- a/framework/bundles/org.eclipse.team.ecf.ui/.settings/org.eclipse.jdt.core.prefs +++ b/framework/bundles/org.eclipse.team.ecf.ui/.settings/org.eclipse.jdt.core.prefs @@ -21,7 +21,7 @@ org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.autoboxing=ignore org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning org.eclipse.jdt.core.compiler.problem.deadCode=ignore -org.eclipse.jdt.core.compiler.problem.deprecation=warning +org.eclipse.jdt.core.compiler.problem.deprecation=ignore org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled org.eclipse.jdt.core.compiler.problem.discouragedReference=warning diff --git a/framework/bundles/org.eclipse.team.ecf.ui/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.team.ecf.ui/META-INF/MANIFEST.MF index 1d7201e7e..bb0b3693b 100644 --- a/framework/bundles/org.eclipse.team.ecf.ui/META-INF/MANIFEST.MF +++ b/framework/bundles/org.eclipse.team.ecf.ui/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin.name Bundle-SymbolicName: org.eclipse.team.ecf.ui;singleton:=true Automatic-Module-Name: org.eclipse.team.ecf.ui -Bundle-Version: 1.0.100.qualifier +Bundle-Version: 1.0.200.qualifier Bundle-Vendor: %plugin.provider Bundle-Activator: org.eclipse.team.internal.ecf.core.TeamSynchronization Require-Bundle: org.eclipse.core.runtime, diff --git a/framework/bundles/org.eclipse.team.ecf.ui/plugin.properties b/framework/bundles/org.eclipse.team.ecf.ui/plugin.properties index 0e5e0c305..3d585ec64 100644 --- a/framework/bundles/org.eclipse.team.ecf.ui/plugin.properties +++ b/framework/bundles/org.eclipse.team.ecf.ui/plugin.properties @@ -1,10 +1,11 @@ ############################################################################ # Copyright (c) 2007 Composent Inc., IBM Corp, and others. -# 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 # +# This program and the accompanying materials are made +# available under the terms of the Eclipse Public License 2.0 +# which is available at https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 ############################################################################ plugin.name=ECF Team Plug-in UI plugin.provider=Eclipse.org - ECF diff --git a/framework/bundles/org.eclipse.team.ecf.ui/pom.xml b/framework/bundles/org.eclipse.team.ecf.ui/pom.xml index 48e8034b6..fc29082ec 100644 --- a/framework/bundles/org.eclipse.team.ecf.ui/pom.xml +++ b/framework/bundles/org.eclipse.team.ecf.ui/pom.xml @@ -10,6 +10,6 @@ </parent> <groupId>org.eclipse.ecf</groupId> <artifactId>org.eclipse.team.ecf.ui</artifactId> - <version>1.0.100-SNAPSHOT</version> + <version>1.0.200-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/framework/bundles/org.eclipse.team.ecf.ui/src/org/eclipse/team/internal/ecf/ui/ECFStart.java b/framework/bundles/org.eclipse.team.ecf.ui/src/org/eclipse/team/internal/ecf/ui/ECFStart.java index 6b61e7614..7119d003d 100644 --- a/framework/bundles/org.eclipse.team.ecf.ui/src/org/eclipse/team/internal/ecf/ui/ECFStart.java +++ b/framework/bundles/org.eclipse.team.ecf.ui/src/org/eclipse/team/internal/ecf/ui/ECFStart.java @@ -1,12 +1,14 @@ /**************************************************************************** * Copyright (c) 2007, 2009 Composent, Inc. and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Composent, Inc. - initial API and implementation + * + * SPDX-License-Identifier: EPL-2.0 *****************************************************************************/ package org.eclipse.team.internal.ecf.ui; diff --git a/framework/bundles/org.eclipse.team.ecf.ui/src/org/eclipse/team/internal/ecf/ui/Messages.java b/framework/bundles/org.eclipse.team.ecf.ui/src/org/eclipse/team/internal/ecf/ui/Messages.java index 73cd6e692..09bdf3eda 100644 --- a/framework/bundles/org.eclipse.team.ecf.ui/src/org/eclipse/team/internal/ecf/ui/Messages.java +++ b/framework/bundles/org.eclipse.team.ecf.ui/src/org/eclipse/team/internal/ecf/ui/Messages.java @@ -1,13 +1,15 @@ -/****************************************************************************** +/**************************************************************************** * Copyright (c) 2009 Remy Chi Jian Suen and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Remy Chi Jian Suen - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.team.internal.ecf.ui; import org.eclipse.osgi.util.NLS; diff --git a/framework/bundles/org.eclipse.team.ecf.ui/src/org/eclipse/team/internal/ecf/ui/WorkbenchAwareRemoteShare.java b/framework/bundles/org.eclipse.team.ecf.ui/src/org/eclipse/team/internal/ecf/ui/WorkbenchAwareRemoteShare.java index b658d7c72..81291b763 100644 --- a/framework/bundles/org.eclipse.team.ecf.ui/src/org/eclipse/team/internal/ecf/ui/WorkbenchAwareRemoteShare.java +++ b/framework/bundles/org.eclipse.team.ecf.ui/src/org/eclipse/team/internal/ecf/ui/WorkbenchAwareRemoteShare.java @@ -1,13 +1,15 @@ -/****************************************************************************** +/**************************************************************************** * Copyright (c) 2009 Remy Chi Jian Suen and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Remy Chi Jian Suen - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.team.internal.ecf.ui; import org.eclipse.ecf.core.identity.ID; diff --git a/framework/bundles/org.eclipse.team.ecf.ui/src/org/eclipse/team/internal/ecf/ui/actions/OverrideWithRemoteAction.java b/framework/bundles/org.eclipse.team.ecf.ui/src/org/eclipse/team/internal/ecf/ui/actions/OverrideWithRemoteAction.java index f650f0a6a..0409eb51a 100644 --- a/framework/bundles/org.eclipse.team.ecf.ui/src/org/eclipse/team/internal/ecf/ui/actions/OverrideWithRemoteAction.java +++ b/framework/bundles/org.eclipse.team.ecf.ui/src/org/eclipse/team/internal/ecf/ui/actions/OverrideWithRemoteAction.java @@ -1,13 +1,15 @@ -/****************************************************************************** +/**************************************************************************** * Copyright (c) 2008 Versant Corporation and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Remy Chi Jian Suen (Versant Corporation) - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.team.internal.ecf.ui.actions; import org.eclipse.compare.structuremergeviewer.IDiffElement; diff --git a/framework/bundles/org.eclipse.team.ecf.ui/src/org/eclipse/team/internal/ecf/ui/actions/OverrideWithRemoteOperation.java b/framework/bundles/org.eclipse.team.ecf.ui/src/org/eclipse/team/internal/ecf/ui/actions/OverrideWithRemoteOperation.java index 23a357f46..c8e71d04c 100644 --- a/framework/bundles/org.eclipse.team.ecf.ui/src/org/eclipse/team/internal/ecf/ui/actions/OverrideWithRemoteOperation.java +++ b/framework/bundles/org.eclipse.team.ecf.ui/src/org/eclipse/team/internal/ecf/ui/actions/OverrideWithRemoteOperation.java @@ -1,13 +1,15 @@ -/****************************************************************************** +/**************************************************************************** * Copyright (c) 2008 Versant Corporation and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Remy Chi Jian Suen (Versant Corporation) - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.team.internal.ecf.ui.actions; import java.lang.reflect.InvocationTargetException; diff --git a/framework/bundles/org.eclipse.team.ecf.ui/src/org/eclipse/team/internal/ecf/ui/handlers/CompareWithHandler.java b/framework/bundles/org.eclipse.team.ecf.ui/src/org/eclipse/team/internal/ecf/ui/handlers/CompareWithHandler.java index 6f92c6697..3e40f9c4d 100644 --- a/framework/bundles/org.eclipse.team.ecf.ui/src/org/eclipse/team/internal/ecf/ui/handlers/CompareWithHandler.java +++ b/framework/bundles/org.eclipse.team.ecf.ui/src/org/eclipse/team/internal/ecf/ui/handlers/CompareWithHandler.java @@ -1,13 +1,15 @@ -/****************************************************************************** +/**************************************************************************** * Copyright (c) 2008 Versant Corporation and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Remy Chi Jian Suen (Versant Corporation) - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.team.internal.ecf.ui.handlers; import org.eclipse.compare.CompareUI; diff --git a/framework/bundles/org.eclipse.team.ecf.ui/src/org/eclipse/team/internal/ecf/ui/handlers/CompareWithMenuContributionItem.java b/framework/bundles/org.eclipse.team.ecf.ui/src/org/eclipse/team/internal/ecf/ui/handlers/CompareWithMenuContributionItem.java index e51a3a250..8c36fdc7f 100644 --- a/framework/bundles/org.eclipse.team.ecf.ui/src/org/eclipse/team/internal/ecf/ui/handlers/CompareWithMenuContributionItem.java +++ b/framework/bundles/org.eclipse.team.ecf.ui/src/org/eclipse/team/internal/ecf/ui/handlers/CompareWithMenuContributionItem.java @@ -1,13 +1,15 @@ -/****************************************************************************** +/**************************************************************************** * Copyright (c) 2008 Versant Corporation and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Remy Chi Jian Suen (Versant Corporation) - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.team.internal.ecf.ui.handlers; import org.eclipse.ecf.presence.roster.IRosterEntry; diff --git a/framework/bundles/org.eclipse.team.ecf.ui/src/org/eclipse/team/internal/ecf/ui/handlers/SynchronizeWithHandler.java b/framework/bundles/org.eclipse.team.ecf.ui/src/org/eclipse/team/internal/ecf/ui/handlers/SynchronizeWithHandler.java index 61c49aa6d..d77f03154 100644 --- a/framework/bundles/org.eclipse.team.ecf.ui/src/org/eclipse/team/internal/ecf/ui/handlers/SynchronizeWithHandler.java +++ b/framework/bundles/org.eclipse.team.ecf.ui/src/org/eclipse/team/internal/ecf/ui/handlers/SynchronizeWithHandler.java @@ -1,13 +1,15 @@ -/****************************************************************************** +/**************************************************************************** * Copyright (c) 2008 Versant Corporation and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Remy Chi Jian Suen (Versant Corporation) - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.team.internal.ecf.ui.handlers; import java.lang.reflect.InvocationTargetException; diff --git a/framework/bundles/org.eclipse.team.ecf.ui/src/org/eclipse/team/internal/ecf/ui/handlers/SynchronizeWithMenuContributionItem.java b/framework/bundles/org.eclipse.team.ecf.ui/src/org/eclipse/team/internal/ecf/ui/handlers/SynchronizeWithMenuContributionItem.java index 7e61da8ab..39ccdf1f9 100644 --- a/framework/bundles/org.eclipse.team.ecf.ui/src/org/eclipse/team/internal/ecf/ui/handlers/SynchronizeWithMenuContributionItem.java +++ b/framework/bundles/org.eclipse.team.ecf.ui/src/org/eclipse/team/internal/ecf/ui/handlers/SynchronizeWithMenuContributionItem.java @@ -1,13 +1,15 @@ -/****************************************************************************** +/**************************************************************************** * Copyright (c) 2008 Versant Corporation and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Remy Chi Jian Suen (Versant Corporation) - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.team.internal.ecf.ui.handlers; import org.eclipse.ecf.presence.roster.IRosterEntry; diff --git a/framework/bundles/org.eclipse.team.ecf.ui/src/org/eclipse/team/internal/ecf/ui/messages.properties b/framework/bundles/org.eclipse.team.ecf.ui/src/org/eclipse/team/internal/ecf/ui/messages.properties index adde505d8..ba37dca09 100644 --- a/framework/bundles/org.eclipse.team.ecf.ui/src/org/eclipse/team/internal/ecf/ui/messages.properties +++ b/framework/bundles/org.eclipse.team.ecf.ui/src/org/eclipse/team/internal/ecf/ui/messages.properties @@ -1,13 +1,12 @@ -################################################################################ +############################################################################ # Copyright (c) 2009 Remy Chi Jian Suen and others. -# 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: -# Remy Chi Jian Suen - initial API and implementation -################################################################################ +# This program and the accompanying materials are made +# available under the terms of the Eclipse Public License 2.0 +# which is available at https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 +############################################################################ WorkbenchAwareRemoteShare_PromptMessage = {0} would like to synchronize some resources with you.{1} diff --git a/framework/bundles/org.eclipse.team.ecf.ui/src/org/eclipse/team/internal/ecf/ui/subscriber/RemoteSubscriberParticipant.java b/framework/bundles/org.eclipse.team.ecf.ui/src/org/eclipse/team/internal/ecf/ui/subscriber/RemoteSubscriberParticipant.java index a4559c4c3..7790a2d54 100644 --- a/framework/bundles/org.eclipse.team.ecf.ui/src/org/eclipse/team/internal/ecf/ui/subscriber/RemoteSubscriberParticipant.java +++ b/framework/bundles/org.eclipse.team.ecf.ui/src/org/eclipse/team/internal/ecf/ui/subscriber/RemoteSubscriberParticipant.java @@ -1,13 +1,15 @@ -/****************************************************************************** +/**************************************************************************** * Copyright (c) 2008 Versant Corporation and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Remy Chi Jian Suen (Versant Corporation) - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.team.internal.ecf.ui.subscriber; import org.eclipse.core.resources.IResource; diff --git a/framework/bundles/org.eclipse.team.ecf.ui/src/org/eclipse/team/internal/ecf/ui/wizards/RemotePeerSynchronizeWizard.java b/framework/bundles/org.eclipse.team.ecf.ui/src/org/eclipse/team/internal/ecf/ui/wizards/RemotePeerSynchronizeWizard.java index f016aec46..d576475a0 100644 --- a/framework/bundles/org.eclipse.team.ecf.ui/src/org/eclipse/team/internal/ecf/ui/wizards/RemotePeerSynchronizeWizard.java +++ b/framework/bundles/org.eclipse.team.ecf.ui/src/org/eclipse/team/internal/ecf/ui/wizards/RemotePeerSynchronizeWizard.java @@ -1,13 +1,15 @@ -/****************************************************************************** +/**************************************************************************** * Copyright (c) 2008 Versant Corporation and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Remy Chi Jian Suen (Versant Corporation) - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.team.internal.ecf.ui.wizards; import org.eclipse.core.resources.IResource; diff --git a/framework/bundles/org.eclipse.team.ecf.ui/src/org/eclipse/team/internal/ecf/ui/wizards/RemotePeerSynchronizeWizardPage.java b/framework/bundles/org.eclipse.team.ecf.ui/src/org/eclipse/team/internal/ecf/ui/wizards/RemotePeerSynchronizeWizardPage.java index 25e3dd183..83edbdc46 100644 --- a/framework/bundles/org.eclipse.team.ecf.ui/src/org/eclipse/team/internal/ecf/ui/wizards/RemotePeerSynchronizeWizardPage.java +++ b/framework/bundles/org.eclipse.team.ecf.ui/src/org/eclipse/team/internal/ecf/ui/wizards/RemotePeerSynchronizeWizardPage.java @@ -1,13 +1,15 @@ -/****************************************************************************** +/**************************************************************************** * Copyright (c) 2008 Versant Corporation and others. - * 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 + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * * Contributors: * Remy Chi Jian Suen (Versant Corporation) - initial API and implementation - ******************************************************************************/ + * + * SPDX-License-Identifier: EPL-2.0 + *****************************************************************************/ package org.eclipse.team.internal.ecf.ui.wizards; import java.util.*; |