Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMat Booth2020-06-03 23:00:20 +0000
committerMat Booth2020-06-11 22:20:53 +0000
commit464f42104aa4ee4837d11c8ca64bc5341555f4fe (patch)
treeacf92c9699894654a322c90372449224b7e0536b
parent4d60743d71792cd3b6f3efca98eb2bdb7b11272e (diff)
downloadorg.eclipse.ecf-464f42104aa4ee4837d11c8ca64bc5341555f4fe.tar.gz
org.eclipse.ecf-464f42104aa4ee4837d11c8ca64bc5341555f4fe.tar.xz
org.eclipse.ecf-464f42104aa4ee4837d11c8ca64bc5341555f4fe.zip
Bug 560602 - Switch to EPL version 2.0
Update license headers in framework bundles Change-Id: I746fa91a069cad039cfd12526bef8b69507b79fe Signed-off-by: Mat Booth <mat.booth@redhat.com>
-rw-r--r--framework/bundles/org.eclipse.ecf.console/META-INF/MANIFEST.MF2
-rw-r--r--framework/bundles/org.eclipse.ecf.console/plugin.properties9
-rw-r--r--framework/bundles/org.eclipse.ecf.console/pom.xml2
-rw-r--r--framework/bundles/org.eclipse.ecf.console/src/org/eclipse/ecf/console/AbstractCommand.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.console/src/org/eclipse/ecf/internal/console/ContainerCommand.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.datashare/META-INF/MANIFEST.MF2
-rw-r--r--framework/bundles/org.eclipse.ecf.datashare/plugin.properties9
-rw-r--r--framework/bundles/org.eclipse.ecf.datashare/pom.xml2
-rw-r--r--framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/AbstractShare.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/BaseChannelConfig.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/ChannelContainer.java21
-rw-r--r--framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/IAbstractChannel.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/IAbstractChannelContainerAdapter.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/IChannel.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/IChannelConfig.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/IChannelContainer.java21
-rw-r--r--framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/IChannelContainerAdapter.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/IChannelContainerListener.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/IChannelListener.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/IStreamContainerAdapter.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/events/IChannelConnectEvent.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/events/IChannelContainerChannelActivatedEvent.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/events/IChannelContainerChannelDeactivatedEvent.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/events/IChannelContainerEvent.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/events/IChannelDisconnectEvent.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/events/IChannelEvent.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/events/IChannelMessageEvent.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/mergeable/IChannelHeader.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/mergeable/IConflict.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/mergeable/IItem.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/mergeable/IItemFactory.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/mergeable/IItemHistory.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/mergeable/IMergeableChannel.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/mergeable/IMergeableChannelContainerAdapter.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/mergeable/IUpdateInfo.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/mergeable/MergeException.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/mergeable/PublishException.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/service/IDatashareService.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery.ui.browser/META-INF/MANIFEST.MF2
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery.ui.browser/plugin.properties9
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery.ui.browser/pom.xml2
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery.ui.browser/src/org/eclipse/ecf/discovery/ui/browser/OpenBrowserCommand.java14
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery.ui.edit/META-INF/MANIFEST.MF2
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery.ui.edit/plugin.properties17
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery.ui.edit/pom.xml2
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery.ui.edit/src/org/eclipse/ecf/discovery/ui/model/IItemStatusLineProvider.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery.ui.edit/src/org/eclipse/ecf/discovery/ui/model/ItemProviderWithStatusLineAdapter.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery.ui.edit/src/org/eclipse/ecf/discovery/ui/model/provider/DiscoveryEditPlugin.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery.ui.edit/src/org/eclipse/ecf/discovery/ui/model/provider/DiscoveryEditingDomainProvider.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery.ui.edit/src/org/eclipse/ecf/discovery/ui/model/provider/IHostItemProvider.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery.ui.edit/src/org/eclipse/ecf/discovery/ui/model/provider/INetworkItemProvider.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery.ui.edit/src/org/eclipse/ecf/discovery/ui/model/provider/IServiceIDItemProvider.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery.ui.edit/src/org/eclipse/ecf/discovery/ui/model/provider/IServiceInfoItemProvider.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery.ui.edit/src/org/eclipse/ecf/discovery/ui/model/provider/IServiceTypeIDItemProvider.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery.ui.edit/src/org/eclipse/ecf/discovery/ui/model/provider/ModelItemProviderAdapterFactory.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery.ui.model/META-INF/MANIFEST.MF2
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery.ui.model/plugin.properties17
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery.ui.model/pom.xml2
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery.ui.model/src/org/eclipse/ecf/discovery/ui/model/IHost.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery.ui.model/src/org/eclipse/ecf/discovery/ui/model/INetwork.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery.ui.model/src/org/eclipse/ecf/discovery/ui/model/IServiceID.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery.ui.model/src/org/eclipse/ecf/discovery/ui/model/IServiceInfo.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery.ui.model/src/org/eclipse/ecf/discovery/ui/model/IServiceTypeID.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery.ui.model/src/org/eclipse/ecf/discovery/ui/model/ModelFactory.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery.ui.model/src/org/eclipse/ecf/discovery/ui/model/ModelPackage.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery.ui.model/src/org/eclipse/ecf/discovery/ui/model/ModelPlugin.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery.ui.model/src/org/eclipse/ecf/discovery/ui/model/impl/IHostImpl.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery.ui.model/src/org/eclipse/ecf/discovery/ui/model/impl/INetworkImpl.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery.ui.model/src/org/eclipse/ecf/discovery/ui/model/impl/IServiceIDImpl.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery.ui.model/src/org/eclipse/ecf/discovery/ui/model/impl/IServiceInfoImpl.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery.ui.model/src/org/eclipse/ecf/discovery/ui/model/impl/IServiceTypeIDImpl.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery.ui.model/src/org/eclipse/ecf/discovery/ui/model/impl/ModelFactoryImpl.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery.ui.model/src/org/eclipse/ecf/discovery/ui/model/impl/ModelPackageImpl.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery.ui.model/src/org/eclipse/ecf/discovery/ui/model/resource/Messages.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery.ui.model/src/org/eclipse/ecf/discovery/ui/model/resource/ServiceResource.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery.ui.model/src/org/eclipse/ecf/discovery/ui/model/resource/ServiceResourceFactory.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery.ui.model/src/org/eclipse/ecf/discovery/ui/model/util/ModelAdapterFactory.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery.ui.model/src/org/eclipse/ecf/discovery/ui/model/util/ModelSwitch.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery.ui.properties.tabbed/META-INF/MANIFEST.MF2
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery.ui.properties.tabbed/plugin.properties17
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery.ui.properties.tabbed/pom.xml2
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery.ui.properties.tabbed/src/org/eclipse/ecf/internal/discovery/ui/ServicePropertiesLabelProvider.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery.ui.properties.tabbed/src/org/eclipse/ecf/internal/discovery/ui/ServicePropertiesPropertySection.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery.ui.properties.tabbed/src/org/eclipse/ecf/internal/discovery/ui/ServicePropertiesPropertySource.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery.ui.properties.tabbed/src/org/eclipse/ecf/internal/discovery/ui/ServicePropertySection.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery.ui.properties.tabbed/src/org/eclipse/ecf/internal/discovery/ui/ServiceTypePropertySection.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery.ui.properties.tabbed/src/org/eclipse/ecf/internal/discovery/ui/TabbedPropertyAdapterFactory.java14
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery.ui.properties/META-INF/MANIFEST.MF2
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery.ui.properties/plugin.properties17
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery.ui.properties/pom.xml2
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery.ui.properties/src/org/eclipse/ecf/internal/discovery/ui/EObjectPropertySourceFactory.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery.ui.userinput/META-INF/MANIFEST.MF2
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery.ui.userinput/plugin.properties9
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery.ui.userinput/pom.xml2
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery.ui.userinput/src/org/eclipse/ecf/discovery/ui/userinput/Activator.java14
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery.ui.userinput/src/org/eclipse/ecf/discovery/ui/userinput/Messages.java14
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery.ui.userinput/src/org/eclipse/ecf/discovery/ui/userinput/UserInputDiscoveryContainerInstantiator.java14
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery.ui.userinput/src/org/eclipse/ecf/discovery/ui/userinput/UserInputDiscoveryLocator.java14
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery.ui.userinput/src/org/eclipse/ecf/discovery/ui/userinput/UserInputNamespace.java14
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery.ui.userinput/src/org/eclipse/ecf/discovery/ui/userinput/handler/InputDialogWithComboHistory.java14
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery.ui.userinput/src/org/eclipse/ecf/discovery/ui/userinput/handler/LookupHandler.java14
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery.ui/META-INF/MANIFEST.MF2
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery.ui/plugin.properties19
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery.ui/pom.xml2
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery.ui/src/org/eclipse/ecf/discovery/ui/DiscoveryHandlerUtil.java14
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery.ui/src/org/eclipse/ecf/discovery/ui/DiscoveryPropertyTesterUtil.java14
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery.ui/src/org/eclipse/ecf/internal/discovery/ui/DiscoveryUIPlugin.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery.ui/src/org/eclipse/ecf/internal/discovery/ui/property/ServiceTypeTester.java14
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery.ui/src/org/eclipse/ecf/internal/discovery/ui/statusline/AdapterFactoryStatuslineProvider.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery.ui/src/org/eclipse/ecf/internal/discovery/ui/views/DiscoveryView.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery/META-INF/MANIFEST.MF2
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery/plugin.properties9
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery/pom.xml2
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/AbstractDiscoveryContainerAdapter.java14
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/DiscoveryContainerConfig.java14
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/IContainerServiceInfoAdapter.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/IDiscoveryAdvertiser.java16
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/IDiscoveryContainerAdapter.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/IDiscoveryLocator.java16
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/IServiceEvent.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/IServiceInfo.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/IServiceListener.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/IServiceProperties.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/IServiceTypeEvent.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/IServiceTypeListener.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/ServiceContainerEvent.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/ServiceInfo.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/ServiceProperties.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/ServiceTypeContainerEvent.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/identity/IServiceID.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/identity/IServiceIDFactory.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/identity/IServiceTypeID.java14
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/identity/ServiceID.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/identity/ServiceIDFactory.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/identity/ServiceTypeID.java14
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/service/IDiscoveryService.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/internal/discovery/DiscoveryDebugOption.java14
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/internal/discovery/DiscoveryNamespace.java14
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/internal/discovery/DiscoveryPlugin.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/internal/discovery/DiscoveryServiceListener.java14
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/internal/discovery/IServiceInfoServiceListener.java15
-rw-r--r--framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/internal/discovery/ServiceTypeComparator.java14
-rw-r--r--framework/bundles/org.eclipse.ecf.docshare/META-INF/MANIFEST.MF2
-rw-r--r--framework/bundles/org.eclipse.ecf.docshare/plugin.properties17
-rw-r--r--framework/bundles/org.eclipse.ecf.docshare/pom.xml2
-rw-r--r--framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/DocShare.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/DocShareEditorInput.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/menu/DocShareRosterMenuContributionItem.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/menu/DocShareRosterMenuHandler.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/messages/Message.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/messages/SelectionMessage.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/messages/StartMessage.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/docshare/messages/StopMessage.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/internal/docshare/Activator.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/internal/docshare/DocshareDebugOptions.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/internal/docshare/ECFStart.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/internal/docshare/Messages.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.docshare/src/org/eclipse/ecf/internal/docshare/messages.properties17
-rw-r--r--framework/bundles/org.eclipse.ecf.filetransfer.ui/META-INF/MANIFEST.MF2
-rw-r--r--framework/bundles/org.eclipse.ecf.filetransfer.ui/build.properties15
-rw-r--r--framework/bundles/org.eclipse.ecf.filetransfer.ui/plugin.properties15
-rw-r--r--framework/bundles/org.eclipse.ecf.filetransfer.ui/pom.xml2
-rw-r--r--framework/bundles/org.eclipse.ecf.filetransfer.ui/src/org/eclipse/ecf/filetransfer/ui/FileTransfersView.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.filetransfer.ui/src/org/eclipse/ecf/filetransfer/ui/actions/AbstractFileSendAction.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.filetransfer.ui/src/org/eclipse/ecf/internal/filetransfer/ui/Activator.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.filetransfer.ui/src/org/eclipse/ecf/internal/filetransfer/ui/GetFileHandler.java14
-rw-r--r--framework/bundles/org.eclipse.ecf.filetransfer.ui/src/org/eclipse/ecf/internal/filetransfer/ui/Messages.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.filetransfer.ui/src/org/eclipse/ecf/internal/filetransfer/ui/StartFileDownloadDialog.java14
-rw-r--r--framework/bundles/org.eclipse.ecf.filetransfer.ui/src/org/eclipse/ecf/internal/filetransfer/ui/hyperlink/SCPHyperlink.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.filetransfer.ui/src/org/eclipse/ecf/internal/filetransfer/ui/preferences/TransferPreferencePage.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.filetransfer/META-INF/MANIFEST.MF2
-rw-r--r--framework/bundles/org.eclipse.ecf.filetransfer/plugin.properties9
-rw-r--r--framework/bundles/org.eclipse.ecf.filetransfer/pom.xml2
-rw-r--r--framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/BrowseFileTransferException.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/FileTransferInfo.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/FileTransferJob.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IFileRangeSpecification.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IFileTransfer.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IFileTransferInfo.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IFileTransferListener.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IFileTransferPausable.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IFileTransferRateControl.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IFileTransferRunnable.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IIncomingFileTransfer.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IIncomingFileTransferRequestListener.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IOutgoingFileTransfer.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IRemoteFile.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IRemoteFileAttributes.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IRemoteFileInfo.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IRemoteFileSystemBrowserContainerAdapter.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IRemoteFileSystemListener.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IRemoteFileSystemRequest.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IRetrieveFileTransferContainerAdapter.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IRetrieveFileTransferOptions.java21
-rw-r--r--framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/ISendFileTransferContainerAdapter.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/ISendFileTransferOptions.java21
-rw-r--r--framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IncomingFileTransferException.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/InvalidFileRangeSpecificationException.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/RemoteFileSystemException.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/SendFileTransferException.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/UserCancelledException.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/IFileTransferConnectStartEvent.java16
-rw-r--r--framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/IFileTransferEvent.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/IFileTransferRequestEvent.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/IIncomingFileTransferEvent.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/IIncomingFileTransferReceiveDataEvent.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/IIncomingFileTransferReceiveDoneEvent.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/IIncomingFileTransferReceivePausedEvent.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/IIncomingFileTransferReceiveResumedEvent.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/IIncomingFileTransferReceiveStartEvent.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/IOutgoingFileTransferEvent.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/IOutgoingFileTransferResponseEvent.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/IOutgoingFileTransferSendDataEvent.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/IOutgoingFileTransferSendDoneEvent.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/IOutgoingFileTransferSendPausedEvent.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/IOutgoingFileTransferSendResumedEvent.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/IRemoteFileSystemBrowseEvent.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/IRemoteFileSystemEvent.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/socket/ISocketClosedEvent.java16
-rw-r--r--framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/socket/ISocketConnectedEvent.java16
-rw-r--r--framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/socket/ISocketCreatedEvent.java16
-rw-r--r--framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/socket/ISocketEvent.java16
-rw-r--r--framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/socket/ISocketEventSource.java22
-rw-r--r--framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/socket/ISocketListener.java22
-rw-r--r--framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/events/socketfactory/INonconnectedSocketFactory.java22
-rw-r--r--framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/identity/FileCreateException.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/identity/FileIDFactory.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/identity/IFileID.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/identity/IFileIDFactory.java21
-rw-r--r--framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/service/IRemoteFileSystemBrowser.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/service/IRemoteFileSystemBrowserFactory.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/service/IRetrieveFileTransfer.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/service/IRetrieveFileTransferFactory.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/service/ISendFileTransfer.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/service/ISendFileTransferFactory.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/internal/filetransfer/Activator.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/internal/filetransfer/FileTransferDebugOptions.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.identity/META-INF/MANIFEST.MF2
-rw-r--r--framework/bundles/org.eclipse.ecf.identity/build.properties17
-rw-r--r--framework/bundles/org.eclipse.ecf.identity/plugin.properties9
-rw-r--r--framework/bundles/org.eclipse.ecf.identity/pom.xml2
-rw-r--r--framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/BaseID.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/GUID.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/ID.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/IDCreateException.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/IDFactory.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/IIDFactory.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/IIdentifiable.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/IResourceID.java15
-rw-r--r--framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/LongID.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/Namespace.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/NamespacePermission.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/StringID.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/URIID.java15
-rw-r--r--framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/UuID.java15
-rw-r--r--framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/util/AbstractFactory.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/util/AdapterManagerTracker.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/util/Base64.java16
-rw-r--r--framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/util/BundleStarter.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/util/ECFException.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/util/ECFRuntimeException.java14
-rw-r--r--framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/util/ExtensionRegistryRunnable.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/util/IDFactoryTracker.java15
-rw-r--r--framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/util/LogHelper.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/util/PlatformHelper.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/util/StringUtils.java14
-rw-r--r--framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/util/SystemLogService.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/util/Trace.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/internal/core/identity/Activator.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.identity/src_r7stubs/org/osgi/service/log/Logger.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.presence.bot/META-INF/MANIFEST.MF2
-rw-r--r--framework/bundles/org.eclipse.ecf.presence.bot/plugin.properties9
-rw-r--r--framework/bundles/org.eclipse.ecf.presence.bot/pom.xml2
-rw-r--r--framework/bundles/org.eclipse.ecf.presence.bot/src/org/eclipse/ecf/internal/presence/bot/Activator.java14
-rw-r--r--framework/bundles/org.eclipse.ecf.presence.bot/src/org/eclipse/ecf/internal/presence/bot/ChatRoomBotEntry.java14
-rw-r--r--framework/bundles/org.eclipse.ecf.presence.bot/src/org/eclipse/ecf/internal/presence/bot/ChatRoomMessageHandlerEntry.java14
-rw-r--r--framework/bundles/org.eclipse.ecf.presence.bot/src/org/eclipse/ecf/internal/presence/bot/IMBotEntry.java14
-rw-r--r--framework/bundles/org.eclipse.ecf.presence.bot/src/org/eclipse/ecf/internal/presence/bot/IMMessageHandlerEntry.java14
-rw-r--r--framework/bundles/org.eclipse.ecf.presence.bot/src/org/eclipse/ecf/presence/bot/IChatRoomBotEntry.java14
-rw-r--r--framework/bundles/org.eclipse.ecf.presence.bot/src/org/eclipse/ecf/presence/bot/IChatRoomContainerAdvisor.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.presence.bot/src/org/eclipse/ecf/presence/bot/IChatRoomMessageHandler.java14
-rw-r--r--framework/bundles/org.eclipse.ecf.presence.bot/src/org/eclipse/ecf/presence/bot/IChatRoomMessageHandlerEntry.java14
-rw-r--r--framework/bundles/org.eclipse.ecf.presence.bot/src/org/eclipse/ecf/presence/bot/IContainerAdvisor.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.presence.bot/src/org/eclipse/ecf/presence/bot/IIMBotEntry.java14
-rw-r--r--framework/bundles/org.eclipse.ecf.presence.bot/src/org/eclipse/ecf/presence/bot/IIMMessageHandler.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.presence.bot/src/org/eclipse/ecf/presence/bot/IIMMessageHandlerEntry.java14
-rw-r--r--framework/bundles/org.eclipse.ecf.presence.bot/src/org/eclipse/ecf/presence/bot/application/ChatRoomBotApplication.java14
-rw-r--r--framework/bundles/org.eclipse.ecf.presence.bot/src/org/eclipse/ecf/presence/bot/application/IMBotApplication.java14
-rw-r--r--framework/bundles/org.eclipse.ecf.presence.bot/src/org/eclipse/ecf/presence/bot/impl/ChatRoomBot.java14
-rw-r--r--framework/bundles/org.eclipse.ecf.presence.bot/src/org/eclipse/ecf/presence/bot/impl/EmptyChatRoomMessageHandler.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.presence.bot/src/org/eclipse/ecf/presence/bot/impl/EmptyIMMessageHandler.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.presence.bot/src/org/eclipse/ecf/presence/bot/impl/IMBot.java14
-rw-r--r--framework/bundles/org.eclipse.ecf.presence.collab.ui/plugin.properties9
-rw-r--r--framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/internal/presence/collab/ui/Activator.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/internal/presence/collab/ui/Messages.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/internal/presence/collab/ui/ShareReceiversECFStart.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/internal/presence/collab/ui/messages.properties15
-rw-r--r--framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/internal/presence/collab/ui/view/ShowViewDialogLabelProvider.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/internal/presence/collab/ui/view/ShowViewDialogTreeContentProvider.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/internal/presence/collab/ui/view/ShowViewDialogViewerFilter.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/presence/collab/ui/AbstractCollabShare.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/presence/collab/ui/console/ConsoleRosterMenuContributionItem.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/presence/collab/ui/console/ConsoleShare.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/presence/collab/ui/console/ConsoleShareRosterEntryContributionItem.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/presence/collab/ui/screencapture/ScreenCaptureDataMessage.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/presence/collab/ui/screencapture/ScreenCaptureShare.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/presence/collab/ui/screencapture/ScreenCaptureShareRosterContributionItem.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/presence/collab/ui/screencapture/ScreenCaptureShareRosterEntryContributionItem.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/presence/collab/ui/screencapture/ScreenCaptureStartMessage.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/presence/collab/ui/url/URLShare.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/presence/collab/ui/url/URLShareRosterContributionItem.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/presence/collab/ui/url/URLShareRosterEntryContributionItem.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/presence/collab/ui/view/ViewShare.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/presence/collab/ui/view/ViewShareRosterContributionItem.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/presence/collab/ui/view/ViewShareRosterEntryContributionItem.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.presence.ui/META-INF/MANIFEST.MF2
-rw-r--r--framework/bundles/org.eclipse.ecf.presence.ui/plugin.properties16
-rw-r--r--framework/bundles/org.eclipse.ecf.presence.ui/pom.xml2
-rw-r--r--framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/internal/presence/ui/Activator.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/internal/presence/ui/ChatLine.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/internal/presence/ui/Messages.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/internal/presence/ui/dialogs/AddContactDialog.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/internal/presence/ui/dialogs/ChangePasswordDialog.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/internal/presence/ui/dialogs/ChatRoomSelectionDialog.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/internal/presence/ui/dialogs/ReceiveAuthorizeRequestDialog.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/internal/presence/ui/dialogs/SearchContactDialog.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/internal/presence/ui/handlers/BrowseDialog.java14
-rw-r--r--framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/internal/presence/ui/handlers/BrowseHandler.java14
-rw-r--r--framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/internal/presence/ui/messages.properties16
-rw-r--r--framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/internal/presence/ui/preferences/ChatRoomPreferencePage.java14
-rw-r--r--framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/internal/presence/ui/preferences/PreferenceConstants.java14
-rw-r--r--framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/internal/presence/ui/preferences/PreferenceInitializer.java14
-rw-r--r--framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/IMultiRosterViewPart.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/MessageNotificationPopup.java14
-rw-r--r--framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/MessagesView.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/MultiRosterAccount.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/MultiRosterContentProvider.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/MultiRosterLabelProvider.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/MultiRosterView.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/RosterWorkbenchAdapter2Factory.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/RosterWorkbenchAdapterFactory.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/UserSearchContentProvider.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/UserSearchLabelProvider.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/UserSearchView.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/chatroom/ChatRoomManagerUI.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/chatroom/ChatRoomManagerView.java14
-rw-r--r--framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/chatroom/IChatRoomCommandListener.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/chatroom/IChatRoomViewCloseListener.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/chatroom/IMessageRenderer.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/chatroom/MessageRenderer.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/dnd/IRosterViewerDropTarget.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/menu/AbstractRosterMenuContributionItem.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/menu/AbstractRosterMenuHandler.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/menu/NoopRosterMenuContributionItem.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/roster/AbstractPresenceContributionItem.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/roster/AbstractRosterContributionItem.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/roster/AbstractRosterEntryContributionItem.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/roster/AbstractRosterGroupContributionItem.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.presence/META-INF/MANIFEST.MF2
-rw-r--r--framework/bundles/org.eclipse.ecf.presence/plugin.properties9
-rw-r--r--framework/bundles/org.eclipse.ecf.presence/pom.xml2
-rw-r--r--framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/internal/presence/PresencePlugin.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/AbstractPresenceContainer.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IAccountManager.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IFQID.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IIMMessage.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IIMMessageEvent.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IIMMessageListener.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IMMessage.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IPresence.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IPresenceContainer.java21
-rw-r--r--framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IPresenceContainerAdapter.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IPresenceListener.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IPresenceSender.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/Presence.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/PresenceContainer.java21
-rw-r--r--framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/chatroom/ChatRoomCreateException.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/chatroom/ChatRoomMessage.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/chatroom/ChatRoomMessageEvent.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/chatroom/IChatRoomAdminListener.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/chatroom/IChatRoomAdminSender.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/chatroom/IChatRoomContainer.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/chatroom/IChatRoomContainerOptionsAdapter.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/chatroom/IChatRoomInfo.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/chatroom/IChatRoomInvitationListener.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/chatroom/IChatRoomInvitationSender.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/chatroom/IChatRoomManager.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/chatroom/IChatRoomMessage.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/chatroom/IChatRoomMessageEvent.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/chatroom/IChatRoomMessageSender.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/chatroom/IChatRoomParticipantListener.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/history/IHistory.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/history/IHistoryLine.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/history/IHistoryManager.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/im/ChatMessage.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/im/ChatMessageEvent.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/im/IChat.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/im/IChatID.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/im/IChatManager.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/im/IChatMessage.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/im/IChatMessageEvent.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/im/IChatMessageSender.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/im/IChatRoomCreationEvent.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/im/ITypingMessage.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/im/ITypingMessageEvent.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/im/ITypingMessageSender.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/im/IXHTMLChatMessage.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/im/IXHTMLChatMessageEvent.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/im/TypingMessage.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/im/TypingMessageEvent.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/im/XHTMLChatMessage.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/im/XHTMLChatMessageEvent.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/roster/AbstractRosterManager.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/roster/IRoster.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/roster/IRosterEntry.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/roster/IRosterGroup.java19
-rw-r--r--framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/roster/IRosterItem.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/roster/IRosterListener.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/roster/IRosterManager.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/roster/IRosterSubscriptionListener.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/roster/IRosterSubscriptionSender.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/roster/Roster.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/roster/RosterEntry.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/roster/RosterGroup.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/roster/RosterItem.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/AbstractUserSearchManager.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/ICriteria.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/ICriterion.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/IRestriction.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/IResult.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/IResultList.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/ISearch.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/IUserSearchCompleteEvent.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/IUserSearchEvent.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/IUserSearchListener.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/IUserSearchManager.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/LogicalCriterion.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/Restriction.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/ResultList.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/SimpleCriterion.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/UserSearchCompleteEvent.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/UserSearchException.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/message/IMessageResult.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/message/IMessageSearchCompleteEvent.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/message/IMessageSearchEvent.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/message/IMessageSearchListener.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/message/IMessageSearchManager.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/message/MessageSearchCompleteEvent.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/search/message/MessageSearchException.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/service/IPresenceService.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.provider/META-INF/MANIFEST.MF2
-rw-r--r--framework/bundles/org.eclipse.ecf.provider/build.properties15
-rw-r--r--framework/bundles/org.eclipse.ecf.provider/plugin.properties9
-rw-r--r--framework/bundles/org.eclipse.ecf.provider/pom.xml2
-rw-r--r--framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/internal/provider/ECFProviderDebugOptions.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/internal/provider/ProviderPlugin.java20
-rw-r--r--framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/AsynchEvent.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/ConnectionCreateException.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/ConnectionEvent.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/DisconnectEvent.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/IAsynchConnection.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/IAsynchEventHandler.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/IConnectRequestHandler.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/IConnection.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/IConnectionListener.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/ISynchAsynchConnection.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/ISynchAsynchEventHandler.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/ISynchConnection.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/ISynchEventHandler.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/SynchEvent.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/tcp/AsynchMessage.java20
-rw-r--r--framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/tcp/Client.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/tcp/ConnectRequestMessage.java20
-rw-r--r--framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/tcp/ConnectResultMessage.java20
-rw-r--r--framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/tcp/ExObjectInputStream.java20
-rw-r--r--framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/tcp/ExObjectOutputStream.java20
-rw-r--r--framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/tcp/IClientSocketFactory.java20
-rw-r--r--framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/tcp/IServerSocketFactory.java20
-rw-r--r--framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/tcp/ISocketAcceptHandler.java20
-rw-r--r--framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/tcp/PingMessage.java20
-rw-r--r--framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/tcp/PingResponseMessage.java20
-rw-r--r--framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/tcp/SSLClient.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/tcp/Server.java20
-rw-r--r--framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/tcp/SocketFactory.java20
-rw-r--r--framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/comm/tcp/SynchMessage.java20
-rw-r--r--framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/ClientSOContainer.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/ContainerMessage.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/GenericContainerInstantiator.java14
-rw-r--r--framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOConfig.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOConnector.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOContainer.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOContainerConfig.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOContainerGMM.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOContainerGroup.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOContext.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOManager.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOWrapper.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SSLClientSOContainer.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SSLGenericContainerInstantiator.java14
-rw-r--r--framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SSLServerSOContainer.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SSLServerSOContainerGroup.java14
-rw-r--r--framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/ServerSOContainer.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/TCPClientSOContainer.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/TCPServerSOContainer.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/TCPServerSOContainerGroup.java14
-rw-r--r--framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/gmm/GMMImpl.java14
-rw-r--r--framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/gmm/Member.java20
-rw-r--r--framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/gmm/MemberChanged.java20
-rw-r--r--framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/util/IClassLoaderMapper.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/util/IdentifiableObjectInputStream.java16
-rw-r--r--framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/util/IdentifiableObjectOutputStream.java16
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.asyncproxy.j8/META-INF/MANIFEST.MF2
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.asyncproxy.j8/bundle.properties9
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.asyncproxy.j8/pom.xml2
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.asyncproxy.j8/src/org/eclipse/ecf/remoteservice/asyncproxy/AbstractAsyncProxyRemoteCall.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.asyncproxy.j8/src/org/eclipse/ecf/remoteservice/asyncproxy/AbstractAsyncProxyRemoteService.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.asyncproxy.j8/src/org/eclipse/ecf/remoteservice/asyncproxy/AsyncReturnUtil.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.asyncproxy.j8/src/org/eclipse/ecf/remoteservice/asyncproxy/IAsyncProxyCompletable.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.asyncproxy/META-INF/MANIFEST.MF2
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.asyncproxy/bundle.properties9
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.asyncproxy/pom.xml2
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.asyncproxy/src/org/eclipse/ecf/remoteservice/asyncproxy/AbstractAsyncProxyRemoteCall.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.asyncproxy/src/org/eclipse/ecf/remoteservice/asyncproxy/AbstractAsyncProxyRemoteService.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.asyncproxy/src/org/eclipse/ecf/remoteservice/asyncproxy/AsyncReturnUtil.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.asyncproxy/src/org/eclipse/ecf/remoteservice/asyncproxy/IAsyncProxyCompletable.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.rest.synd/META-INF/MANIFEST.MF2
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.rest.synd/plugin.properties17
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.rest.synd/pom.xml2
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.rest.synd/src/org/eclipse/ecf/internal/remoteservice/rest/synd/Activator.java15
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.rest.synd/src/org/eclipse/ecf/remoteservice/rest/synd/SyndFeedResponseDeserializer.java15
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.rest/META-INF/MANIFEST.MF2
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.rest/plugin.properties9
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.rest/pom.xml2
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.rest/src/org/eclipse/ecf/internal/remoteservice/rest/Activator.java15
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.rest/src/org/eclipse/ecf/internal/remoteservice/rest/DebugOptions.java15
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.rest/src/org/eclipse/ecf/internal/remoteservice/rest/RestClientContainerInstantiator.java15
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.rest/src/org/eclipse/ecf/remoteservice/rest/IRestCall.java15
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.rest/src/org/eclipse/ecf/remoteservice/rest/RestCall.java15
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.rest/src/org/eclipse/ecf/remoteservice/rest/RestCallFactory.java15
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.rest/src/org/eclipse/ecf/remoteservice/rest/RestCallableFactory.java21
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.rest/src/org/eclipse/ecf/remoteservice/rest/RestException.java21
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.rest/src/org/eclipse/ecf/remoteservice/rest/client/AbstractEntityRequestType.java21
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.rest/src/org/eclipse/ecf/remoteservice/rest/client/AbstractRequestType.java21
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.rest/src/org/eclipse/ecf/remoteservice/rest/client/AbstractRestClientContainer.java21
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.rest/src/org/eclipse/ecf/remoteservice/rest/client/AbstractRestClientService.java21
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.rest/src/org/eclipse/ecf/remoteservice/rest/client/HttpDeleteRequestType.java21
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.rest/src/org/eclipse/ecf/remoteservice/rest/client/HttpGetRequestType.java21
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.rest/src/org/eclipse/ecf/remoteservice/rest/client/HttpPostRequestType.java21
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.rest/src/org/eclipse/ecf/remoteservice/rest/client/HttpPutRequestType.java21
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.rest/src/org/eclipse/ecf/remoteservice/rest/client/RestClientContainer.java15
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.rest/src/org/eclipse/ecf/remoteservice/rest/client/RestClientService.java15
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.rest/src/org/eclipse/ecf/remoteservice/rest/client/XMLRemoteResponseDeserializer.java15
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.rest/src/org/eclipse/ecf/remoteservice/rest/identity/RestID.java15
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.rest/src/org/eclipse/ecf/remoteservice/rest/identity/RestNamespace.java15
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.rest/src/org/eclipse/ecf/remoteservice/rest/util/DSUtil.java15
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.rpc/build.properties10
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.rpc/plugin.properties10
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.servlet/META-INF/MANIFEST.MF2
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.servlet/plugin.properties9
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.servlet/pom.xml2
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.servlet/src/org/eclipse/ecf/remoteservice/servlet/HttpServiceComponent.java21
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.servlet/src/org/eclipse/ecf/remoteservice/servlet/IRemoteCallParameterDeserializer.java21
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.servlet/src/org/eclipse/ecf/remoteservice/servlet/IRemoteCallResponseSerializer.java21
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.servlet/src/org/eclipse/ecf/remoteservice/servlet/ObjectSerializationParameterDeserializer.java21
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.servlet/src/org/eclipse/ecf/remoteservice/servlet/ObjectSerializationResponseSerializer.java21
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.servlet/src/org/eclipse/ecf/remoteservice/servlet/RemoteServiceHttpServlet.java21
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.servlet/src/org/eclipse/ecf/remoteservice/servlet/ServletServerContainer.java21
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.servlet/src/org/eclipse/ecf/remoteservice/servlet/ServletServerContainerInstantiator.java21
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.soap/META-INF/MANIFEST.MF2
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.soap/plugin.properties9
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.soap/pom.xml2
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.soap/src/org/eclipse/ecf/remoteservice/soap/client/AbstractSoapClientContainer.java21
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.soap/src/org/eclipse/ecf/remoteservice/soap/client/AbstractSoapClientService.java21
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.soap/src/org/eclipse/ecf/remoteservice/soap/client/SoapCallableFactory.java21
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.soap/src/org/eclipse/ecf/remoteservice/soap/client/SoapCallableRequestType.java21
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.soap/src/org/eclipse/ecf/remoteservice/soap/identity/SoapID.java15
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.soap/src/org/eclipse/ecf/remoteservice/soap/identity/SoapNamespace.java15
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.ui.dosgi/plugin.properties9
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.ui.dosgi/src/org/eclipse/ecf/remoteservice/ui/dosgi/handlers/DOSGiReflectiveRemoteServiceHandler.java14
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.ui/META-INF/MANIFEST.MF2
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.ui/plugin.properties9
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.ui/pom.xml2
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/internal/remoteservices/ui/Activator.java14
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/internal/remoteservices/ui/DiscoveryComponent.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/internal/remoteservices/ui/Messages.java14
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/internal/remoteservices/ui/OverlayIcon.java18
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/internal/remoteservices/ui/RemoteServiceHandlerUtil.java14
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/internal/remoteservices/ui/RemoteServicePerspective.java14
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/internal/remoteservices/ui/handlers/ConnectRemoteServicehandler.java14
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/internal/remoteservices/ui/handlers/ConnectionHandler.java14
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/internal/remoteservices/ui/handlers/DisonnectRemoteServicehandler.java14
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/internal/remoteservices/ui/handlers/ReflectiveRemoteServiceHandler.java14
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/internal/remoteservices/ui/messages.properties16
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/internal/remoteservices/ui/property/ConnectedTester.java14
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteservice/ui/services/IServicesView.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/EndpointDiscoveryView.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/AbstractEndpointNode.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/AbstractEndpointNodeWorkbenchAdapter.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointAdapterFactory.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointAsyncInterfacesNode.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointAsyncInterfacesNodeWorkbenchAdapter.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointConfigTypesNode.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointConnectTargetIDNode.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointContainerIDNode.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointContentProvider.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointDiscoveryGroupNode.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointDiscoveryGroupNodeWorkbenchAdapter.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointECFNode.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointFrameworkIDNode.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointGroupNode.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointGroupNodeWorkbenchAdapter.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointHostGroupNode.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointHostGroupNodeWorkbenchAdapter.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointIDNode.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointIntentsNode.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointInterfacesNode.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointInterfacesNodeWorkbenchAdapter.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointNamespaceNode.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointNode.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointNodeWorkbenchAdapter.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointPackageVersionNode.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointPackageVersionNodeWorkbenchAdapter.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointPropertyGroupNode.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointPropertyGroupNodeWorkbenchAdapter.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointPropertyNode.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointPropertyNodeWorkbenchAdapter.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointPropertySource.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointRemoteServiceFilterNode.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointRemoteServiceIDNode.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointServiceIDNode.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointTimestampNode.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/ImportRegistrationNode.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/AbstractRemoteServiceAdminView.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/RemoteServiceAdminView.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/model/AbstractRSAContentProvider.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/model/AbstractRSANode.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/model/AbstractRSAWorkbenchAdapter.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/model/AbstractRegistrationNode.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/model/EndpointDescriptionRSANode.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/model/EndpointDescriptionRSANodeWorkbenchAdapter.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/model/ExceptionNode.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/model/ExceptionNodeWorkbenchAdapter.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/model/ExportRegistrationNode.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/model/ExportRegistrationNodeWorkbenchAdapter.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/model/ExportedServicesRootNode.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/model/ExportedServicesRootNodeWorkbenchAdapter.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/model/ImportRegistrationNode.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/model/ImportRegistrationNodeWorkbenchAdapter.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/model/ImportedEndpointsRootNode.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/model/ImportedEndpointsRootNodeWorkbenchAdapter.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/model/NameValuePropertyNode.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/model/NameValuePropertyNodeWorkbenchAdapter.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/model/RSAAdapterFactory.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/model/RSAContentProvider.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/model/ServiceIdNode.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/model/StackTraceElementNode.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteservices/ui/MethodInvocationDialog.java14
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteservices/ui/RSAImageRegistry.java18
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteservices/ui/RemoteMethod.java14
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteservices/ui/util/PropertyUtils.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice/META-INF/MANIFEST.MF2
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice/plugin.properties9
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice/pom.xml2
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/internal/remoteservice/Activator.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/AbstractRSAContainer.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/AbstractRemoteCallListener.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/AbstractRemoteService.java21
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/AsyncMethod.java21
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/AsyncService.java21
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/CallbackRemoteCallListener.java21
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/Constants.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IAsyncCallback.java21
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IAsyncRemoteServiceProxy.java21
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IExtendedRemoteServiceRegistration.java15
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IOSGiRemoteServiceContainerAdapter.java14
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IRemoteCall.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IRemoteCallListener.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IRemoteFilter.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IRemoteService.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IRemoteServiceCallPolicy.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IRemoteServiceConsumer.java21
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IRemoteServiceContainer.java21
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IRemoteServiceContainerAdapter.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IRemoteServiceHost.java21
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IRemoteServiceID.java21
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IRemoteServiceImplDebugOptions.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IRemoteServiceListener.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IRemoteServiceProxy.java21
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IRemoteServiceReference.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IRemoteServiceRegistration.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/RSARemoteServiceContainerAdapter.java21
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/RemoteCall.java21
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/RemoteCallFactory.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/RemoteServiceContainer.java21
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/RemoteServiceHelper.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/RemoteServiceID.java21
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/RemoteServiceNamespace.java21
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/RemoteServiceReferenceImpl.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/RemoteServiceRegistrationImpl.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/RemoteServiceRegistryImpl.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/client/AbstractClientContainer.java21
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/client/AbstractClientService.java21
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/client/AbstractParameterSerializer.java21
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/client/AbstractRSAClientContainer.java21
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/client/AbstractRSAClientService.java21
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/client/IRemoteCallParameter.java21
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/client/IRemoteCallParameterSerializer.java21
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/client/IRemoteCallable.java21
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/client/IRemoteCallableRequestType.java21
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/client/IRemoteResponseDeserializer.java21
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/client/IRemoteServiceClientContainerAdapter.java21
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/client/RemoteCallParameter.java21
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/client/RemoteCallParameterFactory.java21
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/client/RemoteCallable.java21
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/client/RemoteCallableFactory.java21
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/client/RemoteServiceClientReference.java15
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/client/RemoteServiceClientRegistration.java15
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/client/RemoteServiceClientRegistry.java15
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/client/StringParameterSerializer.java21
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/events/IRemoteCallCompleteEvent.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/events/IRemoteCallEvent.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/events/IRemoteCallStartEvent.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/events/IRemoteServiceChangedEvent.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/events/IRemoteServiceEvent.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/events/IRemoteServiceRegisteredEvent.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/events/IRemoteServiceUnregisteredEvent.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/provider/AdapterConfig.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/provider/IRemoteServiceDistributionProvider.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/provider/PeerRemoteServiceContainerInstantiator.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/provider/RemoteServiceContainerInstantiator.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/provider/RemoteServiceDistributionProvider.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/util/AsyncUtil.java21
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/util/EndpointDescriptionPropertiesUtil.java21
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/util/IDUtil.java21
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/util/ObjectSerializationUtil.java21
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/util/RemoteCallMethod.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/util/RemoteFilterImpl.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/util/StreamUtil.java21
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/util/tracker/IRemoteServiceTrackerCustomizer.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/util/tracker/RemoteServiceTracker.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.sharedobject/META-INF/MANIFEST.MF2
-rw-r--r--framework/bundles/org.eclipse.ecf.sharedobject/plugin.properties9
-rw-r--r--framework/bundles/org.eclipse.ecf.sharedobject/pom.xml2
-rw-r--r--framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/AbstractSharedObjectContainerAdapterFactory.java14
-rw-r--r--framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/BaseSharedObject.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/IReplicaSharedObjectDescriptionFactory.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/ISharedObject.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/ISharedObjectConfig.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/ISharedObjectConnector.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/ISharedObjectContainer.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/ISharedObjectContainerClient.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/ISharedObjectContainerConfig.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/ISharedObjectContainerFactory.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/ISharedObjectContainerGroupManager.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/ISharedObjectContainerTransaction.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/ISharedObjectContext.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/ISharedObjectFactory.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/ISharedObjectManager.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/ISharedObjectTransactionConfig.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/ISharedObjectTransactionParticipantsFilter.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/OptimisticSharedObject.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/ReplicaSharedObjectDescription.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/SharedObjectAddAbortException.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/SharedObjectAddException.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/SharedObjectConnectException.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/SharedObjectContainerFactory.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/SharedObjectCreateException.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/SharedObjectDescription.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/SharedObjectDisconnectException.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/SharedObjectFactory.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/SharedObjectInitException.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/SharedObjectMsg.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/SharedObjectMsgEvent.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/SharedObjectMsgEventProcessor.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/SharedObjectTypeDescription.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/TransactionSharedObject.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/TransactionSharedObjectConfiguration.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/TwoPhaseCommitEventProcessor.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/ContainerSharedObjectMessageReceivingEvent.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/ContainerSharedObjectMessageSendingEvent.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/IContainerSharedObjectMessageReceivingEvent.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/IContainerSharedObjectMessageSendingEvent.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/ISharedObjectActivatedEvent.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/ISharedObjectCallEvent.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/ISharedObjectCommitEvent.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/ISharedObjectCreateResponseEvent.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/ISharedObjectDeactivatedEvent.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/ISharedObjectEvent.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/ISharedObjectManagerConnectionEvent.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/ISharedObjectManagerEvent.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/ISharedObjectMessageEvent.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/ISharedObjectMessageListener.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/RemoteSharedObjectCreateResponseEvent.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/RemoteSharedObjectEvent.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/SharedObjectActivatedEvent.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/SharedObjectCallEvent.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/SharedObjectCommitEvent.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/SharedObjectDeactivatedEvent.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/SharedObjectManagerAddEvent.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/SharedObjectManagerConnectEvent.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/SharedObjectManagerCreateEvent.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/SharedObjectManagerDisconnectEvent.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/events/SharedObjectManagerRemoveEvent.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/model/ISharedModelEvent.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/model/ISharedModelListener.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/model/SharedModel.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/provider/ISharedObjectInstantiator.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/security/ISharedObjectPolicy.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/util/IEnqueueProcessor.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/util/IQueue.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/util/IQueueDequeue.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/util/IQueueEnqueue.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/util/ISharedObjectMessageSerializer.java21
-rw-r--r--framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/util/ISimpleFIFOQueue.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/util/QueueEnqueueImpl.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/util/QueueException.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/util/SimpleFIFOQueue.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/util/reflection/ClassUtil.java14
-rw-r--r--framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/internal/core/sharedobject/SharedObjectDebugOptions.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.ssl/META-INF/MANIFEST.MF2
-rw-r--r--framework/bundles/org.eclipse.ecf.ssl/plugin.properties9
-rw-r--r--framework/bundles/org.eclipse.ecf.ssl/pom.xml2
-rw-r--r--framework/bundles/org.eclipse.ecf.ssl/src/org/eclipse/ecf/internal/ssl/ECFCertificateException.java16
-rw-r--r--framework/bundles/org.eclipse.ecf.ssl/src/org/eclipse/ecf/internal/ssl/ECFSSLServerSocketFactory.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.ssl/src/org/eclipse/ecf/internal/ssl/ECFSSLSocketFactory.java16
-rw-r--r--framework/bundles/org.eclipse.ecf.ssl/src/org/eclipse/ecf/internal/ssl/ECFTrustManager.java16
-rw-r--r--framework/bundles/org.eclipse.ecf.ssl/src/org/eclipse/ecf/internal/ssl/SSLContextHelper.java16
-rw-r--r--framework/bundles/org.eclipse.ecf.storage/META-INF/MANIFEST.MF2
-rw-r--r--framework/bundles/org.eclipse.ecf.storage/plugin.properties9
-rw-r--r--framework/bundles/org.eclipse.ecf.storage/pom.xml2
-rw-r--r--framework/bundles/org.eclipse.ecf.storage/src/org/eclipse/ecf/internal/storage/ContainerEntry.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.storage/src/org/eclipse/ecf/internal/storage/ContainerStore.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.storage/src/org/eclipse/ecf/internal/storage/IDEntry.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.storage/src/org/eclipse/ecf/internal/storage/IDStore.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.storage/src/org/eclipse/ecf/internal/storage/NamespaceEntry.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.storage/src/org/eclipse/ecf/internal/storage/StorableBaseContainer.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.storage/src/org/eclipse/ecf/storage/IContainerEntry.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.storage/src/org/eclipse/ecf/storage/IContainerStore.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.storage/src/org/eclipse/ecf/storage/IDStoreException.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.storage/src/org/eclipse/ecf/storage/IIDEntry.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.storage/src/org/eclipse/ecf/storage/IIDStore.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.storage/src/org/eclipse/ecf/storage/IIDStoreAdapter.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.storage/src/org/eclipse/ecf/storage/INamespaceEntry.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.storage/src/org/eclipse/ecf/storage/INamespaceStoreAdapter.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.storage/src/org/eclipse/ecf/storage/IStorableContainerAdapter.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.sync/META-INF/MANIFEST.MF2
-rw-r--r--framework/bundles/org.eclipse.ecf.sync/plugin.properties17
-rw-r--r--framework/bundles/org.eclipse.ecf.sync/pom.xml2
-rw-r--r--framework/bundles/org.eclipse.ecf.sync/src/org/eclipse/ecf/internal/sync/Activator.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.sync/src/org/eclipse/ecf/internal/sync/SyncDebugOptions.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.sync/src/org/eclipse/ecf/internal/sync/doc/cola/ColaDeletionTransformationStrategy.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.sync/src/org/eclipse/ecf/internal/sync/doc/cola/ColaDocumentChangeMessage.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.sync/src/org/eclipse/ecf/internal/sync/doc/cola/ColaInsertionTransformationStategy.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.sync/src/org/eclipse/ecf/internal/sync/doc/cola/ColaReplacementTransformationStategy.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.sync/src/org/eclipse/ecf/internal/sync/doc/cola/ColaSynchronizationStrategy.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.sync/src/org/eclipse/ecf/internal/sync/doc/cola/ColaSynchronizationStrategyFactory.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.sync/src/org/eclipse/ecf/internal/sync/doc/cola/ColaTransformationStrategy.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.sync/src/org/eclipse/ecf/internal/sync/doc/identity/IdentitySynchronizationStrategy.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.sync/src/org/eclipse/ecf/internal/sync/doc/identity/IdentitySynchronizationStrategyFactory.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.sync/src/org/eclipse/ecf/sync/IModelChange.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.sync/src/org/eclipse/ecf/sync/IModelChangeMessage.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.sync/src/org/eclipse/ecf/sync/IModelSynchronizationStrategy.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.sync/src/org/eclipse/ecf/sync/IServiceConstants.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.sync/src/org/eclipse/ecf/sync/SerializationException.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.sync/src/org/eclipse/ecf/sync/doc/DocumentChangeMessage.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.sync/src/org/eclipse/ecf/sync/doc/IDocumentChange.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.sync/src/org/eclipse/ecf/sync/doc/IDocumentSynchronizationStrategyFactory.java20
-rw-r--r--framework/bundles/org.eclipse.ecf.telephony.call.ui/META-INF/MANIFEST.MF2
-rw-r--r--framework/bundles/org.eclipse.ecf.telephony.call.ui/plugin.properties9
-rw-r--r--framework/bundles/org.eclipse.ecf.telephony.call.ui/pom.xml2
-rw-r--r--framework/bundles/org.eclipse.ecf.telephony.call.ui/src/org/eclipse/ecf/internal/telephony/call/ui/Messages.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.telephony.call.ui/src/org/eclipse/ecf/telephony/call/ui/actions/AbstractCallAction.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.telephony.call/META-INF/MANIFEST.MF2
-rw-r--r--framework/bundles/org.eclipse.ecf.telephony.call/build.properties15
-rw-r--r--framework/bundles/org.eclipse.ecf.telephony.call/plugin.properties9
-rw-r--r--framework/bundles/org.eclipse.ecf.telephony.call/pom.xml2
-rw-r--r--framework/bundles/org.eclipse.ecf.telephony.call/src/org/eclipse/ecf/telephony/call/CallException.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.telephony.call/src/org/eclipse/ecf/telephony/call/CallSessionFailureReason.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.telephony.call/src/org/eclipse/ecf/telephony/call/CallSessionState.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.telephony.call/src/org/eclipse/ecf/telephony/call/ICallSession.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.telephony.call/src/org/eclipse/ecf/telephony/call/ICallSessionContainerAdapter.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.telephony.call/src/org/eclipse/ecf/telephony/call/ICallSessionListener.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.telephony.call/src/org/eclipse/ecf/telephony/call/ICallSessionRequestListener.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.telephony.call/src/org/eclipse/ecf/telephony/call/dtmf/IDTMFCallSessionAdapter.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.telephony.call/src/org/eclipse/ecf/telephony/call/events/ICallSessionEvent.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.telephony.call/src/org/eclipse/ecf/telephony/call/events/ICallSessionRequestEvent.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.telephony.call/src/org/eclipse/ecf/telephony/call/service/ICallSessionService.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.ui.capabilities/META-INF/MANIFEST.MF2
-rw-r--r--framework/bundles/org.eclipse.ecf.ui.capabilities/plugin.properties15
-rw-r--r--framework/bundles/org.eclipse.ecf.ui.capabilities/pom.xml2
-rw-r--r--framework/bundles/org.eclipse.ecf.ui/META-INF/MANIFEST.MF2
-rw-r--r--framework/bundles/org.eclipse.ecf.ui/plugin.properties9
-rw-r--r--framework/bundles/org.eclipse.ecf.ui/pom.xml2
-rw-r--r--framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/internal/ui/Activator.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/internal/ui/CategoryPreferencePage.java16
-rw-r--r--framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/internal/ui/IImageFiles.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/internal/ui/Messages.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/internal/ui/UIDebugOptions.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/internal/ui/UIPreferenceInitializer.java14
-rw-r--r--framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/internal/ui/actions/SelectProviderAction.java14
-rw-r--r--framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/internal/ui/messages.properties15
-rw-r--r--framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/internal/ui/perspectives/CommunicationPerspective.java14
-rw-r--r--framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/internal/ui/wizards/Category.java14
-rw-r--r--framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/internal/ui/wizards/ConfigurationWizardNode.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/internal/ui/wizards/ConnectWizardNode.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/internal/ui/wizards/IWizardRegistryConstants.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/internal/ui/wizards/RegistryReader.java14
-rw-r--r--framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/internal/ui/wizards/WizardActivityFilter.java14
-rw-r--r--framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/internal/ui/wizards/WizardCollectionElement.java14
-rw-r--r--framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/internal/ui/wizards/WizardContentProvider.java14
-rw-r--r--framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/internal/ui/wizards/WizardNode.java14
-rw-r--r--framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/internal/ui/wizards/WizardsRegistryReader.java14
-rw-r--r--framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/internal/ui/wizards/WorkbenchLabelProvider.java14
-rw-r--r--framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/internal/ui/wizards/WorkbenchWizardElement.java14
-rw-r--r--framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/ContainerConfigurationResult.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/IConfigurationWizard.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/IConnectWizard.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/SharedImages.java14
-rw-r--r--framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/actions/AsynchContainerConnectAction.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/dialogs/ConfigurationWizardDialog.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/dialogs/ContainerConnectErrorDialog.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/dialogs/ContainerConnectWizardDialog.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/dialogs/ContainerCreateErrorDialog.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/dialogs/IDCreateErrorDialog.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/hyperlink/AbstractURLHyperlink.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/hyperlink/AbstractURLHyperlinkDetector.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/screencapture/IImageSender.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/screencapture/ImageWrapper.java14
-rw-r--r--framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/screencapture/ScreenCaptureConfirmationDialog.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/screencapture/ScreenCaptureJob.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/screencapture/ScreenCaptureUtil.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/screencapture/ShowImageShell.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/util/PasswordCacheHelper.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/wizards/AbstractConnectWizardPage.java10
-rw-r--r--framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/wizards/ConfigurationWizardSelectionPage.java14
-rw-r--r--framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/wizards/ConfigurationWizardSelectionWizard.java10
-rw-r--r--framework/bundles/org.eclipse.ecf/META-INF/MANIFEST.MF2
-rw-r--r--framework/bundles/org.eclipse.ecf/about.properties16
-rw-r--r--framework/bundles/org.eclipse.ecf/build.properties17
-rw-r--r--framework/bundles/org.eclipse.ecf/plugin.properties9
-rw-r--r--framework/bundles/org.eclipse.ecf/pom.xml2
-rw-r--r--framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/AbstractContainer.java17
-rw-r--r--framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/AbstractContainerAdapterFactory.java10
-rw-r--r--framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/BaseContainer.java10
-rw-r--r--framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ContainerAuthenticationException.java17
-rw-r--r--framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ContainerConnectException.java17
-rw-r--r--framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ContainerCreateException.java17
-rw-r--r--framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ContainerFactory.java14
-rw-r--r--framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ContainerTypeDescription.java17
-rw-r--r--framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/IContainer.java14
-rw-r--r--framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/IContainerFactory.java17
-rw-r--r--framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/IContainerListener.java17
-rw-r--r--framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/IContainerManager.java10
-rw-r--r--framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/IContainerManagerListener.java10
-rw-r--r--framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/IReliableContainer.java17
-rw-r--r--framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/ContainerConnectedEvent.java17
-rw-r--r--framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/ContainerConnectingEvent.java17
-rw-r--r--framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/ContainerDisconnectedEvent.java10
-rw-r--r--framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/ContainerDisconnectingEvent.java17
-rw-r--r--framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/ContainerDisposeEvent.java17
-rw-r--r--framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/ContainerEjectedEvent.java17
-rw-r--r--framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/IContainerConnectedEvent.java17
-rw-r--r--framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/IContainerConnectingEvent.java17
-rw-r--r--framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/IContainerDisconnectedEvent.java17
-rw-r--r--framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/IContainerDisconnectingEvent.java17
-rw-r--r--framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/IContainerDisposeEvent.java17
-rw-r--r--framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/IContainerEjectedEvent.java17
-rw-r--r--framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/IContainerEvent.java17
-rw-r--r--framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/jobs/JobsExecutor.java23
-rw-r--r--framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/provider/BaseContainerInstantiator.java10
-rw-r--r--framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/provider/BaseRemoteServiceContainerInstantiator.java10
-rw-r--r--framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/provider/ContainerInstantiatorUtils.java10
-rw-r--r--framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/provider/ContainerIntentException.java21
-rw-r--r--framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/provider/IContainerInstantiator.java17
-rw-r--r--framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/provider/IRemoteServiceContainerInstantiator.java21
-rw-r--r--framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/security/BooleanCallback.java17
-rw-r--r--framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/security/Callback.java17
-rw-r--r--framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/security/CallbackHandler.java17
-rw-r--r--framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/security/ConnectContextFactory.java17
-rw-r--r--framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/security/IConnectContext.java17
-rw-r--r--framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/security/IConnectHandlerPolicy.java17
-rw-r--r--framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/security/IConnectInitiatorPolicy.java17
-rw-r--r--framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/security/IContainerPolicy.java17
-rw-r--r--framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/security/NameCallback.java17
-rw-r--r--framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/security/ObjectCallback.java17
-rw-r--r--framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/security/PassphraseCallback.java17
-rw-r--r--framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/security/PasswordCallback.java17
-rw-r--r--framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/security/UnsupportedCallbackException.java17
-rw-r--r--framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/start/ECFStartJob.java14
-rw-r--r--framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/start/IECFStart.java17
-rw-r--r--framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/status/SerializableMultiStatus.java15
-rw-r--r--framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/status/SerializableStatus.java15
-rw-r--r--framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/user/IUser.java10
-rw-r--r--framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/user/User.java10
-rw-r--r--framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/AdapterContainerFilter.java10
-rw-r--r--framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/BundleClassResolver.java17
-rw-r--r--framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/ClassResolverObjectInputStream.java17
-rw-r--r--framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/ConnectedContainerFilter.java10
-rw-r--r--framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/ContainerFactoryTracker.java21
-rw-r--r--framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/ContainerManagerTracker.java21
-rw-r--r--framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/Event.java17
-rw-r--r--framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/IClassResolver.java17
-rw-r--r--framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/IContainerFilter.java10
-rw-r--r--framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/IEventProcessor.java17
-rw-r--r--framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/IExceptionHandler.java17
-rw-r--r--framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/OSGIObjectInputStream.java17
-rw-r--r--framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/OSGIObjectOutputStream.java17
-rw-r--r--framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/OSGIObjectStreamConstants.java17
-rw-r--r--framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/Proxy.java10
-rw-r--r--framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/ProxyAddress.java10
-rw-r--r--framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/reflection/ClassUtil.java14
-rw-r--r--framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/internal/core/ECFDebugOptions.java17
-rw-r--r--framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/internal/core/ECFPlugin.java17
-rw-r--r--framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/internal/core/IDisposable.java17
-rw-r--r--framework/bundles/org.eclipse.team.ecf.core/META-INF/MANIFEST.MF2
-rw-r--r--framework/bundles/org.eclipse.team.ecf.core/plugin.properties9
-rw-r--r--framework/bundles/org.eclipse.team.ecf.core/pom.xml2
-rw-r--r--framework/bundles/org.eclipse.team.ecf.core/src/org/eclipse/team/internal/ecf/core/Messages.java14
-rw-r--r--framework/bundles/org.eclipse.team.ecf.core/src/org/eclipse/team/internal/ecf/core/RemoteShare.java14
-rw-r--r--framework/bundles/org.eclipse.team.ecf.core/src/org/eclipse/team/internal/ecf/core/RemoteSyncInfo.java14
-rw-r--r--framework/bundles/org.eclipse.team.ecf.core/src/org/eclipse/team/internal/ecf/core/TeamSynchronization.java14
-rw-r--r--framework/bundles/org.eclipse.team.ecf.core/src/org/eclipse/team/internal/ecf/core/messages.properties15
-rw-r--r--framework/bundles/org.eclipse.team.ecf.core/src/org/eclipse/team/internal/ecf/core/messages/FetchResponse.java14
-rw-r--r--framework/bundles/org.eclipse.team.ecf.core/src/org/eclipse/team/internal/ecf/core/messages/FetchVariantRequest.java14
-rw-r--r--framework/bundles/org.eclipse.team.ecf.core/src/org/eclipse/team/internal/ecf/core/messages/FetchVariantsRequest.java14
-rw-r--r--framework/bundles/org.eclipse.team.ecf.core/src/org/eclipse/team/internal/ecf/core/messages/IResponse.java14
-rw-r--r--framework/bundles/org.eclipse.team.ecf.core/src/org/eclipse/team/internal/ecf/core/messages/ShareRequest.java14
-rw-r--r--framework/bundles/org.eclipse.team.ecf.core/src/org/eclipse/team/internal/ecf/core/messages/ShareResponse.java14
-rw-r--r--framework/bundles/org.eclipse.team.ecf.core/src/org/eclipse/team/internal/ecf/core/variants/RemoteResourceVariant.java14
-rw-r--r--framework/bundles/org.eclipse.team.ecf.core/src/org/eclipse/team/internal/ecf/core/variants/RemoteResourceVariantComparator.java14
-rw-r--r--framework/bundles/org.eclipse.team.ecf.core/src/org/eclipse/team/internal/ecf/core/variants/RemoteResourceVariantTree.java14
-rw-r--r--framework/bundles/org.eclipse.team.ecf.core/src/org/eclipse/team/internal/ecf/core/variants/RemoteResourceVariantTreeSubscriber.java14
-rw-r--r--framework/bundles/org.eclipse.team.ecf.core/src/org/eclipse/team/internal/ecf/core/variants/RemoteStorage.java14
-rw-r--r--framework/bundles/org.eclipse.team.ecf.ui/META-INF/MANIFEST.MF2
-rw-r--r--framework/bundles/org.eclipse.team.ecf.ui/plugin.properties9
-rw-r--r--framework/bundles/org.eclipse.team.ecf.ui/pom.xml2
-rw-r--r--framework/bundles/org.eclipse.team.ecf.ui/src/org/eclipse/team/internal/ecf/ui/ECFStart.java10
-rw-r--r--framework/bundles/org.eclipse.team.ecf.ui/src/org/eclipse/team/internal/ecf/ui/Messages.java14
-rw-r--r--framework/bundles/org.eclipse.team.ecf.ui/src/org/eclipse/team/internal/ecf/ui/WorkbenchAwareRemoteShare.java14
-rw-r--r--framework/bundles/org.eclipse.team.ecf.ui/src/org/eclipse/team/internal/ecf/ui/actions/OverrideWithRemoteAction.java14
-rw-r--r--framework/bundles/org.eclipse.team.ecf.ui/src/org/eclipse/team/internal/ecf/ui/actions/OverrideWithRemoteOperation.java14
-rw-r--r--framework/bundles/org.eclipse.team.ecf.ui/src/org/eclipse/team/internal/ecf/ui/handlers/CompareWithHandler.java14
-rw-r--r--framework/bundles/org.eclipse.team.ecf.ui/src/org/eclipse/team/internal/ecf/ui/handlers/CompareWithMenuContributionItem.java14
-rw-r--r--framework/bundles/org.eclipse.team.ecf.ui/src/org/eclipse/team/internal/ecf/ui/handlers/SynchronizeWithHandler.java14
-rw-r--r--framework/bundles/org.eclipse.team.ecf.ui/src/org/eclipse/team/internal/ecf/ui/handlers/SynchronizeWithMenuContributionItem.java14
-rw-r--r--framework/bundles/org.eclipse.team.ecf.ui/src/org/eclipse/team/internal/ecf/ui/messages.properties15
-rw-r--r--framework/bundles/org.eclipse.team.ecf.ui/src/org/eclipse/team/internal/ecf/ui/subscriber/RemoteSubscriberParticipant.java14
-rw-r--r--framework/bundles/org.eclipse.team.ecf.ui/src/org/eclipse/team/internal/ecf/ui/wizards/RemotePeerSynchronizeWizard.java14
-rw-r--r--framework/bundles/org.eclipse.team.ecf.ui/src/org/eclipse/team/internal/ecf/ui/wizards/RemotePeerSynchronizeWizardPage.java14
-rw-r--r--releng/features/org.eclipse.ecf.remoteservice.feature/feature.xml4
-rw-r--r--releng/features/org.eclipse.ecf.remoteservice.rpc.feature/build.properties10
1051 files changed, 8043 insertions, 5800 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 3d20fe91c..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.1.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/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 f8c7282da..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.1-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/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.datashare/META-INF/MANIFEST.MF
index d7a8b8e53..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.201.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/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 a2be8116a..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.201-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 32060eb18..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.102.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/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/pom.xml b/framework/bundles/org.eclipse.ecf.discovery.ui.browser/pom.xml
index 72d1e0713..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.102-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/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.discovery.ui.edit/META-INF/MANIFEST.MF
index fad84e37b..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.101.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/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 91cbd46df..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.101-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 d498f8723..24fb56835 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.101.qualifier
+Bundle-Version: 3.0.200.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
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 95f65f1cb..ca4ccefec 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.101-SNAPSHOT</version>
+ <version>3.0.200-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..1fba58e1d 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;
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 2b6a5466c..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.101.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/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 6a17b2aed..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.101-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/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.discovery.ui.properties/META-INF/MANIFEST.MF
index b77316368..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.101.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/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 c6c8d7c24..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.101-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 4a72d0034..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.102.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/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/pom.xml b/framework/bundles/org.eclipse.ecf.discovery.ui.userinput/pom.xml
index 72064cb6f..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.102-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/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.discovery.ui/META-INF/MANIFEST.MF
index e2f6fddc2..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.202.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/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/pom.xml b/framework/bundles/org.eclipse.ecf.discovery.ui/pom.xml
index 903572fab..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.202-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/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.discovery/META-INF/MANIFEST.MF
index 0ed17db1d..ef1d920b6 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.301.qualifier
+Bundle-Version: 5.0.400.qualifier
Bundle-Activator: org.eclipse.ecf.internal.discovery.DiscoveryPlugin
Bundle-Vendor: %plugin.provider
Bundle-Localization: plugin
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 ad5755323..2a9616c70 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.301-SNAPSHOT</version>
+ <version>5.0.400-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/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.docshare/META-INF/MANIFEST.MF
index 479fe8e0c..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.301.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/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 458d43f49..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.301-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/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/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.filetransfer/META-INF/MANIFEST.MF
index dd01068cf..74f4125e3 100644
--- a/framework/bundles/org.eclipse.ecf.filetransfer/META-INF/MANIFEST.MF
+++ b/framework/bundles/org.eclipse.ecf.filetransfer/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ 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.1.0.qualifier
+Bundle-Version: 5.1.100.qualifier
Bundle-Activator: org.eclipse.ecf.internal.filetransfer.Activator
Bundle-Vendor: %plugin.provider
Eclipse-LazyStart: true
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/pom.xml b/framework/bundles/org.eclipse.ecf.filetransfer/pom.xml
index de6a1910d..387efee3b 100644
--- a/framework/bundles/org.eclipse.ecf.filetransfer/pom.xml
+++ b/framework/bundles/org.eclipse.ecf.filetransfer/pom.xml
@@ -9,6 +9,6 @@
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.eclipse.ecf.filetransfer</artifactId>
- <version>5.1.0-SNAPSHOT</version>
+ <version>5.1.100-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
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..c4fc222b3 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;
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