Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMat Booth2020-06-04 14:23:40 +0000
committerMat Booth2020-06-11 22:21:07 +0000
commit7cdb57f33b8daf8c715e703e0730f004b42049e3 (patch)
tree3d1949d835a12312db85f8f135852a3831371b1c
parent464f42104aa4ee4837d11c8ca64bc5341555f4fe (diff)
downloadorg.eclipse.ecf-7cdb57f33b8daf8c715e703e0730f004b42049e3.tar.gz
org.eclipse.ecf-7cdb57f33b8daf8c715e703e0730f004b42049e3.tar.xz
org.eclipse.ecf-7cdb57f33b8daf8c715e703e0730f004b42049e3.zip
Bug 560602 - Switch to EPL version 2.0
Update license declaration in extension schema definitions Remove outdated extension point documentation and instead make Tycho/PDE regenerate the extension point documentation at build time, so it always contains up to date copyright and license notices. Use tycho javadoc plugin to generate javadoc and correct table of contents for javadoc in the doc bundle Misc other updates to doc bundle, including adding a link to the copyright notices file and removing duplicate table of contents entries, linking correctly to JDK types from ECF javadoc, fix broken external links in infro pages and pre-generating search indexes Change-Id: Iec41face18b80b742889f43de846b26d9dce583d Signed-off-by: Mat Booth <mat.booth@redhat.com>
-rw-r--r--doc/bundles/org.eclipse.ecf.doc/.externalToolBuilders/BuildSchemaDocs.launch14
-rw-r--r--doc/bundles/org.eclipse.ecf.doc/.externalToolBuilders/org.eclipse.ecf.doc buildapitoc.xml [Builder].launch14
-rw-r--r--doc/bundles/org.eclipse.ecf.doc/.externalToolBuilders/org.eclipse.ecf.doc buildschematoc.xml [Builder].launch14
-rw-r--r--doc/bundles/org.eclipse.ecf.doc/.externalToolBuilders/org.eclipse.ecf.doc javadoc.xml [Builder].launch14
-rw-r--r--doc/bundles/org.eclipse.ecf.doc/.externalToolBuilders/org.eclipse.ecf.doc schema.xml [Builder].launch14
-rw-r--r--doc/bundles/org.eclipse.ecf.doc/.gitignore5
-rw-r--r--doc/bundles/org.eclipse.ecf.doc/.project34
-rw-r--r--doc/bundles/org.eclipse.ecf.doc/META-INF/MANIFEST.MF2
-rw-r--r--doc/bundles/org.eclipse.ecf.doc/book.css21
-rw-r--r--doc/bundles/org.eclipse.ecf.doc/build.properties56
-rw-r--r--doc/bundles/org.eclipse.ecf.doc/buildapitoc.xml45
-rw-r--r--doc/bundles/org.eclipse.ecf.doc/buildschemadocs.xml37
-rw-r--r--doc/bundles/org.eclipse.ecf.doc/buildschematoc.xml48
-rw-r--r--doc/bundles/org.eclipse.ecf.doc/html/reference/.gitignore2
-rw-r--r--doc/bundles/org.eclipse.ecf.doc/html/reference/api/.gitignore6
-rw-r--r--doc/bundles/org.eclipse.ecf.doc/html/reference/extension-points/org_eclipse_ecf_container.html89
-rw-r--r--doc/bundles/org.eclipse.ecf.doc/html/reference/extension-points/org_eclipse_ecf_containerFactory.html225
-rw-r--r--doc/bundles/org.eclipse.ecf.doc/html/reference/extension-points/org_eclipse_ecf_discovery_ui_serviceAccessHandler.html126
-rw-r--r--doc/bundles/org.eclipse.ecf.doc/html/reference/extension-points/org_eclipse_ecf_identity_namespace.html117
-rw-r--r--doc/bundles/org.eclipse.ecf.doc/html/reference/extension-points/org_eclipse_ecf_presence_bot_chatRoomMessageHandler.html91
-rw-r--r--doc/bundles/org.eclipse.ecf.doc/html/reference/extension-points/org_eclipse_ecf_presence_bot_chatRoomRobot.html95
-rw-r--r--doc/bundles/org.eclipse.ecf.doc/html/reference/extension-points/org_eclipse_ecf_presence_bot_imMessageHandler.html90
-rw-r--r--doc/bundles/org.eclipse.ecf.doc/html/reference/extension-points/org_eclipse_ecf_presence_bot_imRobot.html80
-rw-r--r--doc/bundles/org.eclipse.ecf.doc/html/reference/extension-points/org_eclipse_ecf_presence_ui_rosterViewerDropTarget.html91
-rw-r--r--doc/bundles/org.eclipse.ecf.doc/html/reference/extension-points/org_eclipse_ecf_provider_filetransfer_browseFileTransferProtocolFactory.html79
-rw-r--r--doc/bundles/org.eclipse.ecf.doc/html/reference/extension-points/org_eclipse_ecf_provider_filetransfer_retrieveFileTransferProtocolFactory.html83
-rw-r--r--doc/bundles/org.eclipse.ecf.doc/html/reference/extension-points/org_eclipse_ecf_provider_filetransfer_sendFileTransferProtocolFactory.html79
-rw-r--r--doc/bundles/org.eclipse.ecf.doc/html/reference/extension-points/org_eclipse_ecf_server_generic_configuration.html76
-rw-r--r--doc/bundles/org.eclipse.ecf.doc/html/reference/extension-points/org_eclipse_ecf_sharedobject_sharedObjectFactory.html257
-rw-r--r--doc/bundles/org.eclipse.ecf.doc/html/reference/extension-points/org_eclipse_ecf_start.html94
-rw-r--r--doc/bundles/org.eclipse.ecf.doc/html/reference/extension-points/org_eclipse_ecf_ui_configurationWizards.html130
-rw-r--r--doc/bundles/org.eclipse.ecf.doc/html/reference/extension-points/org_eclipse_ecf_ui_connectWizards.html119
-rw-r--r--doc/bundles/org.eclipse.ecf.doc/intro/css/overview.css1
-rw-r--r--doc/bundles/org.eclipse.ecf.doc/intro/css/samples.css10
-rw-r--r--doc/bundles/org.eclipse.ecf.doc/intro/overviewExtensionContent.xml16
-rw-r--r--doc/bundles/org.eclipse.ecf.doc/intro/samplesExtensionContent.xml12
-rw-r--r--doc/bundles/org.eclipse.ecf.doc/intro/tutorialsExtensionContent.xml12
-rw-r--r--doc/bundles/org.eclipse.ecf.doc/intro/whatsnewExtensionContent.xml2
-rw-r--r--doc/bundles/org.eclipse.ecf.doc/javadoc.xml6
-rwxr-xr-xdoc/bundles/org.eclipse.ecf.doc/notices.html10
-rw-r--r--doc/bundles/org.eclipse.ecf.doc/plugin.properties9
-rw-r--r--doc/bundles/org.eclipse.ecf.doc/plugin.xml14
-rw-r--r--doc/bundles/org.eclipse.ecf.doc/pom.xml95
-rw-r--r--doc/bundles/org.eclipse.ecf.doc/schema.xml92
-rw-r--r--doc/bundles/org.eclipse.ecf.doc/toc.xml18
-rw-r--r--doc/bundles/org.eclipse.ecf.doc/tocapi.xml39
-rw-r--r--doc/bundles/org.eclipse.ecf.doc/topics_Extpoint.xml11
-rw-r--r--doc/bundles/org.eclipse.ecf.doc/topics_GettingStarted.xml7
-rw-r--r--doc/bundles/org.eclipse.ecf.doc/topics_Reference.xml29
-rw-r--r--doc/bundles/org.eclipse.ecf.doc/topics_Reference_RemoteServices.xml8
-rw-r--r--doc/bundles/org.eclipse.ecf.doc/topics_Resources.xml10
-rw-r--r--doc/bundles/org.eclipse.ecf.doc/topics_Samples.xml5
-rw-r--r--doc/bundles/org.eclipse.ecf.doc/topics_Tutorials.xml6
-rw-r--r--doc/bundles/org.eclipse.ecf.tutorial/plugin.properties19
-rw-r--r--doc/bundles/org.eclipse.ecf.tutorial/src/org/eclipse/ecf/tutorial/Activator.java17
-rw-r--r--doc/bundles/org.eclipse.ecf.tutorial/src/org/eclipse/ecf/tutorial/actions/StartClientAction.java17
-rw-r--r--doc/bundles/org.eclipse.ecf.tutorial/src/org/eclipse/ecf/tutorial/basic/Client1.java17
-rw-r--r--doc/bundles/org.eclipse.ecf.tutorial/src/org/eclipse/ecf/tutorial/basic/Client2.java17
-rw-r--r--doc/bundles/org.eclipse.ecf.tutorial/src/org/eclipse/ecf/tutorial/basic/Client3.java17
-rw-r--r--doc/bundles/org.eclipse.ecf.tutorial/src/org/eclipse/ecf/tutorial/basic/Client4.java17
-rw-r--r--doc/bundles/org.eclipse.ecf.tutorial/src/org/eclipse/ecf/tutorial/datashare/DsClient1.java17
-rw-r--r--doc/bundles/org.eclipse.ecf.tutorial/src/org/eclipse/ecf/tutorial/datashare/DsClient2.java17
-rw-r--r--doc/bundles/org.eclipse.ecf.tutorial/src/org/eclipse/ecf/tutorial/scribbleshare/BasicScribbleView.java17
-rw-r--r--doc/bundles/org.eclipse.ecf.tutorial/src/org/eclipse/ecf/tutorial/scribbleshare/ScribbleClient.java17
-rw-r--r--doc/bundles/org.eclipse.ecf.tutorial/src/org/eclipse/ecf/tutorial/scribbleshare/ScribbleView.java17
-rw-r--r--doc/bundles/org.eclipse.ecf.tutorial/src/org/eclipse/ecf/tutorial/scribbleshare/toolbox/AbstractTool.java17
-rw-r--r--doc/bundles/org.eclipse.ecf.tutorial/src/org/eclipse/ecf/tutorial/scribbleshare/toolbox/Box.java17
-rw-r--r--doc/bundles/org.eclipse.ecf.tutorial/src/org/eclipse/ecf/tutorial/scribbleshare/toolbox/DrawSettings.java17
-rw-r--r--doc/bundles/org.eclipse.ecf.tutorial/src/org/eclipse/ecf/tutorial/scribbleshare/toolbox/Line.java19
-rw-r--r--doc/bundles/org.eclipse.ecf.tutorial/src/org/eclipse/ecf/tutorial/scribbleshare/toolbox/ListContentProvider.java17
-rw-r--r--doc/bundles/org.eclipse.ecf.tutorial/src/org/eclipse/ecf/tutorial/scribbleshare/toolbox/Oval.java17
-rw-r--r--doc/bundles/org.eclipse.ecf.tutorial/src/org/eclipse/ecf/tutorial/scribbleshare/toolbox/Pencil.java17
-rw-r--r--doc/bundles/org.eclipse.ecf.tutorial/src/org/eclipse/ecf/tutorial/scribbleshare/toolbox/ToolboxLabelProvider.java17
-rw-r--r--framework/bundles/org.eclipse.ecf.filetransfer/schema/urlStreamHandlerService.exsd15
-rw-r--r--framework/bundles/org.eclipse.ecf.identity/schema/namespace.exsd15
-rw-r--r--framework/bundles/org.eclipse.ecf.presence.bot/schema/chatRoomMessageHandler.exsd40
-rw-r--r--framework/bundles/org.eclipse.ecf.presence.bot/schema/chatRoomRobot.exsd16
-rw-r--r--framework/bundles/org.eclipse.ecf.presence.bot/schema/imMessageHandler.exsd16
-rw-r--r--framework/bundles/org.eclipse.ecf.presence.bot/schema/imRobot.exsd16
-rw-r--r--framework/bundles/org.eclipse.ecf.presence.ui/schema/rosterViewerDropTarget.exsd15
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.ui/schema/org.eclipse.ecf.remoteservice.ui.servicesview.exsd18
-rw-r--r--framework/bundles/org.eclipse.ecf.sharedobject/schema/sharedObjectFactory.exsd345
-rw-r--r--framework/bundles/org.eclipse.ecf.ui/schema/configurationWizards.exsd72
-rw-r--r--framework/bundles/org.eclipse.ecf.ui/schema/connectWizards.exsd52
-rw-r--r--framework/bundles/org.eclipse.ecf/schema/container.exsd8
-rw-r--r--framework/bundles/org.eclipse.ecf/schema/containerFactory.exsd8
-rw-r--r--framework/bundles/org.eclipse.ecf/schema/start.exsd17
-rw-r--r--pom.xml61
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.filetransfer/schema/browseFileTransferProtocolFactory.exsd8
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.filetransfer/schema/retrieveFileTransferProtocolFactory.exsd8
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.filetransfer/schema/sendFileTransferProtocolFactory.exsd10
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.irc.bot/schema/commandHandler.exsd16
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.irc.bot/schema/ircbot.exsd16
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.xmpp/schema/extensionProvider.exsd40
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.xmpp/schema/iqProvider.exsd40
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.xmpp/schema/providerDirectories.exsd40
-rw-r--r--server-side/bundles/org.eclipse.ecf.server.generic/schema/configuration.exsd23
-rw-r--r--tooling/plugins/org.eclipse.ecf.remoteservices.tooling.pde/META-INF/MANIFEST.MF2
-rw-r--r--tooling/plugins/org.eclipse.ecf.remoteservices.tooling.pde/plugin.properties9
-rw-r--r--tooling/plugins/org.eclipse.ecf.remoteservices.tooling.pde/pom.xml2
100 files changed, 1002 insertions, 2929 deletions
diff --git a/doc/bundles/org.eclipse.ecf.doc/.externalToolBuilders/BuildSchemaDocs.launch b/doc/bundles/org.eclipse.ecf.doc/.externalToolBuilders/BuildSchemaDocs.launch
new file mode 100644
index 000000000..e185e180d
--- /dev/null
+++ b/doc/bundles/org.eclipse.ecf.doc/.externalToolBuilders/BuildSchemaDocs.launch
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
+ <booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/>
+ <booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
+ <stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${project}"/>
+ <booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
+ <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
+ <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
+ <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.ecf.doc"/>
+ <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.eclipse.ecf.doc/buildschemadocs.xml}"/>
+ <stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,auto,"/>
+ <booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
+ <stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/org.eclipse.ecf.doc}"/>
+</launchConfiguration>
diff --git a/doc/bundles/org.eclipse.ecf.doc/.externalToolBuilders/org.eclipse.ecf.doc buildapitoc.xml [Builder].launch b/doc/bundles/org.eclipse.ecf.doc/.externalToolBuilders/org.eclipse.ecf.doc buildapitoc.xml [Builder].launch
deleted file mode 100644
index aba8ba860..000000000
--- a/doc/bundles/org.eclipse.ecf.doc/.externalToolBuilders/org.eclipse.ecf.doc buildapitoc.xml [Builder].launch
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
-<stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/>
-<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="false"/>
-<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.ecf.doc"/>
-<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${project}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.eclipse.ecf.doc/buildapitoc.xml}"/>
-<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
-<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
-<booleanAttribute key="org.eclipse.debug.core.ATTR_REFRESH_RECURSIVE" value="false"/>
-</launchConfiguration>
diff --git a/doc/bundles/org.eclipse.ecf.doc/.externalToolBuilders/org.eclipse.ecf.doc buildschematoc.xml [Builder].launch b/doc/bundles/org.eclipse.ecf.doc/.externalToolBuilders/org.eclipse.ecf.doc buildschematoc.xml [Builder].launch
deleted file mode 100644
index 9d9c6f3fa..000000000
--- a/doc/bundles/org.eclipse.ecf.doc/.externalToolBuilders/org.eclipse.ecf.doc buildschematoc.xml [Builder].launch
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
-<stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/>
-<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="false"/>
-<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.ecf.doc"/>
-<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${project}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.eclipse.ecf.doc/buildschematoc.xml}"/>
-<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
-<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
-<booleanAttribute key="org.eclipse.debug.core.ATTR_REFRESH_RECURSIVE" value="false"/>
-</launchConfiguration>
diff --git a/doc/bundles/org.eclipse.ecf.doc/.externalToolBuilders/org.eclipse.ecf.doc javadoc.xml [Builder].launch b/doc/bundles/org.eclipse.ecf.doc/.externalToolBuilders/org.eclipse.ecf.doc javadoc.xml [Builder].launch
deleted file mode 100644
index 1e936ed76..000000000
--- a/doc/bundles/org.eclipse.ecf.doc/.externalToolBuilders/org.eclipse.ecf.doc javadoc.xml [Builder].launch
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
-<stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/>
-<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="false"/>
-<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.ecf.doc"/>
-<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#13;&#10;&lt;launchConfigurationWorkingSet editPageId=&quot;org.eclipse.ui.resourceWorkingSetPage&quot; factoryID=&quot;org.eclipse.ui.internal.WorkingSetFactory&quot; name=&quot;workingSet&quot;&gt;&#13;&#10;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/org.eclipse.ecf.doc/html/reference/api&quot; type=&quot;2&quot;/&gt;&#13;&#10;&lt;/launchConfigurationWorkingSet&gt;&#13;&#10;}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.eclipse.ecf.doc/javadoc.xml}"/>
-<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
-<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_ANT_TARGETS" value="clean,javadoc,"/>
-</launchConfiguration>
diff --git a/doc/bundles/org.eclipse.ecf.doc/.externalToolBuilders/org.eclipse.ecf.doc schema.xml [Builder].launch b/doc/bundles/org.eclipse.ecf.doc/.externalToolBuilders/org.eclipse.ecf.doc schema.xml [Builder].launch
deleted file mode 100644
index 8010e8c01..000000000
--- a/doc/bundles/org.eclipse.ecf.doc/.externalToolBuilders/org.eclipse.ecf.doc schema.xml [Builder].launch
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
-<stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/>
-<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="false"/>
-<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.ecf.doc"/>
-<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#13;&#10;&lt;launchConfigurationWorkingSet editPageId=&quot;org.eclipse.ui.resourceWorkingSetPage&quot; factoryID=&quot;org.eclipse.ui.internal.WorkingSetFactory&quot; name=&quot;workingSet&quot;&gt;&#13;&#10;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/org.eclipse.ecf.doc/html/reference/extension-points&quot; type=&quot;2&quot;/&gt;&#13;&#10;&lt;/launchConfigurationWorkingSet&gt;&#13;&#10;}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.eclipse.ecf.doc/schema.xml}"/>
-<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
-<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_ANT_TARGETS" value="clean,schema,"/>
-</launchConfiguration>
diff --git a/doc/bundles/org.eclipse.ecf.doc/.gitignore b/doc/bundles/org.eclipse.ecf.doc/.gitignore
index bd4cb9588..b5f28c069 100644
--- a/doc/bundles/org.eclipse.ecf.doc/.gitignore
+++ b/doc/bundles/org.eclipse.ecf.doc/.gitignore
@@ -1,3 +1,2 @@
-*.class
-*.java
-tocextpoint.xml
+/index/
+/tocjavadoc.xml
diff --git a/doc/bundles/org.eclipse.ecf.doc/.project b/doc/bundles/org.eclipse.ecf.doc/.project
index 275ed2829..a1c497239 100644
--- a/doc/bundles/org.eclipse.ecf.doc/.project
+++ b/doc/bundles/org.eclipse.ecf.doc/.project
@@ -17,41 +17,11 @@
</buildCommand>
<buildCommand>
<name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
- <triggers>full,incremental,</triggers>
+ <triggers>auto,full,incremental,</triggers>
<arguments>
<dictionary>
<key>LaunchConfigHandle</key>
- <value>&lt;project&gt;/.externalToolBuilders/org.eclipse.ecf.doc javadoc.xml [Builder].launch</value>
- </dictionary>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
- <triggers>full,incremental,</triggers>
- <arguments>
- <dictionary>
- <key>LaunchConfigHandle</key>
- <value>&lt;project&gt;/.externalToolBuilders/org.eclipse.ecf.doc schema.xml [Builder].launch</value>
- </dictionary>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
- <triggers>full,incremental,</triggers>
- <arguments>
- <dictionary>
- <key>LaunchConfigHandle</key>
- <value>&lt;project&gt;/.externalToolBuilders/org.eclipse.ecf.doc buildapitoc.xml [Builder].launch</value>
- </dictionary>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
- <triggers>full,incremental,</triggers>
- <arguments>
- <dictionary>
- <key>LaunchConfigHandle</key>
- <value>&lt;project&gt;/.externalToolBuilders/org.eclipse.ecf.doc buildschematoc.xml [Builder].launch</value>
+ <value>&lt;project&gt;/.externalToolBuilders/BuildSchemaDocs.launch</value>
</dictionary>
</arguments>
</buildCommand>
diff --git a/doc/bundles/org.eclipse.ecf.doc/META-INF/MANIFEST.MF b/doc/bundles/org.eclipse.ecf.doc/META-INF/MANIFEST.MF
index 20974c80d..763913fec 100644
--- a/doc/bundles/org.eclipse.ecf.doc/META-INF/MANIFEST.MF
+++ b/doc/bundles/org.eclipse.ecf.doc/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %plugin.name
Bundle-SymbolicName: org.eclipse.ecf.doc; singleton:=true
Automatic-Module-Name: org.eclipse.ecf.doc
-Bundle-Version: 1.3.201.qualifier
+Bundle-Version: 1.3.300.qualifier
Bundle-Vendor: %plugin.provider
Bundle-Localization: plugin
Require-Bundle: org.eclipse.help;bundle-version="[3.0.0,4.0.0)",
diff --git a/doc/bundles/org.eclipse.ecf.doc/book.css b/doc/bundles/org.eclipse.ecf.doc/book.css
deleted file mode 100644
index ad27301d7..000000000
--- a/doc/bundles/org.eclipse.ecf.doc/book.css
+++ /dev/null
@@ -1,21 +0,0 @@
-/******************************************************************************* * Copyright (c) 2001, 2005 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html * * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ @import "../PRODUCT_PLUGIN/book.css";
-span.control {
- font-weight: bold;
-}
-
-span.name {
- font-style: italic;
-}
-
-span.code {
- font-family: monospace;
-}
-
-p.nav_footer {
- font-weight: bold;
-}
-
-p.nav_footer a {
- font-weight: bold;
- font-style: italic;
-}
diff --git a/doc/bundles/org.eclipse.ecf.doc/build.properties b/doc/bundles/org.eclipse.ecf.doc/build.properties
index ca5a1e52a..bb1d309c1 100644
--- a/doc/bundles/org.eclipse.ecf.doc/build.properties
+++ b/doc/bundles/org.eclipse.ecf.doc/build.properties
@@ -1,32 +1,48 @@
bin.includes = plugin.xml,\
html/,\
- toc*.xml,\
META-INF/,\
- about.html,\
plugin.properties,\
intro/,\
+ about.html,\
notices.html,\
- topics_Tutorials.xml,\
- topics_Samples.xml,\
- topics_Reference.xml,\
- topics_Extpoint.xml,\
- topics_GettingStarted.xml,\
- tocapi.xml,\
toc.xml,\
- schema.xml,\
- topics_Reference_RemoteServices.xml
+ tocjavadoc.xml,\
+ topics_Reference.xml,\
+ topics_Resources.xml,\
+ index/
src.includes = intro/,\
about.html,\
notices.html,\
- topics_Tutorials.xml,\
- topics_Samples.xml,\
- topics_Reference.xml,\
- topics_GettingStarted.xml,\
- topics_Extpoint.xml,\
- tocapi.xml,\
toc.xml,\
- schema.xml,\
- topics_Reference_RemoteServices.xml
-bin.excludes = html/reference/api/
+ tocjavadoc.xml,\
+ topics_Reference.xml,\
+ topics_Resources.xml,\
+ buildschemadocs.xml
generateSourceBundle=false
-
+# Classpath used by tycho javadocs generation
+jars.extra.classpath = platform:/plugin/org.eclipse.ecf,\
+ platform:/plugin/org.eclipse.ecf.console,\
+ platform:/plugin/org.eclipse.ecf.discovery,\
+ platform:/plugin/org.eclipse.ecf.filetransfer,\
+ platform:/plugin/org.eclipse.ecf.identity,\
+ platform:/plugin/org.eclipse.ecf.osgi.services.distribution,\
+ platform:/plugin/org.eclipse.ecf.osgi.services.remoteserviceadmin,\
+ platform:/plugin/org.eclipse.ecf.osgi.services.remoteserviceadmin.console,\
+ platform:/plugin/org.eclipse.ecf.osgi.services.remoteserviceadmin.proxy,\
+ platform:/plugin/org.eclipse.ecf.provider,\
+ platform:/plugin/org.eclipse.ecf.provider.dnssd,\
+ platform:/plugin/org.eclipse.ecf.provider.filetransfer,\
+ platform:/plugin/org.eclipse.ecf.provider.filetransfer.httpclient4,\
+ platform:/plugin/org.eclipse.ecf.provider.filetransfer.httpclient45,\
+ platform:/plugin/org.eclipse.ecf.provider.jslp,\
+ platform:/plugin/org.eclipse.ecf.provider.remoteservice,\
+ platform:/plugin/org.eclipse.ecf.provider.r_osgi,\
+ platform:/plugin/org.eclipse.ecf.provider.zookeeper,\
+ platform:/plugin/org.eclipse.ecf.remoteservice,\
+ platform:/plugin/org.eclipse.ecf.remoteservice.asyncproxy,\
+ platform:/plugin/org.eclipse.ecf.remoteservice.eventadmin,\
+ platform:/plugin/org.eclipse.ecf.remoteservice.rest,\
+ platform:/plugin/org.eclipse.ecf.remoteservice.rest.synd,\
+ platform:/plugin/org.eclipse.ecf.remoteservice.servlet,\
+ platform:/plugin/org.eclipse.ecf.sharedobject,\
+ platform:/plugin/org.eclipse.osgi.services.remoteserviceadmin
diff --git a/doc/bundles/org.eclipse.ecf.doc/buildapitoc.xml b/doc/bundles/org.eclipse.ecf.doc/buildapitoc.xml
deleted file mode 100644
index 6ca6454c8..000000000
--- a/doc/bundles/org.eclipse.ecf.doc/buildapitoc.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<project default="toc" basedir=".">
-
- <target name="init">
- </target>
-
- <target name="toc" depends="init,compile">
- <echo file="tocapi.xml"><![CDATA[
-<toc label="JavaDoc">
-]]></echo>
- <java classname="BuildAPITOC" classpath="." output="tocapi.xml" append="true">
- <arg value="http://download.eclipse.org/rt/ecf/3.5Test/javadoc/package-list"/>
- </java>
- <echo file="tocapi.xml" append="true"><![CDATA[
-</toc>
-]]></echo>
- </target>
-
- <target name="compile">
- <echo file="BuildAPITOC.java"><![CDATA[
-import java.io.*;
-import java.net.URL;
-public class BuildAPITOC {
- public static void main(String[] args) throws Exception {
- System.out.println("args[0] is "+args[0]);
- URL url = new URL(args[0]);
- BufferedReader r = new BufferedReader(new InputStreamReader(url.openStream()));
- String line;
- try {
- while ((line = r.readLine()) != null)
- System.out.println("<topic label=\"" + line + "\" href=\"http://download.eclipse.org/rt/ecf/latest/javadoc/" + line.replace('.', '/') + "/package-summary.html\"/>");
- } finally {
- r.close();
- }
- }
-}
-]]></echo>
- <javac srcDir="." includes="BuildAPITOC.java"/>
- </target>
-
- <target name="clean">
- <delete>
- <fileset dir="." includes="BuildAPITOC.*,tocapi.xml"/>
- </delete>
- </target>
-</project> \ No newline at end of file
diff --git a/doc/bundles/org.eclipse.ecf.doc/buildschemadocs.xml b/doc/bundles/org.eclipse.ecf.doc/buildschemadocs.xml
new file mode 100644
index 000000000..1ce2afc69
--- /dev/null
+++ b/doc/bundles/org.eclipse.ecf.doc/buildschemadocs.xml
@@ -0,0 +1,37 @@
+<project default="all">
+
+ <property name="dest" value="html/reference/extension-points" />
+
+ <target name="all" depends="clean">
+ <antcall target="convertSchemaToHtml" />
+ <antcall target="buildIndex" />
+ </target>
+
+ <target name="convertSchemaToHtml" description="Generate HTML help pages for extension point schema" if="eclipse.running">
+ <mkdir dir="${dest}"/>
+ <pde.convertSchemaToHTML manifest="../../../framework/bundles/org.eclipse.ecf/plugin.xml" destination="${dest}" />
+ <pde.convertSchemaToHTML manifest="../../../framework/bundles/org.eclipse.ecf.filetransfer/plugin.xml" destination="${dest}" />
+ <pde.convertSchemaToHTML manifest="../../../framework/bundles/org.eclipse.ecf.identity/plugin.xml" destination="${dest}" />
+ <pde.convertSchemaToHTML manifest="../../../framework/bundles/org.eclipse.ecf.presence.bot/plugin.xml" destination="${dest}" />
+ <pde.convertSchemaToHTML manifest="../../../framework/bundles/org.eclipse.ecf.presence.ui/plugin.xml" destination="${dest}" />
+ <pde.convertSchemaToHTML manifest="../../../framework/bundles/org.eclipse.ecf.remoteservice.ui/plugin.xml" destination="${dest}" />
+ <pde.convertSchemaToHTML manifest="../../../framework/bundles/org.eclipse.ecf.sharedobject/plugin.xml" destination="${dest}" />
+ <pde.convertSchemaToHTML manifest="../../../framework/bundles/org.eclipse.ecf.ui/plugin.xml" destination="${dest}" />
+ <pde.convertSchemaToHTML manifest="../../../providers/bundles/org.eclipse.ecf.provider.filetransfer/plugin.xml" destination="${dest}" />
+ <pde.convertSchemaToHTML manifest="../../../server-side/bundles/org.eclipse.ecf.server.generic/plugin.xml" destination="${dest}" />
+
+ <!-- Allow re-using the same CSS as used by the Platform docs -->
+ <replace dir="${dest}" token="../../" value="../../../../org.eclipse.platform.doc.isv/" includes="*.html"/>
+ </target>
+
+ <target name="buildIndex" description="Pre-build search indices for documentation bundle" if="eclipse.running">
+ <mkdir dir="${basedir}/index"/>
+ <help.buildHelpIndex manifest="${basedir}/plugin.xml" destination="${basedir}"/>
+ </target>
+
+ <target name="clean">
+ <delete dir="${basedir}/${dest}" failonerror="false" />
+ <delete dir="${basedir}/index" failonerror="false" />
+ </target>
+
+</project>
diff --git a/doc/bundles/org.eclipse.ecf.doc/buildschematoc.xml b/doc/bundles/org.eclipse.ecf.doc/buildschematoc.xml
deleted file mode 100644
index 5004ef1f8..000000000
--- a/doc/bundles/org.eclipse.ecf.doc/buildschematoc.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<project default="toc" basedir=".">
-
- <target name="init">
- <property name="dest.path" location="${basedir}/html/reference/extension-points"/>
- <uptodate property="BuildExtPointTOC.uptodate" targetfile="BuildExtPointTOC.class">
- <srcfiles dir="${dest.path}" includes="*.html"/>
- </uptodate>
- </target>
-
- <target name="toc" depends="init,compile">
- <echo file="tocextpoint.xml"><![CDATA[
-<toc label="Extension Points">
-]]></echo>
- <java classname="BuildExtPointTOC" classpath="." output="tocextpoint.xml" append="true">
- <arg value="${dest.path}"/>
- </java>
- <echo file="tocextpoint.xml" append="true"><![CDATA[
-</toc>
-]]></echo>
- </target>
-
- <target name="compile" unless="BuildExtPointTOC.uptodate">
- <echo file="BuildExtPointTOC.java"><![CDATA[
-import java.io.*;
-public class BuildExtPointTOC {
- public static void main(String[] args) throws Exception {
- File dir = new File(args[0]);
- File[] files = dir.listFiles(new FileFilter() {
- public boolean accept(File file) {
- return file.isFile() && file.getName().endsWith(".html");
- }
- });
- for (int i = 0; i < files.length; ++i) {
- String name = files[i].getName();
- System.out.println("<topic label=\"" + name.substring(0, name.indexOf('.')).replace('_', '.') + "\" href=\"html/reference/extension-points/" + name + "\"/>");
- }
- }
-}
-]]></echo>
- <javac srcDir="." includes="BuildExtPointTOC.java"/>
- </target>
-
- <target name="clean">
- <delete>
- <fileset dir="." includes="BuildExtPointTOC.*,tocextpoint.xml"/>
- </delete>
- </target>
-</project> \ No newline at end of file
diff --git a/doc/bundles/org.eclipse.ecf.doc/html/reference/.gitignore b/doc/bundles/org.eclipse.ecf.doc/html/reference/.gitignore
new file mode 100644
index 000000000..d70476c14
--- /dev/null
+++ b/doc/bundles/org.eclipse.ecf.doc/html/reference/.gitignore
@@ -0,0 +1,2 @@
+/api/
+/extension-points/
diff --git a/doc/bundles/org.eclipse.ecf.doc/html/reference/api/.gitignore b/doc/bundles/org.eclipse.ecf.doc/html/reference/api/.gitignore
deleted file mode 100644
index 082f69301..000000000
--- a/doc/bundles/org.eclipse.ecf.doc/html/reference/api/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-index-files
-org
-resources
-package-list
-*.html
-*.css \ No newline at end of file
diff --git a/doc/bundles/org.eclipse.ecf.doc/html/reference/extension-points/org_eclipse_ecf_container.html b/doc/bundles/org.eclipse.ecf.doc/html/reference/extension-points/org_eclipse_ecf_container.html
deleted file mode 100644
index 27440430b..000000000
--- a/doc/bundles/org.eclipse.ecf.doc/html/reference/extension-points/org_eclipse_ecf_container.html
+++ /dev/null
@@ -1,89 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-<HEAD><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<title>container</title>
-<style type="text/css">@import url("../../book.css");</style>
-<style type="text/css">@import url("../../schema.css");</style>
-</HEAD>
-<BODY>
-<H1 style="text-align:center">container</H1>
-<p></p>
-<h6 class="CaptionFigColumn SchemaHeader">Identifier: </h6>org.eclipse.ecf.container<p></p>
-<h6 class="CaptionFigColumn SchemaHeader">Since: </h6>ECF core bundle v 3.1.0.
-<p></p>
-
-<h6 class="CaptionFigColumn SchemaHeader">Description: </h6>This extension point allows extensions to specify the creation of a container instance of a given type.<p></p>
-<h6 class="CaptionFigColumn SchemaHeader">Configuration Markup:</h6>
-<p></p>
-<p class="code SchemaDtd">&lt;!ELEMENT <a name="e.extension">extension</a> (<a href="#e.container">container</a>+)&gt;</p>
-<p class="code SchemaDtd">&lt;!ATTLIST extension</p>
-<p class="code SchemaDtdAttlist">point&nbsp;CDATA #REQUIRED</p><p class="code SchemaDtdAttlist">id&nbsp;&nbsp;&nbsp;&nbsp;CDATA #IMPLIED</p><p class="code SchemaDtdAttlist">name&nbsp;&nbsp;CDATA #IMPLIED</p>&gt;</p>
-<p></p>
-<ul class="ConfigMarkupAttlistDesc">
-</ul>
-<br><p class="code SchemaDtd">&lt;!ELEMENT <a name="e.container">container</a> (<a href="#e.parameter">parameter</a>+)?&gt;</p>
-<p class="code SchemaDtd">&lt;!ATTLIST container</p>
-<p class="code SchemaDtdAttlist">factoryName&nbsp;CDATA #REQUIRED</p><p class="code SchemaDtdAttlist">containerId&nbsp;CDATA #IMPLIED</p>&gt;</p>
-<p></p>
-<p class="ConfigMarkupElementDesc">
-The container extension point. Extensions may define new containers created upon ECF core initialization.</p>
-<br>
-<ul class="ConfigMarkupAttlistDesc">
-<li><b>factoryName</b> - The required containerFactoryName (e.g. ecf.generic.client or ecf.r_osgi.peer) that defines the type of container to create.</li>
-<li><b>containerId</b> - Optional containerId that defines the id for the new container instance.</li>
-</ul>
-<br><p class="code SchemaDtd">&lt;!ELEMENT <a name="e.parameter">parameter</a> EMPTY&gt;</p>
-<p class="code SchemaDtd">&lt;!ATTLIST parameter</p>
-<p class="code SchemaDtdAttlist">name&nbsp;&nbsp;CDATA #REQUIRED</p><p class="code SchemaDtdAttlist">value&nbsp;CDATA #REQUIRED</p>&gt;</p>
-<p></p>
-<p class="ConfigMarkupElementDesc">
-Parameter for container instance creation. The name value pairs defined by the parameter element name and value attributes are added to a Map that is then passed to the container factory instance creation.</p>
-<br>
-<ul class="ConfigMarkupAttlistDesc">
-<li><b>name</b> - The name for the container parameter.</li>
-<li><b>value</b> - The value for the container parameter.</li>
-</ul>
-<br><h6 class="CaptionFigColumn SchemaHeader">Examples: </h6><pre class="Example"><span class="code SchemaTag">
- &lt;extension
- point=</span><span class="code SchemaCstring">&quot;org.eclipse.ecf.container&quot;</span><span class="code SchemaTag">&gt;
- &lt;container
- containerId=</span><span class="code SchemaCstring">&quot;foo1&quot;</span><span class="code SchemaTag">
- factoryName=</span><span class="code SchemaCstring">&quot;ecf.generic.client&quot;</span><span class="code SchemaTag">&gt;
- &lt;parameter
- name=</span><span class="code SchemaCstring">&quot;name1&quot;</span><span class="code SchemaTag">
- value=</span><span class="code SchemaCstring">&quot;value1&quot;</span><span class="code SchemaTag">&gt;
- &lt;/parameter&gt;
- &lt;parameter
- name=</span><span class="code SchemaCstring">&quot;name2&quot;</span><span class="code SchemaTag">
- value=</span><span class="code SchemaCstring">&quot;value2&quot;</span><span class="code SchemaTag">&gt;
- &lt;/parameter&gt;
- &lt;/container&gt;
- &lt;container
- containerId=</span><span class="code SchemaCstring">&quot;adfasdf&quot;</span><span class="code SchemaTag">
- factoryName=</span><span class="code SchemaCstring">&quot;bogus.factory.name&quot;</span><span class="code SchemaTag">&gt;
- &lt;/container&gt;
- &lt;container
- containerId=</span><span class="code SchemaCstring">&quot;ecftcp://localhost:32111/server&quot;</span><span class="code SchemaTag">
- factoryName=</span><span class="code SchemaCstring">&quot;ecf.generic.server&quot;</span><span class="code SchemaTag">&gt;
- &lt;/container&gt;
- &lt;container
- factoryName=</span><span class="code SchemaCstring">&quot;ecf.generic.client&quot;</span><span class="code SchemaTag">&gt;
- &lt;/container&gt;
- &lt;/extension&gt;
-</span></pre>
-<p></p>
-
-<h6 class="CaptionFigColumn SchemaHeader">API Information: </h6>No API available.
-<p></p>
-
-<h6 class="CaptionFigColumn SchemaHeader">Supplied Implementation: </h6>The ECF core v3.1.0 bundle supplies the implementation of this extension point.
-<p></p>
-
-<br>
-<p class="note SchemaCopyright">
-Copyright (c) 2009 Composent, Inc. and others.
-All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Composent, Inc. - initial API and implementation.
-
-</p>
-</BODY>
-</HTML>
diff --git a/doc/bundles/org.eclipse.ecf.doc/html/reference/extension-points/org_eclipse_ecf_containerFactory.html b/doc/bundles/org.eclipse.ecf.doc/html/reference/extension-points/org_eclipse_ecf_containerFactory.html
deleted file mode 100644
index 1845a1823..000000000
--- a/doc/bundles/org.eclipse.ecf.doc/html/reference/extension-points/org_eclipse_ecf_containerFactory.html
+++ /dev/null
@@ -1,225 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-<HEAD><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<title>ECF Container Factory</title>
-<style type="text/css">@import url("../../book.css");</style>
-<style type="text/css">@import url("../../schema.css");</style>
-</HEAD>
-<BODY>
-<H1 style="text-align:center">ECF Container Factory</H1>
-<p></p>
-<h6 class="CaptionFigColumn SchemaHeader">Identifier: </h6>org.eclipse.ecf.containerFactory<p></p>
-<h6 class="CaptionFigColumn SchemaHeader">Since: </h6>0.0.1
-<p></p>
-
-<h6 class="CaptionFigColumn SchemaHeader">Description: </h6>This extension allows plugins to register themselves as 'providers' of ECF containers. Once registered via this extension point, plugins can then provide there own implementations of IContainer in response to client request of the ECF container factory (<b>org.eclipse.ecf.core.ContainerFactory</b>).
-<p>Plugins using this extension point can define a new implementation of any desired communications protocol, and expose that protocol as an instance of an <b>IContainer</b>. When client requests are made to ECF ContainerFactory to create <b>IContainer</b> instances, those requests will be re-directed to the given IContainer implementer.<p></p>
-<h6 class="CaptionFigColumn SchemaHeader">Configuration Markup:</h6>
-<p></p>
-<p class="code SchemaDtd">&lt;!ELEMENT <a name="e.extension">extension</a> (<a href="#e.containerFactory">containerFactory</a>+)&gt;</p>
-<p class="code SchemaDtd">&lt;!ATTLIST extension</p>
-<p class="code SchemaDtdAttlist">point&nbsp;CDATA #REQUIRED</p><p class="code SchemaDtdAttlist">id&nbsp;&nbsp;&nbsp;&nbsp;CDATA #IMPLIED</p><p class="code SchemaDtdAttlist">name&nbsp;&nbsp;CDATA #IMPLIED</p>&gt;</p>
-<p></p>
-<ul class="ConfigMarkupAttlistDesc">
-</ul>
-<br><p class="code SchemaDtd">&lt;!ELEMENT <a name="e.containerFactory">containerFactory</a> EMPTY&gt;</p>
-<p class="code SchemaDtd">&lt;!ATTLIST containerFactory</p>
-<p class="code SchemaDtdAttlist">class&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED</p><p class="code SchemaDtdAttlist">name&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #IMPLIED</p><p class="code SchemaDtdAttlist">description&nbsp;CDATA #IMPLIED</p><p class="code SchemaDtdAttlist">server&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(true | false) </p><p class="code SchemaDtdAttlist">hidden&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(true | false) </p>&gt;</p>
-<p></p>
-<p class="ConfigMarkupElementDesc">
-The container factory extension point. Can optionally contain a list of 'defaultargument' elements that describe the arguments to be passed to provider implementation</p>
-<br>
-<ul class="ConfigMarkupAttlistDesc">
-<li><b>class</b> - The fully qualified name of the class implementing the <b>org.eclipse.ecf.core.provider.IContainerInstantiator</b> interface.</li>
-<li><b>name</b> - An optional name for the extension. If no name is explicitly provided by the extension, the containerFactory class name is used as the name. Note that this name must <b>not</b> conflict with any other name in the ECF SharedFactory in order to be successfully registered in the container factory. Care should therefore be taken in selection of a name such that it does not conflict with other pre-existing names for this factory implementations</li>
-<li><b>description</b> - A description of the container factory suitable for presentation in a user interface.</li>
-<li><b>server</b> - Flag to indicate whether the factory is for creating servers. Default is false.</li>
-<li><b>hidden</b> - Flag for whether the given container factory should be hidden in the user interface. Default is false.</li>
-</ul>
-<br><h6 class="CaptionFigColumn SchemaHeader">Examples: </h6>Here's an extension that associates a class org.eclipse.ecf.test.FooContainerFactory with name 'foo' in the ECF <b>ContainerFactory</b>:
-
-<pre class="Example"><span class="code SchemaTag">
-&lt;extension point=</span><span class="code SchemaCstring">&quot;org.eclipse.ecf.containerFactory&quot;</span><span class="code SchemaTag">&gt;
- &lt;containerFactory name=</span><span class="code SchemaCstring">&quot;foo&quot;</span><span class="code SchemaTag"> class=</span><span class="code SchemaCstring">&quot;org.eclipse.ecf.test.FooInstantiator&quot;</span><span class="code SchemaTag"> description=</span><span class="code SchemaCstring">&quot;My container factory&quot;</span><span class="code SchemaTag">/&gt;
-&lt;/extension&gt;
-</span></pre>
-
-Here is some example code to implement this class:
-
-<pre class="Example"><span class="code SchemaTag">
-package org.eclipse.ecf.test;
-
-import org.eclipse.ecf.core.IContainer;
-import org.eclipse.ecf.core.ContainerInstantiationException;
-import org.eclipse.ecf.core.provider.IContainerInstantiator;
-
-public class FooInstantiator implements IContainerInstantiator {
-
- public FooInstantiator() {
- super();
- }
- public IContainer createInstance(ContainerTypeDescription description, Class[] argTypes, Object[] args)
- throws ContainerInstantiationException {
- // Create/return instance of FooContainer
- // Note that FooContainer class must
- // implement IContainer
- return new FooContainer();
- }
-}
-</span></pre>
-
-In this example, the given class implements the <b>IContainerInstantiator</b>.createInstance method by creating and returning a new instance of FooInstantiator, a class also defined in the extension plugin. As noted in the code, this class must implement <b>IContainer</b>, so that it can successfully be returned from createInstance.
-
-<h3>Example Usage of Container by Clients</h3>
-
-Clients that wish to use the 'foo' container implementation can do so simply by making the following call to create an <b>IContainer</b>:
-
-<pre class="Example"><span class="code SchemaTag">
-IContainer newContainer = ContainerFactory.getDefault().createContainer(&apos;foo&apos;);
-// Further use of newContainer instance here
-
-</span></pre>
-<p></p>
-
-<h6 class="CaptionFigColumn SchemaHeader">API Information: </h6>The API for this extension point is provided by the <b>org.eclipse.ecf.core.ContainerFactory.getDefault()</b> methods. Specifically, the 'createContainer' methods are to be used by clients. The functionality provided by the extension point mechanism can be used at runtime via the <b>ContainerFactory.getDefault().addDescription(ContainerTypeDescription)</b> method. Here is the IContainerFactory interface
-contract:
-
-<pre class="Example"><span class="code SchemaTag">
-/**
- * Container factory contract {@link ContainerFactory} for default
- * implementation.
- */
-public interface IContainerFactory {
- /**
- * Add a ContainerTypeDescription to the set of known ContainerDescriptions.
- *
- * @param description
- * the ContainerTypeDescription to add to this factory. Must not
- * be null.
- * @return ContainerTypeDescription the old description of the same name,
- * null if none found
- */
- public ContainerTypeDescription addDescription(ContainerTypeDescription description);
-
- /**
- * Get a collection of the ContainerDescriptions currently known to this
- * factory. This allows clients to query the factory to determine what if
- * any other ContainerDescriptions are currently registered with the
- * factory, and if so, what they are.
- *
- * @return List of ContainerTypeDescription instances
- */
- public List /* ContainerTypeDescription */ getDescriptions();
-
- /**
- * Check to see if a given named description is already contained by this
- * factory
- *
- * @param description
- * the ContainerTypeDescription to look for
- * @return true if description is already known to factory, false otherwise
- */
- public boolean containsDescription(ContainerTypeDescription description);
-
- /**
- * Get the known ContainerTypeDescription given it&apos;s name.
- *
- * @param name
- * the name to use as key to find ContainerTypeDescription
- * @return ContainerTypeDescription found. Null if not found.
- */
- public ContainerTypeDescription getDescriptionByName(String name);
-
- /**
- * Make IContainer instance. Given a ContainerTypeDescription object, a
- * String [] of argument types, and an Object [] of parameters, this method
- * will
- * &lt;p&gt;
- * &lt;ul&gt;
- * &lt;li&gt;lookup the known ContainerDescriptions to find one of matching name&lt;/li&gt;
- * &lt;li&gt;if found, will retrieve or create an IContainerInstantiator for that
- * description&lt;/li&gt;
- * &lt;li&gt;Call the IContainerInstantiator.createInstance method to return an
- * instance of IContainer&lt;/li&gt;
- * &lt;/ul&gt;
- *
- * @param description
- * the ContainerTypeDescription to use to create the instance
- * @param parameters
- * an Object [] of parameters passed to the createInstance method
- * of the IContainerInstantiator
- * @return a valid instance of IContainer
- * @throws ContainerCreateException
- */
- public IContainer createContainer(ContainerTypeDescription description,
- Object[] parameters) throws ContainerCreateException;
-
- /**
- * Make IContainer instance. Given a ContainerTypeDescription name, this
- * method will
- * &lt;p&gt;
- * &lt;ul&gt;
- * &lt;li&gt;lookup the known ContainerDescriptions to find one of matching name&lt;/li&gt;
- * &lt;li&gt;if found, will retrieve or create an IContainerInstantiator for that
- * description&lt;/li&gt;
- * &lt;li&gt;Call the IContainerInstantiator.createInstance method to return an
- * instance of IContainer&lt;/li&gt;
- * &lt;/ul&gt;
- *
- * @param descriptionName
- * the ContainerTypeDescription name to lookup
- * @return a valid instance of IContainer
- * @throws ContainerCreateException
- */
- public IContainer createContainer(String descriptionName)
- throws ContainerCreateException;
-
- /**
- * Make IContainer instance. Given a ContainerTypeDescription name, this
- * method will
- * &lt;p&gt;
- * &lt;ul&gt;
- * &lt;li&gt;lookup the known ContainerDescriptions to find one of matching name&lt;/li&gt;
- * &lt;li&gt;if found, will retrieve or create an IContainerInstantiator for that
- * description&lt;/li&gt;
- * &lt;li&gt;Call the IContainerInstantiator.createInstance method to return an
- * instance of IContainer&lt;/li&gt;
- * &lt;/ul&gt;
- *
- * @param descriptionName
- * the ContainerTypeDescription name to lookup
- * @param parameters
- * the Object [] of parameters passed to the
- * IContainerInstantiator.createInstance method
- * @return a valid instance of IContainer
- * @throws ContainerCreateException
- */
- public IContainer createContainer(String descriptionName, Object[] parameters)
- throws ContainerCreateException;
-
- /**
- * Remove given description from set known to this factory.
- *
- * @param description
- * the ContainerTypeDescription to remove
- * @return the removed ContainerTypeDescription, null if nothing removed
- */
- public ContainerTypeDescription removeDescription(
- ContainerTypeDescription description);
-}
-</span></pre>
-<p></p>
-
-<h6 class="CaptionFigColumn SchemaHeader">Supplied Implementation: </h6>The supplied implementations of this extension point are:
-
-org.eclipse.ecf.provider.generic.GenericContainerInstantiator
-<p></p>
-
-<br>
-<p class="note SchemaCopyright">
-Copyright (c) 2004 Composent, Inc. and others.
-All rights reserved. This program and the accompanying materials are made available under the 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.
-
-</p>
-</BODY>
-</HTML>
diff --git a/doc/bundles/org.eclipse.ecf.doc/html/reference/extension-points/org_eclipse_ecf_discovery_ui_serviceAccessHandler.html b/doc/bundles/org.eclipse.ecf.doc/html/reference/extension-points/org_eclipse_ecf_discovery_ui_serviceAccessHandler.html
deleted file mode 100644
index 0ab097ec3..000000000
--- a/doc/bundles/org.eclipse.ecf.doc/html/reference/extension-points/org_eclipse_ecf_discovery_ui_serviceAccessHandler.html
+++ /dev/null
@@ -1,126 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-<HEAD><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<title>ECF Service Access Handler</title>
-<style type="text/css">@import url("../../book.css");</style>
-<style type="text/css">@import url("../../schema.css");</style>
-</HEAD>
-<BODY>
-<H1 style="text-align:center">ECF Service Access Handler</H1>
-<p></p>
-<h6 class="CaptionFigColumn SchemaHeader">Identifier: </h6>org.eclipse.ecf.discovery.ui.serviceAccessHandler<p></p>
-<h6 class="CaptionFigColumn SchemaHeader">Since: </h6>2.0.0M5
-<p></p>
-
-<h6 class="CaptionFigColumn SchemaHeader">Description: </h6>This extension point allows plugins to add menu items to the
-discovery view's context menu for accessing/invoking a remote service.<p></p>
-<h6 class="CaptionFigColumn SchemaHeader">Configuration Markup:</h6>
-<p></p>
-<p class="code SchemaDtd">&lt;!ELEMENT <a name="e.extension">extension</a> (<a href="#e.serviceAccessHandler">serviceAccessHandler</a>)+&gt;</p>
-<p class="code SchemaDtd">&lt;!ATTLIST extension</p>
-<p class="code SchemaDtdAttlist">point&nbsp;CDATA #REQUIRED<p class="code SchemaDtdAttlist">id&nbsp;&nbsp;&nbsp;&nbsp;CDATA #IMPLIED<p class="code SchemaDtdAttlist">name&nbsp;&nbsp;CDATA #IMPLIED&gt;</p>
-<p></p>
-<ul class="ConfigMarkupAttlistDesc">
-</ul>
-<br><p class="code SchemaDtd">&lt;!ELEMENT <a name="e.serviceAccessHandler">serviceAccessHandler</a> EMPTY&gt;</p>
-<p class="code SchemaDtd">&lt;!ATTLIST serviceAccessHandler</p>
-<p class="code SchemaDtdAttlist">class&nbsp;CDATA #REQUIRED&gt;</p>
-<p></p>
-<ul class="ConfigMarkupAttlistDesc">
-<li><b>class</b> - Required service access handler class. Note this class must implement the <b>org.eclipse.ecf.discovery.ui.views.IServiceAccessHandler</b> interface.</li>
-</ul>
-<br><h6 class="CaptionFigColumn SchemaHeader">Examples: </h6>Here is example usage of the serviceAccessHandler extension point. In this example, a http/http service handler is declared:
-
-<pre class="Example"><span class="code SchemaTag">
- &lt;extension
- point=</span><span class="code SchemaCstring">&quot;org.eclipse.ecf.discovery.ui.serviceAccessHandler&quot;</span><span class="code SchemaTag">&gt;
- &lt;serviceAccessHandler
- class=</span><span class="code SchemaCstring">&quot;org.eclipse.ecf.discovery.ui.HttpServiceAccessHandler&quot;</span><span class="code SchemaTag">&gt;
- &lt;/serviceAccessHandler&gt;
- &lt;/extension&gt;
-</span></pre>
-
-Here's is implementation of the HttpServiceAccessHandler:
-
-<pre class="Example"><span class="code SchemaTag">
-public class HttpServiceAccessHandler implements IServiceAccessHandler {
-
- private static final String RFC2782_PATH = "path"; //$NON-NLS-1$
- //private static final String RFC2782_USERNAME = "u"; //$NON-NLS-1$
- //private static final String RFC2782_PASSWORD = "p"; //$NON-NLS-1$
- static final IContributionItem[] EMPTY_CONTRIBUTION = {};
-
- public HttpServiceAccessHandler() {
- // nothing to do
- }
-
- public IContributionItem[] getContributionsForService(IServiceInfo serviceInfo) {
- IServiceID serviceID = serviceInfo.getServiceID();
- List serviceTypes = Arrays.asList(serviceID.getServiceTypeID().getProtocols());
- String protocol = null;
- if (serviceTypes.contains("http")) //$NON-NLS-1$
- protocol = "http"; //$NON-NLS-1$
- else if (serviceTypes.contains("https")) //$NON-NLS-1$
- protocol = "https"; //$NON-NLS-1$
- if (protocol == null)
- return EMPTY_CONTRIBUTION;
- URI location = serviceInfo.getLocation();
- StringBuffer buf = new StringBuffer(protocol);
- buf.append("://").append(location.getHost()); //$NON-NLS-1$
- if (location.getPort() != -1)
- buf.append(":").append(location.getPort()).append("/"); //$NON-NLS-1$ //$NON-NLS-2$
- IServiceProperties svcProps = serviceInfo.getServiceProperties();
- final String path = svcProps.getPropertyString(RFC2782_PATH);
- if (path != null)
- buf.append(path);
- final String urlString = buf.toString();
- //final String username = svcProps.getPropertyString(RFC2782_USERNAME);
- //final String password = svcProps.getPropertyString(RFC2782_PASSWORD);
- Action action = new Action() {
- public void run() {
- openBrowser(urlString);
- }
- };
- action.setText(Messages.HttpServiceAccessHandler_MENU_TEXT + urlString);
- return new IContributionItem[] {new ActionContributionItem(action)};
- }
-
- protected void openBrowser(String urlString) {
- final IWorkbenchBrowserSupport support = PlatformUI.getWorkbench().getBrowserSupport();
- try {
- support.createBrowser(null).openURL(new URL(urlString));
- } catch (final Exception e) {
- logError(Messages.HttpServiceAccessHandler_EXCEPTION_CREATEBROWSER, e);
- }
-
- }
-
- protected void logError(String exceptionString, Throwable e) {
- Activator.getDefault().getLog().log(new Status(IStatus.ERROR, Activator.PLUGIN_ID, IStatus.ERROR, exceptionString, e));
-
- }
-
-}
-
-</span></pre>
-<p></p>
-
-<h6 class="CaptionFigColumn SchemaHeader">Supplied Implementation: </h6>None.
-<p></p>
-
-<br>
-<p class="note SchemaCopyright">
-/****************************************************************************
- * 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
- *****************************************************************************/
-
-</p>
-</BODY>
-</HTML>
diff --git a/doc/bundles/org.eclipse.ecf.doc/html/reference/extension-points/org_eclipse_ecf_identity_namespace.html b/doc/bundles/org.eclipse.ecf.doc/html/reference/extension-points/org_eclipse_ecf_identity_namespace.html
deleted file mode 100644
index dbb94dbe2..000000000
--- a/doc/bundles/org.eclipse.ecf.doc/html/reference/extension-points/org_eclipse_ecf_identity_namespace.html
+++ /dev/null
@@ -1,117 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-<HEAD><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<title>ECF Namespace</title>
-<style type="text/css">@import url("../../book.css");</style>
-<style type="text/css">@import url("../../schema.css");</style>
-</HEAD>
-<BODY>
-<H1 style="text-align:center">ECF Namespace</H1>
-<p></p>
-<h6 class="CaptionFigColumn SchemaHeader">Identifier: </h6>org.eclipse.ecf.identity.namespace<p></p>
-<h6 class="CaptionFigColumn SchemaHeader">Since: </h6>0.4.0
-<p></p>
-
-<h6 class="CaptionFigColumn SchemaHeader">Description: </h6>Extension point that allows other plugins to define new Namespaces. Namespaces are used by the IDFactory for creating new ID instances. Plugins may define extension Namespace implementation, which will then be used to construct ID instances within than Namespace when clients use the default ECF identity factory (accessed via org.eclipse.ecf.core.identity.IDFactory.getDefault()).
-<p>
-Plugins implementing this extension point must define a Namespace class that extends <b>org.eclipse.ecf.core.identity.Namespace</b>. The class attribute of the namespace extension must provide a valid Namespace subclass. The name attribute defines the namespace name. If the name attribute is not present, then the Namespace class will be used as the Namespace name. The optional description attribute is an optional arbitrary description for the Namespace.<p></p>
-<h6 class="CaptionFigColumn SchemaHeader">Configuration Markup:</h6>
-<p></p>
-<p class="code SchemaDtd">&lt;!ELEMENT <a name="e.extension">extension</a> (<a href="#e.namespace">namespace</a>+)&gt;</p>
-<p class="code SchemaDtd">&lt;!ATTLIST extension</p>
-<p class="code SchemaDtdAttlist">point&nbsp;CDATA #REQUIRED</p><p class="code SchemaDtdAttlist">id&nbsp;&nbsp;&nbsp;&nbsp;CDATA #IMPLIED</p><p class="code SchemaDtdAttlist">name&nbsp;&nbsp;CDATA #IMPLIED</p>&gt;</p>
-<p></p>
-<ul class="ConfigMarkupAttlistDesc">
-</ul>
-<br><p class="code SchemaDtd">&lt;!ELEMENT <a name="e.namespace">namespace</a> EMPTY&gt;</p>
-<p class="code SchemaDtd">&lt;!ATTLIST namespace</p>
-<p class="code SchemaDtdAttlist">name&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #IMPLIED</p><p class="code SchemaDtdAttlist">class&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED</p><p class="code SchemaDtdAttlist">description&nbsp;CDATA #IMPLIED</p>&gt;</p>
-<p></p>
-<p class="ConfigMarkupElementDesc">
-Element allowing plugins to define new ECF Namespaces. Plugins wishing to define new Namespaces must provide an extension of this extension point.</p>
-<br>
-<ul class="ConfigMarkupAttlistDesc">
-<li><b>name</b> - Optional name for new Namespace. If not provided, the name will be assumed to be the value provided by the 'class' attribute for this extension point. Note that this name must <b>not</b> conflict with any other Namespace name in the ECF IDFactory in order to be successfully registered. Care should therefore be taken in selection of a namespace name such that it does not conflict with other implementations.</li>
-<li><b>class</b> - The fully qualified name of a class that extends <b>org.eclipse.ecf.core.identity.Namespace</b>.</li>
-<li><b>description</b> - An optional description for the Namespace extension</li>
-</ul>
-<br><h6 class="CaptionFigColumn SchemaHeader">Examples: </h6>Here's an extension definition that associates an namespace class with namespace 'testid':
-
-<pre class="Example"><span class="code SchemaTag">
- &lt;extension point=</span><span class="code SchemaCstring">&quot;org.eclipse.ecf.identity.namespace&quot;</span><span class="code SchemaTag">&gt;
- &lt;namespace name=</span><span class="code SchemaCstring">&quot;testnamespace&quot;</span><span class="code SchemaTag"> class=</span><span class="code SchemaCstring">&quot;org.eclipse.ecf.test.FooNamespace&quot;</span><span class="code SchemaTag"> description=</span><span class="code SchemaCstring">&quot;my namespace implementation&quot;</span><span class="code SchemaTag">/&gt;
- &lt;/extension&gt;
-</span></pre>
-
-Here is some example code to implement this FooNamespace class:
-
-<pre class="Example"><span class="code SchemaTag">
-package org.eclipse.ecf.test;
-
-import org.eclipse.ecf.core.identity.ID;
-import org.eclipse.ecf.core.identity.IDCreateException;
-import org.eclipse.ecf.core.identity.Namespace;
-
-public class FooNamespace extends
- org.eclipse.ecf.core.identity.Namespace {
-
- public ID createInstance(Class[] argTypes, Object[] args)
- throws IDCreateException {
- return new FooID((String) args[0]);
- }
-}
-</span></pre>
-
-In this example, the FooNamespace class implements the abstract <b>Namesapce</b>.createInstance method by creating and returning a new instance of FooID, a class also defined by the extension plugin. This class must implement <b>ID</b>, so that it can successfully be returned from the Namespace.createInstance call.
-
-<h3>Example Usage of IDFactory by Clients</h3>
-
-Clients that wish to use the 'testnamespace' Namespace implementation can do so simply by making the following call to create an <b>IDFactory</b>:
-
-<pre class="Example"><span class="code SchemaTag">
-ID newID = IDFactory.getDefault().createID("testnamespace","email@emailserver.com");
-</span></pre>
-Another example would be:
-<pre class="Example"><span class="code SchemaTag">
-ID newID = IDFactory.getDefault().createID(new URI("testnamespace:email@emailserver.com"));
-</span></pre>
-<p></p>
-
-<h6 class="CaptionFigColumn SchemaHeader">API Information: </h6>The client API for this extension point is provided by the <b>org.eclipse.ecf.core.IIDFactory.createID</b> methods. A valid IIDFactory is provided by the by the static <b>org.eclipse.ecf.core.identityIDFactory.getDefault()</b> method.
-<p></p>
-
-<h6 class="CaptionFigColumn SchemaHeader">Supplied Implementation: </h6>The following implementations of this extension point are provided by ECF itself:
-<p>
-StringID -- A namespace of ID instances that are implemented by <b>org.eclipse.ecf.core.identity.StringID</b>
-<p>Clients may use this namespace with calls to:
-<pre class="Example"><span class="code SchemaTag">
-ID newID = org.eclipse.ecf.core.identity.IDFactory.createStringID(&apos;idstringvalue&apos;);
-</span></pre>
-</p>
-</p>
-<p>
-LongID -- A namespace of ID instances that are implemented by <b>org.eclipse.ecf.core.identity.LongID</b>
-<p>Clients may use this namespace with calls to:
-<pre class="Example"><span class="code SchemaTag">
-ID newID = org.eclipse.ecf.core.identity.IDFactory.createLongID(2004L);
-</span></pre>
-</p>
-</p>
-<p>
-GUID -- A namespace of ID instances that are implemented by <b>org.eclipse.ecf.core.identity.GUID</b>
-<p>Clients may use this namespace with calls to:
-<pre class="Example"><span class="code SchemaTag">
-ID newID = org.eclipse.ecf.core.identity.IDFactory.createGUID(16);
-</span></pre>
-</p>
-</p>
-<p></p>
-
-<br>
-<p class="note SchemaCopyright">
-Copyright (c) 2004 Composent, Inc. and others.
-All rights reserved. This program and the accompanying materials are made available under the 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
-
-</p>
-</BODY>
-</HTML>
diff --git a/doc/bundles/org.eclipse.ecf.doc/html/reference/extension-points/org_eclipse_ecf_presence_bot_chatRoomMessageHandler.html b/doc/bundles/org.eclipse.ecf.doc/html/reference/extension-points/org_eclipse_ecf_presence_bot_chatRoomMessageHandler.html
deleted file mode 100644
index cf7bced78..000000000
--- a/doc/bundles/org.eclipse.ecf.doc/html/reference/extension-points/org_eclipse_ecf_presence_bot_chatRoomMessageHandler.html
+++ /dev/null
@@ -1,91 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-<HEAD><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<title>Chat Room Message Handler</title>
-<style type="text/css">@import url("../../book.css");</style>
-<style type="text/css">@import url("../../schema.css");</style>
-</HEAD>
-<BODY>
-<H1 style="text-align:center">Chat Room Message Handler</H1>
-<p></p>
-<h6 class="CaptionFigColumn SchemaHeader">Identifier: </h6>org.eclipse.ecf.presence.bot.chatRoomMessageHandler<p></p>
-<h6 class="CaptionFigColumn SchemaHeader">Since: </h6>1.0.0 milestone 6
-<p></p>
-
-<h6 class="CaptionFigColumn SchemaHeader">Description: </h6>This extension point allows message handlers to be associated with a given chatroomrobot (via chatroomrobotid attribute). Note that the chatroomrobotid must exist or the handler will not be called.<p></p>
-<h6 class="CaptionFigColumn SchemaHeader">Configuration Markup:</h6>
-<p></p>
-<p class="code SchemaDtd">&lt;!ELEMENT <a name="e.extension">extension</a> (<a href="#e.handler">handler</a>)+&gt;</p>
-<p class="code SchemaDtd">&lt;!ATTLIST extension</p>
-<p class="code SchemaDtdAttlist">point&nbsp;CDATA #REQUIRED</p><p class="code SchemaDtdAttlist">id&nbsp;&nbsp;&nbsp;&nbsp;CDATA #IMPLIED</p><p class="code SchemaDtdAttlist">name&nbsp;&nbsp;CDATA #IMPLIED</p>&gt;</p>
-<p></p>
-<ul class="ConfigMarkupAttlistDesc">
-</ul>
-<br><p class="code SchemaDtd">&lt;!ELEMENT <a name="e.handler">handler</a> EMPTY&gt;</p>
-<p class="code SchemaDtd">&lt;!ATTLIST handler</p>
-<p class="code SchemaDtdAttlist">chatRoomRobotId&nbsp;&nbsp;CDATA #REQUIRED</p><p class="code SchemaDtdAttlist">filterExpression&nbsp;CDATA #IMPLIED</p><p class="code SchemaDtdAttlist">class&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED</p>&gt;</p>
-<p></p>
-<p class="ConfigMarkupElementDesc">
-The chat room message handler</p>
-<br>
-<ul class="ConfigMarkupAttlistDesc">
-<li><b>chatRoomRobotId</b> - Required chatRoomRobotId. The value of this field must match a chatRoomRobot id</li>
-<li><b>filterExpression</b> - Optional filter expression. If filterexpression is provided, then chatroom messages will be filtered via given regular expression. If match, then the handleChatRoomMessage method will be called. If not matched, then the received message will be ignored.</li>
-<li><b>class</b> - The class of the message handler instance to create. Must implement <b>org.eclipse.ecf.presence.bot.IChatRoomMessageHandler</b>.</li>
-</ul>
-<br><h6 class="CaptionFigColumn SchemaHeader">Examples: </h6><pre class="Example"><span class="code SchemaTag">
- &lt;extension
- point=</span><span class="code SchemaCstring">&quot;org.eclipse.ecf.presence.bot.chatRoomMessageHandler&quot;</span><span class="code SchemaTag">&gt;
- &lt;handler
- chatRoomRobotId=</span><span class="code SchemaCstring">&quot;org.eclipse.ecf.presence.bot.defaultbot&quot;</span><span class="code SchemaTag">
- class=</span><span class="code SchemaCstring">&quot;org.eclipse.ecf.presence.bot.DefaultChatRoomMessageHandler&quot;</span><span class="code SchemaTag">&gt;
- &lt;/handler&gt;
- &lt;/extension&gt;
-</span></pre>
-
-Note that the given chatroomrobotid=<b>org.eclipse.ecf.presence.bot.defaultbot</b> must be previously defined via the chatroomrobot extension point. Here is an example:
-
-<pre class="Example"><span class="code SchemaTag">
- &lt;extension
- point=</span><span class="code SchemaCstring">&quot;org.eclipse.ecf.presence.bot.chatRoomRobot&quot;</span><span class="code SchemaTag">&gt;
- &lt;chatRoomRobot
- chat
- chatRoom=</span><span class="code SchemaCstring">&quot;#eclipse-ecf&quot;</span><span class="code SchemaTag">
- connectId=</span><span class="code SchemaCstring">&quot;irc://slewis2_@irc.freenode.net&quot;</span><span class="code SchemaTag">
- containerFactoryName=</span><span class="code SchemaCstring">&quot;ecf.irc.irclib&quot;</span><span class="code SchemaTag">
- id=</span><span class="code SchemaCstring">&quot;org.eclipse.ecf.presence.bot.defaultbot&quot;</span><span class="code SchemaTag">&gt;
- &lt;/chatRoomRobot&gt;
- &lt;/extension&gt;
-</span></pre>
-<p></p>
-
-<h6 class="CaptionFigColumn SchemaHeader">API Information: </h6>The class implementation provided in extension point must implement the following interface:
-
-<pre class="Example"><span class="code SchemaTag">
-public interface IChatRoomMessageHandler extends IChatRoomContainerAdvisor {
-
- /**
- * This method is called when a {@link IChatRoomMessage} is received.
- *
- * @param message
- * the {@link IChatRoomMessage} received. Will not be
- * &lt;code&gt;null&lt;/code&gt;. Implementers should not block the
- * calling thread. Any methods on the given &lt;code&gt;message&lt;/code&gt;
- * parameter may be called.
- */
- public void handleRoomMessage(IChatRoomMessage message);
-
-}
-</span></pre>
-<p></p>
-
-<h6 class="CaptionFigColumn SchemaHeader">Supplied Implementation: </h6>No supplied implementation.
-<p></p>
-
-<br>
-<p class="note SchemaCopyright">
-Copyright (c) 2007 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html
-
-</p>
-</BODY>
-</HTML>
diff --git a/doc/bundles/org.eclipse.ecf.doc/html/reference/extension-points/org_eclipse_ecf_presence_bot_chatRoomRobot.html b/doc/bundles/org.eclipse.ecf.doc/html/reference/extension-points/org_eclipse_ecf_presence_bot_chatRoomRobot.html
deleted file mode 100644
index 43b9331b8..000000000
--- a/doc/bundles/org.eclipse.ecf.doc/html/reference/extension-points/org_eclipse_ecf_presence_bot_chatRoomRobot.html
+++ /dev/null
@@ -1,95 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-<HEAD><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<title>Chat Room Robot</title>
-<style type="text/css">@import url("../../book.css");</style>
-<style type="text/css">@import url("../../schema.css");</style>
-</HEAD>
-<BODY>
-<H1 style="text-align:center">Chat Room Robot</H1>
-<p></p>
-<h6 class="CaptionFigColumn SchemaHeader">Identifier: </h6>org.eclipse.ecf.presence.bot.chatRoomRobot<p></p>
-<h6 class="CaptionFigColumn SchemaHeader">Since: </h6>1.0.0 milestone 6
-<p></p>
-
-<h6 class="CaptionFigColumn SchemaHeader">Description: </h6>This extension point allows implementers to define a chat room bot.<p></p>
-<h6 class="CaptionFigColumn SchemaHeader">Configuration Markup:</h6>
-<p></p>
-<p class="code SchemaDtd">&lt;!ELEMENT <a name="e.extension">extension</a> (<a href="#e.chatRoomRobot">chatRoomRobot</a>)+&gt;</p>
-<p class="code SchemaDtd">&lt;!ATTLIST extension</p>
-<p class="code SchemaDtdAttlist">point&nbsp;CDATA #REQUIRED</p><p class="code SchemaDtdAttlist">id&nbsp;&nbsp;&nbsp;&nbsp;CDATA #IMPLIED</p><p class="code SchemaDtdAttlist">name&nbsp;&nbsp;CDATA #IMPLIED</p>&gt;</p>
-<p></p>
-<ul class="ConfigMarkupAttlistDesc">
-</ul>
-<br><p class="code SchemaDtd">&lt;!ELEMENT <a name="e.chatRoomRobot">chatRoomRobot</a> (<a href="#e.chatRooms">chatRooms</a>+)&gt;</p>
-<p class="code SchemaDtd">&lt;!ATTLIST chatRoomRobot</p>
-<p class="code SchemaDtdAttlist">id&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED</p><p class="code SchemaDtdAttlist">containerFactoryName&nbsp;CDATA #REQUIRED</p><p class="code SchemaDtdAttlist">connectId&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED</p><p class="code SchemaDtdAttlist">connectPassword&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #IMPLIED</p><p class="code SchemaDtdAttlist">name&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #IMPLIED</p>&gt;</p>
-<p></p>
-<p class="ConfigMarkupElementDesc">
-The chatRoomRobot extension point.</p>
-<br>
-<ul class="ConfigMarkupAttlistDesc">
-<li><b>id</b> - The required id for the chat room robot. This must be a unique value relative to all other robots. For message handlers that are to use this robot, they must provide a chatrobotid that matches this value.</li>
-<li><b>containerFactoryName</b> - The required container factory name. This should be the container factory name for a given protocol. For example, for the built in ECF IRC provider the value is <b>ecf.irc.irclib</b>.</li>
-<li><b>connectId</b> - The connect ID for connecting to the given container. For example, for IRC the expected ID syntax of the connect ID is
-<pre class="Example"><span class="code SchemaTag">
-irc://username@host[:port]
-
-for example: irc://slewis2_@irc.freenode.net
-</span></pre></li>
-<li><b>connectPassword</b> - An optional connect password. If a password is required to connect to the given container then an appropriate value must be provided.</li>
-<li><b>name</b> - An optional name for the bot.</li>
-</ul>
-<br><p class="code SchemaDtd">&lt;!ELEMENT <a name="e.chatRooms">chatRooms</a> EMPTY&gt;</p>
-<p class="code SchemaDtd">&lt;!ATTLIST chatRooms</p>
-<p class="code SchemaDtdAttlist">name&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED</p><p class="code SchemaDtdAttlist">password&nbsp;CDATA #IMPLIED</p>&gt;</p>
-<p></p>
-<ul class="ConfigMarkupAttlistDesc">
-<li><b>name</b> - The name of the chat room that the robot should join.</li>
-<li><b>password</b> - The password required to join the chat room.</li>
-</ul>
-<br><h6 class="CaptionFigColumn SchemaHeader">Examples: </h6><pre class="Example"><span class="code SchemaTag">
- &lt;extension
- point=</span><span class="code SchemaCstring">&quot;org.eclipse.ecf.presence.bot.chatRoomRobot&quot;</span><span class="code SchemaTag">&gt;
- &lt;chatRoomRobot
- connectId=</span><span class="code SchemaCstring">&quot;irc://slewis2_@irc.freenode.net&quot;</span><span class="code SchemaTag">
- containerFactoryName=</span><span class="code SchemaCstring">&quot;ecf.irc.irclib&quot;</span><span class="code SchemaTag">
- id=</span><span class="code SchemaCstring">&quot;org.eclipse.ecf.presence.bot.defaultbot&quot;</span><span class="code SchemaTag">&gt;
- &lt;chatRooms
- name=</span><span class="code SchemaCstring">&quot;#eclipse-ecf&quot;</span><span class="code SchemaTag">&gt;
- &lt;/chatRooms&gt;
- &lt;chatRooms
- name=</span><span class="code SchemaCstring">&quot;#secret-channel&quot;</span><span class="code SchemaTag">
- password=</span><span class="code SchemaCstring">&quot;secret-password&quot;</span><span class="code SchemaTag">&gt;
- &lt;/chatRooms&gt;
- &lt;/chatRoomRobot&gt;
- &lt;/extension&gt;
-</span></pre>
-
-Note that to have the chatRoomRobot receive chat room messages and process them, that the chatRoomMessageHandler should also be defined
-using the id for the chatRoomRobot given above. For example:
-
-<pre class="Example"><span class="code SchemaTag">
- &lt;extension
- point=</span><span class="code SchemaCstring">&quot;org.eclipse.ecf.presence.bot.chatRoomMessageHandler&quot;</span><span class="code SchemaTag">&gt;
- &lt;handler
- chatRoomRobotId=</span><span class="code SchemaCstring">&quot;org.eclipse.ecf.presence.bot.defaultbot&quot;</span><span class="code SchemaTag">
- class=</span><span class="code SchemaCstring">&quot;org.eclipse.ecf.presence.bot.DefaultChatRoomMessageHandler&quot;</span><span class="code SchemaTag">&gt;
- &lt;/handler&gt;
- &lt;/extension&gt;
-</span></pre>
-<p></p>
-
-<h6 class="CaptionFigColumn SchemaHeader">API Information: </h6>See the API information for the chatRoomMessageHandler
-<p></p>
-
-<h6 class="CaptionFigColumn SchemaHeader">Supplied Implementation: </h6>No supplied implementation.
-<p></p>
-
-<br>
-<p class="note SchemaCopyright">
-Copyright (c) 2007 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html
-
-</p>
-</BODY>
-</HTML>
diff --git a/doc/bundles/org.eclipse.ecf.doc/html/reference/extension-points/org_eclipse_ecf_presence_bot_imMessageHandler.html b/doc/bundles/org.eclipse.ecf.doc/html/reference/extension-points/org_eclipse_ecf_presence_bot_imMessageHandler.html
deleted file mode 100644
index f9d361b1a..000000000
--- a/doc/bundles/org.eclipse.ecf.doc/html/reference/extension-points/org_eclipse_ecf_presence_bot_imMessageHandler.html
+++ /dev/null
@@ -1,90 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-<HEAD><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<title>IM Message Handler</title>
-<style type="text/css">@import url("../../book.css");</style>
-<style type="text/css">@import url("../../schema.css");</style>
-</HEAD>
-<BODY>
-<H1 style="text-align:center">IM Message Handler</H1>
-<p></p>
-<h6 class="CaptionFigColumn SchemaHeader">Identifier: </h6>org.eclipse.ecf.presence.bot.imMessageHandler<p></p>
-<h6 class="CaptionFigColumn SchemaHeader">Since: </h6>1.0.0 milestone 6
-<p></p>
-
-<h6 class="CaptionFigColumn SchemaHeader">Description: </h6>This extension point allows message handler objects to be associated
-with imrobot instances.<p></p>
-<h6 class="CaptionFigColumn SchemaHeader">Configuration Markup:</h6>
-<p></p>
-<p class="code SchemaDtd">&lt;!ELEMENT <a name="e.extension">extension</a> (<a href="#e.handler">handler</a>+)&gt;</p>
-<p class="code SchemaDtd">&lt;!ATTLIST extension</p>
-<p class="code SchemaDtdAttlist">point&nbsp;CDATA #REQUIRED</p><p class="code SchemaDtdAttlist">id&nbsp;&nbsp;&nbsp;&nbsp;CDATA #IMPLIED</p><p class="code SchemaDtdAttlist">name&nbsp;&nbsp;CDATA #IMPLIED</p>&gt;</p>
-<p></p>
-<ul class="ConfigMarkupAttlistDesc">
-</ul>
-<br><p class="code SchemaDtd">&lt;!ELEMENT <a name="e.handler">handler</a> EMPTY&gt;</p>
-<p class="code SchemaDtd">&lt;!ATTLIST handler</p>
-<p class="code SchemaDtdAttlist">imRobotId&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED</p><p class="code SchemaDtdAttlist">filterExpression&nbsp;CDATA #IMPLIED</p><p class="code SchemaDtdAttlist">class&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED</p>&gt;</p>
-<p></p>
-<p class="ConfigMarkupElementDesc">
-The im message handler</p>
-<br>
-<ul class="ConfigMarkupAttlistDesc">
-<li><b>imRobotId</b> - Required imRobotId. The value of this field must match a imrobot id</li>
-<li><b>filterExpression</b> - Optional filter expression. If filterExpression is provided, then chatroom messages will be filtered via given regular expression. If match, then the handleChatRoomMessage method will be called. If not matched, then the received message will be ignored.</li>
-<li><b>class</b> - The class of the message handler instance to create. Must implement <b>org.eclipse.ecf.presence.bot.IIMMessageHandler</b>.</li>
-</ul>
-<br><h6 class="CaptionFigColumn SchemaHeader">Examples: </h6><pre class="Example"><span class="code SchemaTag">
- &lt;extension
- point=</span><span class="code SchemaCstring">&quot;org.eclipse.ecf.presence.bot.imMessageHandler&quot;</span><span class="code SchemaTag">&gt;
- &lt;handler
- imrobotid=</span><span class="code SchemaCstring">&quot;org.eclipse.ecf.presence.imbot.defaultbot&quot;</span><span class="code SchemaTag">
- class=</span><span class="code SchemaCstring">&quot;org.eclipse.ecf.presence.imbot.DefaultIMMessageHandler&quot;</span><span class="code SchemaTag">&gt;
- &lt;/handler&gt;
- &lt;/extension&gt;
-</span></pre>
-
-Note that the given imrobotid=<b>org.eclipse.ecf.presence.imbot.defaultbot</b> must be previously defined via the imrobot extension point. Here is an example:
-
-<pre class="Example"><span class="code SchemaTag">
- &lt;extension
- point=</span><span class="code SchemaCstring">&quot;org.eclipse.ecf.presence.bot.imRobot&quot;</span><span class="code SchemaTag">&gt;
- &lt;imRobot
- connectID=</span><span class="code SchemaCstring">&quot;slewis@ecf.eclipse.org&quot;</span><span class="code SchemaTag">
- containerFactoryName=</span><span class="code SchemaCstring">&quot;ecf.xmpp.smack&quot;</span><span class="code SchemaTag">
- id=</span><span class="code SchemaCstring">&quot;org.eclipse.ecf.presence.imbot.defaultbot&quot;</span><span class="code SchemaTag">/&gt;
- &lt;/imRobot&gt;
- &lt;/extension&gt;
-</span></pre>
-<p></p>
-
-<h6 class="CaptionFigColumn SchemaHeader">API Information: </h6>The class implementation provided in extension point must implement the following interface:
-
-<pre class="Example"><span class="code SchemaTag">
-public interface IIMMessageHandler extends IContainerAdvisor {
-
- /**
- * This method is called when a {@link IChatMessage} is received.
- *
- * @param message
- * the {@link IChatMessage} received. Will not be
- * &lt;code&gt;null&lt;/code&gt;. Implementers should not block the
- * calling thread. Any methods on the given &lt;code&gt;message&lt;/code&gt;
- * parameter may be called.
- */
- public void handleIMMessage(IChatMessage message);
-
-}
-</span></pre>
-<p></p>
-
-<h6 class="CaptionFigColumn SchemaHeader">Supplied Implementation: </h6>No supplied implementation.
-<p></p>
-
-<br>
-<p class="note SchemaCopyright">
-Copyright (c) 2007 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html
-
-</p>
-</BODY>
-</HTML>
diff --git a/doc/bundles/org.eclipse.ecf.doc/html/reference/extension-points/org_eclipse_ecf_presence_bot_imRobot.html b/doc/bundles/org.eclipse.ecf.doc/html/reference/extension-points/org_eclipse_ecf_presence_bot_imRobot.html
deleted file mode 100644
index 2e818e22f..000000000
--- a/doc/bundles/org.eclipse.ecf.doc/html/reference/extension-points/org_eclipse_ecf_presence_bot_imRobot.html
+++ /dev/null
@@ -1,80 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-<HEAD><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<title>IM Robot</title>
-<style type="text/css">@import url("../../book.css");</style>
-<style type="text/css">@import url("../../schema.css");</style>
-</HEAD>
-<BODY>
-<H1 style="text-align:center">IM Robot</H1>
-<p></p>
-<h6 class="CaptionFigColumn SchemaHeader">Identifier: </h6>org.eclipse.ecf.presence.bot.imRobot<p></p>
-<h6 class="CaptionFigColumn SchemaHeader">Since: </h6>1.0.0 milestone 6
-<p></p>
-
-<h6 class="CaptionFigColumn SchemaHeader">Description: </h6>This extension point allows implementers to define a im bot.<p></p>
-<h6 class="CaptionFigColumn SchemaHeader">Configuration Markup:</h6>
-<p></p>
-<p class="code SchemaDtd">&lt;!ELEMENT <a name="e.extension">extension</a> (<a href="#e.imRobot">imRobot</a>)+&gt;</p>
-<p class="code SchemaDtd">&lt;!ATTLIST extension</p>
-<p class="code SchemaDtdAttlist">point&nbsp;CDATA #REQUIRED</p><p class="code SchemaDtdAttlist">id&nbsp;&nbsp;&nbsp;&nbsp;CDATA #IMPLIED</p><p class="code SchemaDtdAttlist">name&nbsp;&nbsp;CDATA #IMPLIED</p>&gt;</p>
-<p></p>
-<ul class="ConfigMarkupAttlistDesc">
-</ul>
-<br><p class="code SchemaDtd">&lt;!ELEMENT <a name="e.imRobot">imRobot</a> EMPTY&gt;</p>
-<p class="code SchemaDtd">&lt;!ATTLIST imRobot</p>
-<p class="code SchemaDtdAttlist">id&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED</p><p class="code SchemaDtdAttlist">containerFactoryName&nbsp;CDATA #REQUIRED</p><p class="code SchemaDtdAttlist">connectId&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED</p><p class="code SchemaDtdAttlist">name&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #IMPLIED</p><p class="code SchemaDtdAttlist">connectPassword&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #IMPLIED</p>&gt;</p>
-<p></p>
-<p class="ConfigMarkupElementDesc">
-The imrobot extension point.</p>
-<br>
-<ul class="ConfigMarkupAttlistDesc">
-<li><b>id</b> - The required id for the im robot. This must be a unique value relative to all other im robots. For message handlers that are to use this robot, they must provide a imrobotid that matches this value.</li>
-<li><b>containerFactoryName</b> - The required container factory name. This should be the container factory name for a given protocol. For example, for the built in ECF IRC provider the value is <b>ecf.xmpp.smack</b>.</li>
-<li><b>connectId</b> - The connect ID for connecting to the given container. For example, for XMPP the expected ID syntax of the connect ID is
-<pre class="Example"><span class="code SchemaTag">
-username@host[:port]
-
-for example: slewis@ecf.eclipse.org
-</span></pre></li>
-<li><b>name</b> - An optional name for the bot.</li>
-<li><b>connectPassword</b> - An optional connect password. If a password is required to connect to the given container then an appropriate value must be provided.</li>
-</ul>
-<br><h6 class="CaptionFigColumn SchemaHeader">Examples: </h6><pre class="Example"><span class="code SchemaTag">
- &lt;extension
- point=</span><span class="code SchemaCstring">&quot;org.eclipse.ecf.presence.bot.imRobot&quot;</span><span class="code SchemaTag">&gt;
- &lt;imRobot
- connectID=</span><span class="code SchemaCstring">&quot;slewis@ecf.eclipse.org&quot;</span><span class="code SchemaTag">
- containerFactoryName=</span><span class="code SchemaCstring">&quot;ecf.xmpp.smack&quot;</span><span class="code SchemaTag">
- id=</span><span class="code SchemaCstring">&quot;org.eclipse.ecf.presence.imbot.defaultbot&quot;</span><span class="code SchemaTag">/&gt;
- &lt;/imRobot&gt;
- &lt;/extension&gt;
-</span></pre>
-
-Note that to have the imrobot receive im messages and process them, that the immessagehandler should also be defined
-using the id for the imrobot given above. For example:
-
-<pre class="Example"><span class="code SchemaTag">
- &lt;extension
- point=</span><span class="code SchemaCstring">&quot;org.eclipse.ecf.presence.bot.immessagehandler&quot;</span><span class="code SchemaTag">&gt;
- &lt;handler
- imrobotid=</span><span class="code SchemaCstring">&quot;org.eclipse.ecf.presence.imbot.defaultbot&quot;</span><span class="code SchemaTag">
- class=</span><span class="code SchemaCstring">&quot;org.eclipse.ecf.presence.imbot.DefaultIMMessageHandler&quot;</span><span class="code SchemaTag">&gt;
- &lt;/handler&gt;
- &lt;/extension&gt;
-</span></pre>
-<p></p>
-
-<h6 class="CaptionFigColumn SchemaHeader">API Information: </h6>See the API information for the immessagehandler.
-<p></p>
-
-<h6 class="CaptionFigColumn SchemaHeader">Supplied Implementation: </h6>No supplied implementation.
-<p></p>
-
-<br>
-<p class="note SchemaCopyright">
-Copyright (c) 2007 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html
-
-</p>
-</BODY>
-</HTML>
diff --git a/doc/bundles/org.eclipse.ecf.doc/html/reference/extension-points/org_eclipse_ecf_presence_ui_rosterViewerDropTarget.html b/doc/bundles/org.eclipse.ecf.doc/html/reference/extension-points/org_eclipse_ecf_presence_ui_rosterViewerDropTarget.html
deleted file mode 100644
index 1addf3e60..000000000
--- a/doc/bundles/org.eclipse.ecf.doc/html/reference/extension-points/org_eclipse_ecf_presence_ui_rosterViewerDropTarget.html
+++ /dev/null
@@ -1,91 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-<HEAD><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<title>Roster Viewer Drop Target</title>
-<style type="text/css">@import url("../../book.css");</style>
-<style type="text/css">@import url("../../schema.css");</style>
-</HEAD>
-<BODY>
-<H1 style="text-align:center">Roster Viewer Drop Target</H1>
-<p></p>
-<h6 class="CaptionFigColumn SchemaHeader">Identifier: </h6>org.eclipse.ecf.presence.ui.rosterViewerDropTarget<p></p>
-<h6 class="CaptionFigColumn SchemaHeader">Since: </h6>1.0.0
-<p></p>
-
-<h6 class="CaptionFigColumn SchemaHeader">Description: </h6>This extension point allows drop targets to be specified for the MultiRosterView.<p></p>
-<h6 class="CaptionFigColumn SchemaHeader">Configuration Markup:</h6>
-<p></p>
-<p class="code SchemaDtd">&lt;!ELEMENT <a name="e.extension">extension</a> (<a href="#e.dropTarget">dropTarget</a>+)&gt;</p>
-<p class="code SchemaDtd">&lt;!ATTLIST extension</p>
-<p class="code SchemaDtdAttlist">point&nbsp;CDATA #REQUIRED</p><p class="code SchemaDtdAttlist">id&nbsp;&nbsp;&nbsp;&nbsp;CDATA #IMPLIED</p><p class="code SchemaDtdAttlist">name&nbsp;&nbsp;CDATA #IMPLIED</p>&gt;</p>
-<p></p>
-<ul class="ConfigMarkupAttlistDesc">
-</ul>
-<br><p class="code SchemaDtd">&lt;!ELEMENT <a name="e.dropTarget">dropTarget</a> EMPTY&gt;</p>
-<p class="code SchemaDtd">&lt;!ATTLIST dropTarget</p>
-<p class="code SchemaDtdAttlist">class&nbsp;CDATA #REQUIRED</p>&gt;</p>
-<p></p>
-<p class="ConfigMarkupElementDesc">
-Drop target element.</p>
-<br>
-<ul class="ConfigMarkupAttlistDesc">
-<li><b>class</b> - Class for roster viewer drop target. Must implement <b>org.eclipse.ecf.presence.ui.dnd.IRosterViewerDropTarget</b>. Required.</li>
-</ul>
-<br><h6 class="CaptionFigColumn SchemaHeader">Examples: </h6><pre class="Example"><span class="code SchemaTag">
- &lt;extension
- point=</span><span class="code SchemaCstring">&quot;org.eclipse.ecf.presence.ui.rosterViewerDropTarget&quot;</span><span class="code SchemaTag">&gt;
- &lt;dropTarget
- class=</span><span class="code SchemaCstring">&quot;org.eclipse.ecf.presence.collab.ui.TextRosterViewerDropTarget&quot;</span><span class="code SchemaTag">&gt;
- &lt;/dropTarget&gt;
- &lt;/extension&gt;
-
-</span></pre>
-<p></p>
-
-<h6 class="CaptionFigColumn SchemaHeader">API Information: </h6><pre class="Example"><span class="code SchemaTag">
-/**
- * Roster viewer drop target. This interface defines the
- * required methods for implementers of the rosterViewerDropTarget
- * extension point.
- */
-public interface IRosterViewerDropTarget {
-
- /**
- * Validates dropping on the given roster item. This method is called whenever some
- * aspect of the drop operation changes.
- *
- * @param target the object that the mouse is currently hovering over, or
- * &lt;code&gt;null&lt;/code&gt; if the mouse is hovering over empty space
- * @param operation the current drag operation (copy, move, etc.)
- * @param transferType the current transfer type
- * @return &lt;code&gt;true&lt;/code&gt; if the drop is valid, and &lt;code&gt;false&lt;/code&gt;
- * otherwise
- */
- public boolean validateDrop(IRosterItem rosterItem, int operation,
- TransferData transferType);
-
- /**
- * Performs any work associated with the drop.
- *
- * @param data the drop data
- * @return &lt;code&gt;true&lt;/code&gt; if the drop was successful, and
- * &lt;code&gt;false&lt;/code&gt; otherwise
- */
-
- public boolean performDrop(Object data);
-}
-
-</span></pre>
-<p></p>
-
-<h6 class="CaptionFigColumn SchemaHeader">Supplied Implementation: </h6>No supplied implementation.
-<p></p>
-
-<br>
-<p class="note SchemaCopyright">
-Copyright (c) 2004 Composent, Inc. and others.
-All rights reserved. This program and the accompanying materials are made available under the 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
-
-</p>
-</BODY>
-</HTML>
diff --git a/doc/bundles/org.eclipse.ecf.doc/html/reference/extension-points/org_eclipse_ecf_provider_filetransfer_browseFileTransferProtocolFactory.html b/doc/bundles/org.eclipse.ecf.doc/html/reference/extension-points/org_eclipse_ecf_provider_filetransfer_browseFileTransferProtocolFactory.html
deleted file mode 100644
index fd8164b32..000000000
--- a/doc/bundles/org.eclipse.ecf.doc/html/reference/extension-points/org_eclipse_ecf_provider_filetransfer_browseFileTransferProtocolFactory.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-<HEAD><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<title>browseFileTransferProtocolFactory</title>
-<style type="text/css">@import url("../../book.css");</style>
-<style type="text/css">@import url("../../schema.css");</style>
-</HEAD>
-<BODY>
-<H1 style="text-align:center">browseFileTransferProtocolFactory</H1>
-<p></p>
-<h6 class="CaptionFigColumn SchemaHeader">Identifier: </h6>org.eclipse.ecf.provider.filetransfer.browseFileTransferProtocolFactory<p></p>
-<h6 class="CaptionFigColumn SchemaHeader">Since: </h6>1.0.0
-<p></p>
-
-<h6 class="CaptionFigColumn SchemaHeader">Description: </h6>This extension point allows IRemoteFileSystemBrowserFactorys to be defined for given file transfer protocols.<p></p>
-<h6 class="CaptionFigColumn SchemaHeader">Configuration Markup:</h6>
-<p></p>
-<p class="code SchemaDtd">&lt;!ELEMENT <a name="e.extension">extension</a> (<a href="#e.browseFileTransferProtocolFactory">browseFileTransferProtocolFactory</a>*)&gt;</p>
-<p class="code SchemaDtd">&lt;!ATTLIST extension</p>
-<p class="code SchemaDtdAttlist">point&nbsp;CDATA #REQUIRED</p><p class="code SchemaDtdAttlist">id&nbsp;&nbsp;&nbsp;&nbsp;CDATA #IMPLIED</p><p class="code SchemaDtdAttlist">name&nbsp;&nbsp;CDATA #IMPLIED</p>&gt;</p>
-<p></p>
-<ul class="ConfigMarkupAttlistDesc">
-</ul>
-<br><p class="code SchemaDtd">&lt;!ELEMENT <a name="e.browseFileTransferProtocolFactory">browseFileTransferProtocolFactory</a> EMPTY&gt;</p>
-<p class="code SchemaDtd">&lt;!ATTLIST browseFileTransferProtocolFactory</p>
-<p class="code SchemaDtdAttlist">protocol&nbsp;CDATA #REQUIRED</p><p class="code SchemaDtdAttlist">class&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED</p><p class="code SchemaDtdAttlist">priority&nbsp;CDATA #IMPLIED</p>&gt;</p>
-<p></p>
-<p class="ConfigMarkupElementDesc">
-Browse remote file system protocol factory extention point</p>
-<br>
-<ul class="ConfigMarkupAttlistDesc">
-<li><b>protocol</b> - Protocol to define factory for. For example, http, https, ftp, bittorrent, my.favorite.protocol.</li>
-<li><b>class</b> - The factory class to use for given protocol. Must implement <b>org.eclipse.ecf.filetransfer.service.IRemoteFileSystemBrowserFactory</b></li>
-<li><b>priority</b> - Priority relative to other browseFileTransferProtocolFactory extensions. Valid priorities are 0 (highest priority) to 100 (lowest priority). If this optional attribute is not specified, it will automatically be assigned a default priority of 100.</li>
-</ul>
-<br><h6 class="CaptionFigColumn SchemaHeader">Examples: </h6><pre class="Example"><span class="code SchemaTag">
- &lt;extension
- point=</span><span class="code SchemaCstring">&quot;org.eclipse.ecf.provider.filetransfer.browseFileTransferProtocolFactory&quot;</span><span class="code SchemaTag">&gt;
- &lt;browseFileTransferProtocolFactory
- class=</span><span class="code SchemaCstring">&quot;org.eclipse.ecf.provider.filetransfer.ssh.ScpBrowseFileTransferFactory&quot;</span><span class="code SchemaTag">
- protocol=</span><span class="code SchemaCstring">&quot;scp&quot;</span><span class="code SchemaTag">
- priority=</span><span class="code SchemaCstring">&quot;90&quot;</span><span class="code SchemaTag">&gt;
- &lt;/browseFileTransferProtocolFactory&gt;
- &lt;/extension&gt;
-
-</span></pre>
-<p></p>
-
-<h6 class="CaptionFigColumn SchemaHeader">API Information: </h6>Here is the <b>org.eclipse.ecf.filetransfer.service.IRemoteFileSystemBrowserFactory</b>
-
-<pre class="Example"><span class="code SchemaTag">
-/**
- * Remote file browser factory. This service interface is used by clients to
- * create a new IRemoteFileSystemBrowser instance.
- */
-public interface IRemoteFileSystemBrowserFactory {
-
- /**
- * Get new instance of IRemoteFileSystemBrowser.
- *
- * @return IRemoteFileSystemBrowser for initiating a retrieval of a remote file.
- */
- public IRemoteFileSystemBrowser newInstance();
-
-}
-</span></pre>
-<p></p>
-
-<h6 class="CaptionFigColumn SchemaHeader">Supplied Implementation: </h6>None
-<p></p>
-
-<br>
-<p class="note SchemaCopyright">
-Copyright (c) 2004 Composent, Inc., IBM and others.
-All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Composent, Inc. - initial API and implementation, IBM, Inc. - Initial API and implementation
-
-</p>
-</BODY>
-</HTML>
diff --git a/doc/bundles/org.eclipse.ecf.doc/html/reference/extension-points/org_eclipse_ecf_provider_filetransfer_retrieveFileTransferProtocolFactory.html b/doc/bundles/org.eclipse.ecf.doc/html/reference/extension-points/org_eclipse_ecf_provider_filetransfer_retrieveFileTransferProtocolFactory.html
deleted file mode 100644
index 1896ee9a4..000000000
--- a/doc/bundles/org.eclipse.ecf.doc/html/reference/extension-points/org_eclipse_ecf_provider_filetransfer_retrieveFileTransferProtocolFactory.html
+++ /dev/null
@@ -1,83 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-<HEAD><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<title>retrieveFileTransferProtocolFactory</title>
-<style type="text/css">@import url("../../book.css");</style>
-<style type="text/css">@import url("../../schema.css");</style>
-</HEAD>
-<BODY>
-<H1 style="text-align:center">retrieveFileTransferProtocolFactory</H1>
-<p></p>
-<h6 class="CaptionFigColumn SchemaHeader">Identifier: </h6>org.eclipse.ecf.provider.filetransfer.retrieveFileTransferProtocolFactory<p></p>
-<h6 class="CaptionFigColumn SchemaHeader">Since: </h6>1.0.0
-<p></p>
-
-<h6 class="CaptionFigColumn SchemaHeader">Description: </h6>This extension point allows IRetrieveFileTransferFactorys to be defined for given file transfer protocols.<p></p>
-<h6 class="CaptionFigColumn SchemaHeader">Configuration Markup:</h6>
-<p></p>
-<p class="code SchemaDtd">&lt;!ELEMENT <a name="e.extension">extension</a> (<a href="#e.retrieveFileTransferProtocolFactory">retrieveFileTransferProtocolFactory</a>*)&gt;</p>
-<p class="code SchemaDtd">&lt;!ATTLIST extension</p>
-<p class="code SchemaDtdAttlist">point&nbsp;CDATA #REQUIRED</p><p class="code SchemaDtdAttlist">id&nbsp;&nbsp;&nbsp;&nbsp;CDATA #IMPLIED</p><p class="code SchemaDtdAttlist">name&nbsp;&nbsp;CDATA #IMPLIED</p>&gt;</p>
-<p></p>
-<ul class="ConfigMarkupAttlistDesc">
-</ul>
-<br><p class="code SchemaDtd">&lt;!ELEMENT <a name="e.retrieveFileTransferProtocolFactory">retrieveFileTransferProtocolFactory</a> EMPTY&gt;</p>
-<p class="code SchemaDtd">&lt;!ATTLIST retrieveFileTransferProtocolFactory</p>
-<p class="code SchemaDtdAttlist">protocol&nbsp;CDATA #REQUIRED</p><p class="code SchemaDtdAttlist">class&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED</p><p class="code SchemaDtdAttlist">priority&nbsp;CDATA #IMPLIED</p>&gt;</p>
-<p></p>
-<p class="ConfigMarkupElementDesc">
-Retrieve file transfer protocol factory extention point</p>
-<br>
-<ul class="ConfigMarkupAttlistDesc">
-<li><b>protocol</b> - Protocol to define factory for. For example, http, https, ftp, bittorrent, my.favorite.protocol.</li>
-<li><b>class</b> - The factory class to use for given protocol. Must implement <b>org.eclipse.ecf.filetransfer.service.IRetrieveFileTransferFactory</b></li>
-<li><b>priority</b> - Priority relative to other retrieveFileTransferProtocolFactory extensions. Valid priorities are 0 (highest priority) to 100 (lowest priority). If this optional attribute is not specified, it will automatically be assigned a default priority of 100.</li>
-</ul>
-<br><h6 class="CaptionFigColumn SchemaHeader">Examples: </h6><pre class="Example"><span class="code SchemaTag">
- &lt;extension
- point=</span><span class="code SchemaCstring">&quot;org.eclipse.ecf.provider.filetransfer.retrieveFileTransferProtocolFactory&quot;</span><span class="code SchemaTag">&gt;
- &lt;retrieveFileTransferProtocolFactory
- class=</span><span class="code SchemaCstring">&quot;org.eclipse.ecf.provider.filetransfer.httpclient.HttpClientRetrieveFileTransferFactory&quot;</span><span class="code SchemaTag">
- protocol=</span><span class="code SchemaCstring">&quot;http&quot;</span><span class="code SchemaTag">
- priority=</span><span class="code SchemaCstring">&quot;10&quot;</span><span class="code SchemaTag">&gt;
- &lt;/retrieveFileTransferProtocolFactory&gt;
- &lt;retrieveFileTransferProtocolFactory
- class=</span><span class="code SchemaCstring">&quot;org.eclipse.ecf.provider.filetransfer.httpclient.HttpClientRetrieveFileTransferFactory&quot;</span><span class="code SchemaTag">
- protocol=</span><span class="code SchemaCstring">&quot;https&quot;</span><span class="code SchemaTag">&gt;
- &lt;/retrieveFileTransferProtocolFactory&gt;
- &lt;/extension&gt;
-
-</span></pre>
-<p></p>
-
-<h6 class="CaptionFigColumn SchemaHeader">API Information: </h6>Here is the <b>org.eclipse.ecf.filetransfer.service.IRetrieveFileTransferFactory</b>
-
-<pre class="Example"><span class="code SchemaTag">
-/**
- * Retrieve file transfer factory. This service interface is used by clients to
- * create a new IRetrieveFileTransfer instance.
- */
-public interface IRetrieveFileTransferFactory {
-
- /**
- * Get new instance of IRetrieveFileTransfer.
- *
- * @return IRetrieveFileTransfer for a given file transfer
- */
- public IRetrieveFileTransfer newInstance();
-
-}
-</span></pre>
-<p></p>
-
-<h6 class="CaptionFigColumn SchemaHeader">Supplied Implementation: </h6>None
-<p></p>
-
-<br>
-<p class="note SchemaCopyright">
-Copyright (c) 2004 Composent, Inc., IBM and others.
-All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Composent, Inc. - initial API and implementation, IBM, Inc. - Initial API and implementation
-
-</p>
-</BODY>
-</HTML>
diff --git a/doc/bundles/org.eclipse.ecf.doc/html/reference/extension-points/org_eclipse_ecf_provider_filetransfer_sendFileTransferProtocolFactory.html b/doc/bundles/org.eclipse.ecf.doc/html/reference/extension-points/org_eclipse_ecf_provider_filetransfer_sendFileTransferProtocolFactory.html
deleted file mode 100644
index 6f0f61b74..000000000
--- a/doc/bundles/org.eclipse.ecf.doc/html/reference/extension-points/org_eclipse_ecf_provider_filetransfer_sendFileTransferProtocolFactory.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-<HEAD><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<title>sendFileTransferProtocolFactory</title>
-<style type="text/css">@import url("../../book.css");</style>
-<style type="text/css">@import url("../../schema.css");</style>
-</HEAD>
-<BODY>
-<H1 style="text-align:center">sendFileTransferProtocolFactory</H1>
-<p></p>
-<h6 class="CaptionFigColumn SchemaHeader">Identifier: </h6>org.eclipse.ecf.provider.filetransfer.sendFileTransferProtocolFactory<p></p>
-<h6 class="CaptionFigColumn SchemaHeader">Since: </h6>1.0.0
-<p></p>
-
-<h6 class="CaptionFigColumn SchemaHeader">Description: </h6>This extension point allows IRetrieveFileTransferFactorys to be defined for given file transfer protocols.<p></p>
-<h6 class="CaptionFigColumn SchemaHeader">Configuration Markup:</h6>
-<p></p>
-<p class="code SchemaDtd">&lt;!ELEMENT <a name="e.extension">extension</a> (<a href="#e.sendFileTransferProtocolFactory">sendFileTransferProtocolFactory</a>*)&gt;</p>
-<p class="code SchemaDtd">&lt;!ATTLIST extension</p>
-<p class="code SchemaDtdAttlist">point&nbsp;CDATA #REQUIRED</p><p class="code SchemaDtdAttlist">id&nbsp;&nbsp;&nbsp;&nbsp;CDATA #IMPLIED</p><p class="code SchemaDtdAttlist">name&nbsp;&nbsp;CDATA #IMPLIED</p>&gt;</p>
-<p></p>
-<ul class="ConfigMarkupAttlistDesc">
-</ul>
-<br><p class="code SchemaDtd">&lt;!ELEMENT <a name="e.sendFileTransferProtocolFactory">sendFileTransferProtocolFactory</a> EMPTY&gt;</p>
-<p class="code SchemaDtd">&lt;!ATTLIST sendFileTransferProtocolFactory</p>
-<p class="code SchemaDtdAttlist">protocol&nbsp;CDATA #REQUIRED</p><p class="code SchemaDtdAttlist">class&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED</p><p class="code SchemaDtdAttlist">priority&nbsp;CDATA #IMPLIED</p>&gt;</p>
-<p></p>
-<p class="ConfigMarkupElementDesc">
-Send file transfer protocol factory extention point</p>
-<br>
-<ul class="ConfigMarkupAttlistDesc">
-<li><b>protocol</b> - Protocol to define factory for. For example, http, https, ftp, bittorrent, my.favorite.protocol.</li>
-<li><b>class</b> - The factory class to use for given protocol. Must implement <b>org.eclipse.ecf.filetransfer.service.ISendFileTransferFactory</b></li>
-<li><b>priority</b> - Priority relative to other sendFileTransferProtocolFactory extensions. Valid priorities are 0 (highest priority) to 100 (lowest priority). If this optional attribute is not specified, it will automatically be assigned a default priority of 100.</li>
-</ul>
-<br><h6 class="CaptionFigColumn SchemaHeader">Examples: </h6><pre class="Example"><span class="code SchemaTag">
- &lt;extension
- point=</span><span class="code SchemaCstring">&quot;org.eclipse.ecf.provider.filetransfer.sendFileTransferProtocolFactory&quot;</span><span class="code SchemaTag">&gt;
- &lt;sendFileTransferProtocolFactory
- class=</span><span class="code SchemaCstring">&quot;org.eclipse.ecf.provider.filetransfer.ssh.ScpOutgoingFileTransferFactory&quot;</span><span class="code SchemaTag">
- protocol=</span><span class="code SchemaCstring">&quot;scp&quot;</span><span class="code SchemaTag">
- priority=</span><span class="code SchemaCstring">&quot;50&quot;</span><span class="code SchemaTag">&gt;
- &lt;/sendFileTransferProtocolFactory&gt;
- &lt;/extension&gt;
-
-</span></pre>
-<p></p>
-
-<h6 class="CaptionFigColumn SchemaHeader">API Information: </h6>Here is the <b>org.eclipse.ecf.filetransfer.service.IRetrieveFileTransferFactory</b>
-
-<pre class="Example"><span class="code SchemaTag">
-/**
- * Retrieve file transfer factory. This service interface is used by clients to
- * create a new IRetrieveFileTransfer instance.
- */
-public interface IRetrieveFileTransferFactory {
-
- /**
- * Get new instance of IRetrieveFileTransfer.
- *
- * @return IRetrieveFileTransfer for a given file transfer
- */
- public IRetrieveFileTransfer newInstance();
-
-}
-</span></pre>
-<p></p>
-
-<h6 class="CaptionFigColumn SchemaHeader">Supplied Implementation: </h6>None
-<p></p>
-
-<br>
-<p class="note SchemaCopyright">
-Copyright (c) 2004 Composent, Inc., IBM and others.
-All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Composent, Inc. - initial API and implementation, IBM, Inc. - Initial API and implementation
-
-</p>
-</BODY>
-</HTML>
diff --git a/doc/bundles/org.eclipse.ecf.doc/html/reference/extension-points/org_eclipse_ecf_server_generic_configuration.html b/doc/bundles/org.eclipse.ecf.doc/html/reference/extension-points/org_eclipse_ecf_server_generic_configuration.html
deleted file mode 100644
index 656b44f85..000000000
--- a/doc/bundles/org.eclipse.ecf.doc/html/reference/extension-points/org_eclipse_ecf_server_generic_configuration.html
+++ /dev/null
@@ -1,76 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-<HEAD><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<title>ECF Generic Server Configuration</title>
-<style type="text/css">@import url("../../book.css");</style>
-<style type="text/css">@import url("../../schema.css");</style>
-</HEAD>
-<BODY>
-<H1 style="text-align:center">ECF Generic Server Configuration</H1>
-<p></p>
-<h6 class="CaptionFigColumn SchemaHeader">Identifier: </h6>org.eclipse.ecf.server.generic.configuration<p></p>
-<h6 class="CaptionFigColumn SchemaHeader">Since: </h6>1.0.0
-<p></p>
-
-<h6 class="CaptionFigColumn SchemaHeader">Description: </h6>This extension point allows ECF generic server instances to be configured via extension point definition.<p></p>
-<h6 class="CaptionFigColumn SchemaHeader">Configuration Markup:</h6>
-<p></p>
-<p class="code SchemaDtd">&lt;!ELEMENT <a name="e.extension">extension</a> (<a href="#e.connector">connector</a>+)&gt;</p>
-<p class="code SchemaDtd">&lt;!ATTLIST extension</p>
-<p class="code SchemaDtdAttlist">point&nbsp;CDATA #REQUIRED</p><p class="code SchemaDtdAttlist">id&nbsp;&nbsp;&nbsp;&nbsp;CDATA #IMPLIED</p><p class="code SchemaDtdAttlist">name&nbsp;&nbsp;CDATA #IMPLIED</p>&gt;</p>
-<p></p>
-<ul class="ConfigMarkupAttlistDesc">
-</ul>
-<br><p class="code SchemaDtd">&lt;!ELEMENT <a name="e.connector">connector</a> (<a href="#e.group">group</a>+)&gt;</p>
-<p class="code SchemaDtd">&lt;!ATTLIST connector</p>
-<p class="code SchemaDtdAttlist">hostname&nbsp;&nbsp;CDATA #IMPLIED</p><p class="code SchemaDtdAttlist">port&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #IMPLIED</p><p class="code SchemaDtdAttlist">keepAlive&nbsp;CDATA #IMPLIED</p><p class="code SchemaDtdAttlist">discovery&nbsp;(true | false) </p>&gt;</p>
-<p></p>
-<p class="ConfigMarkupElementDesc">
-A connector defines the port and other information for an ECF generic server to receive connection requests from clients.</p>
-<br>
-<ul class="ConfigMarkupAttlistDesc">
-<li><b>hostname</b> - Defines the hostname expected in the server ID...e.g. "localhost". If not specified, default is "localhost".</li>
-<li><b>port</b> - The port (e.g. 3282) for the connector to listen on. If not specified, is set to 3282.</li>
-<li><b>keepAlive</b> - The timeout associated with the ECF generic server failure detector (in ms). If not specified, defaults to 30000 (30 seconds).</li>
-<li><b>discovery</b> - The discovery flag determines if the given service is published for discovery via the IDiscoveryService</li>
-</ul>
-<br><p class="code SchemaDtd">&lt;!ELEMENT <a name="e.group">group</a> EMPTY&gt;</p>
-<p class="code SchemaDtd">&lt;!ATTLIST group</p>
-<p class="code SchemaDtdAttlist">name&nbsp;CDATA #REQUIRED</p>&gt;</p>
-<p></p>
-<p class="ConfigMarkupElementDesc">
-A specific named group for the parent connector. e.g. 'server' in ecftcp://localhost:3282/server</p>
-<br>
-<ul class="ConfigMarkupAttlistDesc">
-<li><b>name</b> - The name for the group in the ID: e.g. 'server' in ecftcp://localhost:3282/server</li>
-</ul>
-<br><h6 class="CaptionFigColumn SchemaHeader">Examples: </h6>The following is an example use of the org.eclipse.ecf.server.generic.configration extension point:
-
-<pre class="Example"><span class="code SchemaTag">
- &lt;extension
- point=</span><span class="code SchemaCstring">&quot;org.eclipse.ecf.server.generic.configuration&quot;</span><span class="code SchemaTag">&gt;
- &lt;connector
- hostname=</span><span class="code SchemaCstring">&quot;localhost&quot;</span><span class="code SchemaTag">
- keepAlive=</span><span class="code SchemaCstring">&quot;30000&quot;</span><span class="code SchemaTag">
- port=</span><span class="code SchemaCstring">&quot;3282&quot;</span><span class="code SchemaTag">&gt;
- &lt;group
- name=</span><span class="code SchemaCstring">&quot;server&quot;</span><span class="code SchemaTag">&gt;
- &lt;/group&gt;
- &lt;/connector&gt;
- &lt;/extension&gt;
-</span></pre>
-
-Produces a server with groupID: ecftcp://localhost:3333/groupName
-<p></p>
-
-<h6 class="CaptionFigColumn SchemaHeader">API Information: </h6>No public programmatic API
-<p></p>
-
-<br>
-<p class="note SchemaCopyright">
-Copyright (c) 2004 Composent, Inc. and others.
-All rights reserved. This program and the accompanying materials are made available under the 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
-
-</p>
-</BODY>
-</HTML>
diff --git a/doc/bundles/org.eclipse.ecf.doc/html/reference/extension-points/org_eclipse_ecf_sharedobject_sharedObjectFactory.html b/doc/bundles/org.eclipse.ecf.doc/html/reference/extension-points/org_eclipse_ecf_sharedobject_sharedObjectFactory.html
deleted file mode 100644
index f041b40c6..000000000
--- a/doc/bundles/org.eclipse.ecf.doc/html/reference/extension-points/org_eclipse_ecf_sharedobject_sharedObjectFactory.html
+++ /dev/null
@@ -1,257 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-<HEAD><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<title>ECF Shared Object Factory</title>
-<style type="text/css">@import url("../../book.css");</style>
-<style type="text/css">@import url("../../schema.css");</style>
-</HEAD>
-<BODY>
-<H1 style="text-align:center">ECF Shared Object Factory</H1>
-<p></p>
-<h6 class="CaptionFigColumn SchemaHeader">Identifier: </h6>org.eclipse.ecf.sharedObjectFactory<p></p>
-<h6 class="CaptionFigColumn SchemaHeader">Since: </h6>0.6.0
-<p></p>
-
-<h6 class="CaptionFigColumn SchemaHeader">Description: </h6>ECF Shared Object Factory extension point (<b>org.eclipse.ecf.sharedObjectFactory</b>. This extension point allows implmenters to define an <b>org.eclipse.ecf.core.sharedobject.provider.ISharedObjectInstantiator</b> that will be responsible for creating
-<b>org.eclipse.ecf.core.sharedobject.ISharedObject</b> instances when requested by clients. Here is the <b>ISharedObjectInstantiator</b> that
-extensions must implement:
-
-<pre class="Example"><span class="code SchemaTag">
-public interface ISharedObjectInstantiator {
- /**
- * Create instance of ISharedObject. This is the interface that plugin
- * implementations must implement for the sharedObjectFactory extension
- * point. The caller may optionally specify both argument types and
- * arguments that will be passed into this method (and therefore to the
- * provider implementation implementing this method). For example:
- * &lt;p&gt;
- * &lt;/p&gt;
- * &lt;p&gt;
- * &lt;b&gt;
- * SharedObjectFactory.getDefault().createSharedObject("foosharedobject",new
- * String [] { java.lang.String }, new Object { "hello" });&lt;/b&gt;
- * &lt;/p&gt;
- * &lt;p&gt;
- * &lt;/p&gt;
- *
- * @param typeDescription
- * the SharedObjectTypeDescription associated with the registered
- * shared object provider implementation plugin
- * @param args
- * arguments specified by the caller. May be null if no arguments
- * are passed in by caller to
- * SharedObjectFactory.getDefault().createSharedObject(...)
- * @return ISharedObject instance. The provider implementation must return a
- * valid object implementing ISharedObject OR throw a
- * SharedObjectCreateException
- * @throws SharedObjectCreateException
- * if shared object instance cannot be created
- */
- public ISharedObject createInstance(
- SharedObjectTypeDescription typeDescription, Object[] args)
- throws SharedObjectCreateException;
-}
-</span></pre><p></p>
-<h6 class="CaptionFigColumn SchemaHeader">Configuration Markup:</h6>
-<p></p>
-<p class="code SchemaDtd">&lt;!ELEMENT <a name="e.extension">extension</a> (<a href="#e.sharedObjectFactory">sharedObjectFactory</a>+)&gt;</p>
-<p class="code SchemaDtd">&lt;!ATTLIST extension</p>
-<p class="code SchemaDtdAttlist">point&nbsp;CDATA #REQUIRED</p><p class="code SchemaDtdAttlist">id&nbsp;&nbsp;&nbsp;&nbsp;CDATA #IMPLIED</p><p class="code SchemaDtdAttlist">name&nbsp;&nbsp;CDATA #IMPLIED</p>&gt;</p>
-<p></p>
-<ul class="ConfigMarkupAttlistDesc">
-</ul>
-<br><p class="code SchemaDtd">&lt;!ELEMENT <a name="e.sharedObjectFactory">sharedObjectFactory</a> (<a href="#e.property">property</a>*)&gt;</p>
-<p class="code SchemaDtd">&lt;!ATTLIST sharedObjectFactory</p>
-<p class="code SchemaDtdAttlist">class&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED</p><p class="code SchemaDtdAttlist">name&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #IMPLIED</p><p class="code SchemaDtdAttlist">description&nbsp;CDATA #IMPLIED</p>&gt;</p>
-<p></p>
-<ul class="ConfigMarkupAttlistDesc">
-<li><b>class</b> - The fully qualified name of the class that implements the <b>org.eclipse.ecf.core.provider.ISharedObjectInstantiator</b> interface.</li>
-<li><b>name</b> - An optional name for the extension. If no name is explicitly provided by the extension, the sharedObjectFactory class name is used as the name. Note that this name must <b>not</b> conflict with any other name in the ECF SharedObjectFactory in order to be successfully registered. Care should therefore be taken in selection of a name such that it does not conflict with other pre-existing names for this factory implementations</li>
-<li><b>description</b> - </li>
-</ul>
-<br><p class="code SchemaDtd">&lt;!ELEMENT <a name="e.property">property</a> EMPTY&gt;</p>
-<p class="code SchemaDtd">&lt;!ATTLIST property</p>
-<p class="code SchemaDtdAttlist">name&nbsp;&nbsp;CDATA #REQUIRED</p><p class="code SchemaDtdAttlist">value&nbsp;CDATA #REQUIRED</p>&gt;</p>
-<p></p>
-<p class="ConfigMarkupElementDesc">
-Property (name,value) associated with SharedObjectTypeDescription</p>
-<br>
-<ul class="ConfigMarkupAttlistDesc">
-<li><b>name</b> - The name of the property</li>
-<li><b>value</b> - The value of the property</li>
-</ul>
-<br><h6 class="CaptionFigColumn SchemaHeader">Examples: </h6>Here's an example of an extension point declaration:
-
-<pre class="Example"><span class="code SchemaTag">
- &lt;extension
- point=</span><span class="code SchemaCstring">&quot;org.eclipse.ecf.sharedobject.sharedObjectFactory&quot;</span><span class="code SchemaTag">&gt;
- &lt;sharedObjectFactory
- class=</span><span class="code SchemaCstring">&quot;org.eclipse.ecf.tests.provider.TestSharedObjectInstantiator&quot;</span><span class="code SchemaTag">
- name=</span><span class="code SchemaCstring">&quot;ecf.test.sharedobjectfactory&quot;</span><span class="code SchemaTag">/&gt;
- &lt;/extension&gt;
-</span></pre>
-
-and the TestSharedObjectInstantiator is defined:
-
-<pre class="Example"><span class="code SchemaTag">
-public class TestSharedObjectInstantiator implements ISharedObjectInstantiator {
-
- public ISharedObject createInstance(SharedObjectTypeDescription description, Object[] args) throws SharedObjectCreateException {
- System.out.println("createInstance("+description+","+((args==null)?"null":Arrays.asList(args).toString()));
- return new TestSharedObject();
- }
-}
-</span></pre>
-
-<h3>Example Usage of Container by Clients</h3>
-
-Clients may use the extension via calls such as:
-
-<pre class="Example"><span class="code SchemaTag">
-ISharedObject obj = SharedObjectFactory.getDefault().createSharedObject("ecf.test.sharedobjectfactory");
-</span></pre>
-<p></p>
-
-<h6 class="CaptionFigColumn SchemaHeader">API Information: </h6>The API for accessing the functionality provided via extensions is via <b>org.eclipse.ecf.core.sharedobject.SharedObjectFactory.getDefault()</b> methods. Specifically, the <b>org.eclipse.ecf.core.sharedobject.ISharedObjectFactory.createSharedObject()</b> methods are to be used to create shared
-object instances, where extensions implement the actual shared object creation
-
-Here is the <b>org.eclipse.ecf.core.sharedobject.ISharedObjectFactory</b> contract implemented by the <b>org.eclipse.ecf.core.sharedobject.SharedObjectFactory</b>:
-
-<pre class="Example"><span class="code SchemaTag">
-public interface ISharedObjectFactory {
- /*
- * Add a SharedObjectTypeDescription to the set of known
- * SharedObjectTypeDescriptions.
- *
- * @param scd the SharedObjectTypeDescription to add to this factory @return
- * SharedObjectTypeDescription the old description of the same name, null if
- * none found
- */
- public SharedObjectTypeDescription addDescription(
- SharedObjectTypeDescription description);
-
- /**
- * Get a collection of the SharedObjectTypeDescriptions currently known to
- * this factory. This allows clients to query the factory to determine what
- * if any other SharedObjectTypeDescriptions are currently registered with
- * the factory, and if so, what they are.
- *
- * @return List of SharedObjectTypeDescription instances. Will not be null.
- */
- public List getDescriptions();
-
- /**
- * Check to see if a given named description is already contained by this
- * factory
- *
- * @param description
- * the SharedObjectTypeDescription to look for
- * @return true if description is already known to factory, false otherwise
- */
- public boolean containsDescription(SharedObjectTypeDescription description);
-
- /**
- * Get the known SharedObjectTypeDescription given it&apos;s name.
- *
- * @param name
- * @return SharedObjectTypeDescription found. Null if description not found.
- * @throws SharedObjectCreateException
- */
- public SharedObjectTypeDescription getDescriptionByName(String name)
- throws SharedObjectCreateException;
-
- /**
- * Create ISharedObject instance. Given a SharedObjectTypeDescription
- * object, a String [] of argument types, and an Object [] of parameters,
- * this method will
- * &lt;p&gt;
- * &lt;ul&gt;
- * &lt;li&gt;lookup the known SharedObjectTypeDescriptions to find one of
- * matching name&lt;/li&gt;
- * &lt;li&gt;if found, will retrieve or create an ISharedObjectInstantiator for
- * that description&lt;/li&gt;
- * &lt;li&gt;Call the ISharedObjectInstantiator.createInstance method to return
- * an instance of ISharedObject&lt;/li&gt;
- * &lt;/ul&gt;
- *
- * @param typeDescription
- * the SharedObjectTypeDescription to use to create the instance
- * @param args
- * an Object [] of arguments passed to the createInstance method
- * of the ISharedObjectInstantiator
- * @return a valid instance of ISharedObject. Will not be null.
- * @throws SharedObjectCreateException
- * if shared object cannot be created
- */
- public ISharedObject createSharedObject(
- SharedObjectTypeDescription typeDescription, Object[] args)
- throws SharedObjectCreateException;
-
- /**
- * Create ISharedObject instance. Given a SharedObjectTypeDescription name,
- * this method will
- * &lt;p&gt;
- * &lt;ul&gt;
- * &lt;li&gt;lookup the known SharedObjectTypeDescriptions to find one of
- * matching name&lt;/li&gt;
- * &lt;li&gt;if found, will retrieve or create an ISharedObjectInstantiator for
- * that description&lt;/li&gt;
- * &lt;li&gt;Call the ISharedObjectInstantiator.createInstance method to return
- * an instance of ISharedObject&lt;/li&gt;
- * &lt;/ul&gt;
- *
- * @param descriptionName
- * the SharedObjectTypeDescription name to lookup
- * @return a valid instance of ISharedObject. Will not be null.
- * @throws SharedObjectCreateException
- */
- public ISharedObject createSharedObject(String descriptionName)
- throws SharedObjectCreateException;
-
- /**
- * Create ISharedObject instance. Given a SharedObjectTypeDescription name,
- * this method will
- * &lt;p&gt;
- * &lt;ul&gt;
- * &lt;li&gt;lookup the known SharedObjectTypeDescriptions to find one of
- * matching name&lt;/li&gt;
- * &lt;li&gt;if found, will retrieve or create an ISharedObjectInstantiator for
- * that description&lt;/li&gt;
- * &lt;li&gt;Call the ISharedObjectInstantiator.createInstance method to return
- * an instance of ISharedObject&lt;/li&gt;
- * &lt;/ul&gt;
- *
- * @param descriptionName
- * the SharedObjectTypeDescription name to lookup
- * @param args
- * the Object [] of arguments passed to the
- * ISharedObjectInstantiator.createInstance method
- * @return a valid instance of IContainer. Will not be null.
- * @throws SharedObjectCreateException
- */
- public ISharedObject createSharedObject(String descriptionName,
- Object[] args) throws SharedObjectCreateException;
-
- /**
- * Remove given description from set known to this factory.
- *
- * @param scd
- * the SharedObjectTypeDescription to remove
- * @return the removed SharedObjectTypeDescription, null if nothing removed
- */
- public SharedObjectTypeDescription removeDescription(
- SharedObjectTypeDescription scd);
-}
-</span></pre>
-
-See the "Examples" page for an example usage of the extension point.
-<p></p>
-
-<br>
-<p class="note SchemaCopyright">
-Copyright (c) 2004 Composent, Inc. and others.
-All rights reserved. This program and the accompanying materials are made available under the 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
-
-</p>
-</BODY>
-</HTML>
diff --git a/doc/bundles/org.eclipse.ecf.doc/html/reference/extension-points/org_eclipse_ecf_start.html b/doc/bundles/org.eclipse.ecf.doc/html/reference/extension-points/org_eclipse_ecf_start.html
deleted file mode 100644
index ce06812b6..000000000
--- a/doc/bundles/org.eclipse.ecf.doc/html/reference/extension-points/org_eclipse_ecf_start.html
+++ /dev/null
@@ -1,94 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-<HEAD><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<title>ECF start</title>
-<style type="text/css">@import url("../../book.css");</style>
-<style type="text/css">@import url("../../schema.css");</style>
-</HEAD>
-<BODY>
-<H1 style="text-align:center">ECF start</H1>
-<p></p>
-<h6 class="CaptionFigColumn SchemaHeader">Identifier: </h6>org.eclipse.ecf.start<p></p>
-<h6 class="CaptionFigColumn SchemaHeader">Since: </h6>2.0.0M4
-<p></p>
-
-<h6 class="CaptionFigColumn SchemaHeader">Description: </h6>ECF Core Start Extension Point. This extension point (<b>org.eclipse.ecf.start</b>) allows extensions to run upon ECF core bundle startup. Note that extensions will be run when the ECF core bundle (ID: <b>org.eclipse.ecf</b>) is started by the runtime, not necessarily upon platform startup.<p></p>
-<h6 class="CaptionFigColumn SchemaHeader">Configuration Markup:</h6>
-<p></p>
-<p class="code SchemaDtd">&lt;!ELEMENT <a name="e.extension">extension</a> (<a href="#e.run">run</a>)+&gt;</p>
-<p class="code SchemaDtd">&lt;!ATTLIST extension</p>
-<p class="code SchemaDtdAttlist">point&nbsp;CDATA #REQUIRED</p><p class="code SchemaDtdAttlist">id&nbsp;&nbsp;&nbsp;&nbsp;CDATA #IMPLIED</p><p class="code SchemaDtdAttlist">name&nbsp;&nbsp;CDATA #IMPLIED</p>&gt;</p>
-<p></p>
-<ul class="ConfigMarkupAttlistDesc">
-</ul>
-<br><p class="code SchemaDtd">&lt;!ELEMENT <a name="e.run">run</a> EMPTY&gt;</p>
-<p class="code SchemaDtd">&lt;!ATTLIST run</p>
-<p class="code SchemaDtdAttlist">class&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED</p><p class="code SchemaDtdAttlist">asynchronous&nbsp;(true | false) </p>&gt;</p>
-<p></p>
-<ul class="ConfigMarkupAttlistDesc">
-<li><b>class</b> - Class that must implement IECFStart.</li>
-<li><b>asynchronous</b> - Attribute to determine whether the given run class is run synchronously (default) or asynchronously</li>
-</ul>
-<br><h6 class="CaptionFigColumn SchemaHeader">Examples: </h6>Here is an example usage of this extension point:
-
-<pre class="Example"><span class="code SchemaTag">
-&lt;extension
- point=</span><span class="code SchemaCstring">&quot;org.eclipse.ecf.start&quot;</span><span class="code SchemaTag">&gt;
- &lt;run
- class=</span><span class="code SchemaCstring">&quot;org.eclipse.ecf.example.collab.start.CollabStart&quot;</span><span class="code SchemaTag">/&gt;
-&lt;/extension&gt;
-
-&lt;extension
- point=</span><span class="code SchemaCstring">&quot;org.eclipse.ecf.start&quot;</span><span class="code SchemaTag">&gt;
- &lt;run
- class=</span><span class="code SchemaCstring">&quot;org.eclipse.ecf.example.collab.start.CollabStart&quot;</span><span class="code SchemaTag"> asynchronous=</span><span class="code SchemaCstring">&quot;true&quot;</span><span class="code SchemaTag">/&gt;
-&lt;/extension&gt;
-
-</span></pre>
-
-Note that the CollabStart class must implement the <b>org.eclipse.ecf.start.IECFStart</b> interface.
-
-Here's an example implementation class:
-
-<pre class="Example"><span class="code SchemaTag">
-public class CollabStart implements IECFStart {
-
- public IStatus run(IProgressMonitor monitor) {
- ...
- }
-
-}
-
-</span></pre>
-<p></p>
-
-<h6 class="CaptionFigColumn SchemaHeader">API Information: </h6><b>org.eclipse.ecf.startup.IECFStartup</b> interface:
-
-<pre class="Example"><span class="code SchemaTag">
-/**
- * Interface that must be implemented by extensions of the org.eclipse.ecf.start
- * extension point. Such extensions will have their start method called by a new
- * Job upon ECF startup.
- */
-public interface IECFStart {
- /**
- * Run some startup task.
- *
- * @return IStatus the status of the start
- */
- public IStatus run(IProgressMonitor monitor);
-}
-</span></pre>
-<p></p>
-
-<h6 class="CaptionFigColumn SchemaHeader">Supplied Implementation: </h6>No implementation supplied for this extensinion point.
-<p></p>
-
-<br>
-<p class="note SchemaCopyright">
-Copyright (c) 2007 Composent, Inc. and others.
-All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Composent, Inc. - initial API and implementation
-
-</p>
-</BODY>
-</HTML>
diff --git a/doc/bundles/org.eclipse.ecf.doc/html/reference/extension-points/org_eclipse_ecf_ui_configurationWizards.html b/doc/bundles/org.eclipse.ecf.doc/html/reference/extension-points/org_eclipse_ecf_ui_configurationWizards.html
deleted file mode 100644
index c0aebad3c..000000000
--- a/doc/bundles/org.eclipse.ecf.doc/html/reference/extension-points/org_eclipse_ecf_ui_configurationWizards.html
+++ /dev/null
@@ -1,130 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-<HEAD><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<title>ECF Configuration Wizards</title>
-<style type="text/css">@import url("../../book.css");</style>
-<style type="text/css">@import url("../../schema.css");</style>
-</HEAD>
-<BODY>
-<H1 style="text-align:center">ECF Configuration Wizards</H1>
-<p></p>
-<h6 class="CaptionFigColumn SchemaHeader">Identifier: </h6>org.eclipse.ecf.ui.configurationWizards<p></p>
-<h6 class="CaptionFigColumn SchemaHeader">Since: </h6>ECF v0.9.4
-<p></p>
-
-<h6 class="CaptionFigColumn SchemaHeader">Description: </h6>This extension point allows providers to register wizards for creating and configuration IContainer
-instances.<p></p>
-<h6 class="CaptionFigColumn SchemaHeader">Configuration Markup:</h6>
-<p></p>
-<p class="code SchemaDtd">&lt;!ELEMENT <a name="e.extension">extension</a> (<a href="#e.category">category</a> | <a href="#e.wizard">wizard</a>)*&gt;</p>
-<p class="code SchemaDtd">&lt;!ATTLIST extension</p>
-<p class="code SchemaDtdAttlist">point&nbsp;CDATA #REQUIRED</p><p class="code SchemaDtdAttlist">id&nbsp;&nbsp;&nbsp;&nbsp;CDATA #IMPLIED</p><p class="code SchemaDtdAttlist">name&nbsp;&nbsp;CDATA #IMPLIED</p>&gt;</p>
-<p></p>
-<ul class="ConfigMarkupAttlistDesc">
-<li><b>point</b> - a fully qualified identifier of the target extension point</li>
-<li><b>id</b> - an optional identifier of the extension instance</li>
-<li><b>name</b> - an optional name of the extension instance</li>
-</ul>
-<br><p class="code SchemaDtd">&lt;!ELEMENT <a name="e.category">category</a> EMPTY&gt;</p>
-<p class="code SchemaDtd">&lt;!ATTLIST category</p>
-<p class="code SchemaDtdAttlist">id&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED</p><p class="code SchemaDtdAttlist">name&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED</p><p class="code SchemaDtdAttlist">parentCategory&nbsp;CDATA #IMPLIED</p>&gt;</p>
-<p></p>
-<ul class="ConfigMarkupAttlistDesc">
-<li><b>id</b> - a unique name that can be used to identify this category</li>
-<li><b>name</b> - a translatable name of the category that will be used in the dialog box</li>
-<li><b>parentCategory</b> - a path to another category if this category should be added as a child</li>
-</ul>
-<br><p class="code SchemaDtd">&lt;!ELEMENT <a name="e.wizard">wizard</a> (<a href="#e.description">description</a>?)&gt;</p>
-<p class="code SchemaDtd">&lt;!ATTLIST wizard</p>
-<p class="code SchemaDtdAttlist">id&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED</p><p class="code SchemaDtdAttlist">name&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED</p><p class="code SchemaDtdAttlist">category&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #IMPLIED</p><p class="code SchemaDtdAttlist">class&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED</p><p class="code SchemaDtdAttlist">icon&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #IMPLIED</p><p class="code SchemaDtdAttlist">containerFactoryName&nbsp;CDATA #REQUIRED</p>&gt;</p>
-<p></p>
-<p class="ConfigMarkupElementDesc">
-an element that will be used to create export wizard</p>
-<br>
-<ul class="ConfigMarkupAttlistDesc">
-<li><b>id</b> - a unique name that will be used to identify this wizard</li>
-<li><b>name</b> - a translatable name that will be used in the dialog box to represent this wizard</li>
-<li><b>category</b> - a slash-delimited path ('/') of category IDs. Each token in the
-path must represent a valid category ID previously defined
-by this or some other plug-in. If omitted, the wizard will be
-added to the "Other" category.</li>
-<li><b>class</b> - a fully qualified name of the class that implements <tt>org.eclipse.ecf.ui.IConfigurationWizard</tt>
-interface</li>
-<li><b>icon</b> - a relative name of the icon that will be used
-alongside the wizard name in the export engine listing.</li>
-<li><b>containerFactoryName</b> - The ContainerTypeName of the container to be created. For example, "ecf.generic.client".</li>
-</ul>
-<br><p class="code SchemaDtd">&lt;!ELEMENT <a name="e.description">description</a> (#PCDATA)&gt;</p>
-<p></p>
-<p class="ConfigMarkupElementDesc">
-an optional subelement whose body should represent a short description
-of the export engine functionality.</p>
-<br><br>
-<h6 class="CaptionFigColumn SchemaHeader">Examples: </h6>Implementers of this extension point must specify an extension of the <b>org.eclipse.ecf.ui.configurationWizards</b> extension point.
-
-<pre class="Example"><span class="code SchemaTag">
- &lt;extension
- point=</span><span class="code SchemaCstring">&quot;org.eclipse.ecf.ui.configurationWizards&quot;</span><span class="code SchemaTag">&gt;
- &lt;wizard
- class=</span><span class="code SchemaCstring">&quot;org.my.client.MyClientConfigurationWizard&quot;</span><span class="code SchemaTag">
- containerFactoryName=</span><span class="code SchemaCstring">&quot;org.my.client&quot;</span><span class="code SchemaTag">
- id=</span><span class="code SchemaCstring">&quot;my.client.configuration.wizard&quot;</span><span class="code SchemaTag">
- name=</span><span class="code SchemaCstring">&quot;My Client Configuration Wizard&quot;</span><span class="code SchemaTag">
- icon=</span><span class="code SchemaCstring">&quot;icons/configuration.png&quot;</span><span class="code SchemaTag">&gt;
- &lt;/wizard&gt;
- &lt;/extension&gt;
-</span></pre>
-<p></p>
-
-<h6 class="CaptionFigColumn SchemaHeader">API Information: </h6>The "class" attribute (required) must have a class that implements the <b>org.eclipse.ecf.ui.IConfigurationWizard</b> interface:
-
-<pre class="Example"><span class="code SchemaTag">
-/**
- * Required interface for implementing
- * &lt;b&gt;org.eclipse.ecf.ui.configurationWizards&lt;/b&gt; extension point. Extensions
- * for extension point &lt;b&gt;org.eclipse.ecf.ui.configurationWizards&lt;/b&gt; must
- * provide a class implementing this interface.
- */
-public interface IConfigurationWizard extends IWizard {
-
- /**
- * Initialize the wizard with the workbench and the desired container type
- * description
- *
- * @param workbench
- * the workbench for the wizard. Will not be null.
- * @param description
- * the {@link ContainerTypeDescription} to use to
- * create/configure the new IContainer instance
- */
- public void init(IWorkbench workbench,
- ContainerTypeDescription description);
-
- /**
- * Get result of configuration.
- *
- * @return ContainerHolder the result of the configuration. If null, the container could not be
- * created.
- */
- public ContainerHolder getConfigurationResult();
-}
-
-</span></pre>
-<p></p>
-
-<br>
-<p class="note SchemaCopyright">
-/****************************************************************************
- * Copyright (c) 2004 Composent, Inc. and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
- *****************************************************************************/
-
-</p>
-</BODY>
-</HTML>
diff --git a/doc/bundles/org.eclipse.ecf.doc/html/reference/extension-points/org_eclipse_ecf_ui_connectWizards.html b/doc/bundles/org.eclipse.ecf.doc/html/reference/extension-points/org_eclipse_ecf_ui_connectWizards.html
deleted file mode 100644
index 8ba4dbd06..000000000
--- a/doc/bundles/org.eclipse.ecf.doc/html/reference/extension-points/org_eclipse_ecf_ui_connectWizards.html
+++ /dev/null
@@ -1,119 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-<HEAD><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<title>ECF Connect Wizard</title>
-<style type="text/css">@import url("../../book.css");</style>
-<style type="text/css">@import url("../../schema.css");</style>
-</HEAD>
-<BODY>
-<H1 style="text-align:center">ECF Connect Wizard</H1>
-<p></p>
-<h6 class="CaptionFigColumn SchemaHeader">Identifier: </h6>org.eclipse.ecf.ui.connectWizards<p></p>
-<h6 class="CaptionFigColumn SchemaHeader">Since: </h6>ECF 0.9.4
-<p></p>
-
-<h6 class="CaptionFigColumn SchemaHeader">Description: </h6>This extension point allows providers to register wizards for connecting IContainer
-instances.<p></p>
-<h6 class="CaptionFigColumn SchemaHeader">Configuration Markup:</h6>
-<p></p>
-<p class="code SchemaDtd">&lt;!ELEMENT <a name="e.extension">extension</a> (<a href="#e.category">category</a> | <a href="#e.wizard">wizard</a>)*&gt;</p>
-<p class="code SchemaDtd">&lt;!ATTLIST extension</p>
-<p class="code SchemaDtdAttlist">point&nbsp;CDATA #REQUIRED</p><p class="code SchemaDtdAttlist">id&nbsp;&nbsp;&nbsp;&nbsp;CDATA #IMPLIED</p><p class="code SchemaDtdAttlist">name&nbsp;&nbsp;CDATA #IMPLIED</p>&gt;</p>
-<p></p>
-<ul class="ConfigMarkupAttlistDesc">
-<li><b>point</b> - a fully qualified identifier of the target extension point</li>
-<li><b>id</b> - an optional identifier of the extension instance</li>
-<li><b>name</b> - an optional name of the extension instance</li>
-</ul>
-<br><p class="code SchemaDtd">&lt;!ELEMENT <a name="e.category">category</a> EMPTY&gt;</p>
-<p class="code SchemaDtd">&lt;!ATTLIST category</p>
-<p class="code SchemaDtdAttlist">id&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED</p><p class="code SchemaDtdAttlist">name&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED</p><p class="code SchemaDtdAttlist">parentCategory&nbsp;CDATA #IMPLIED</p>&gt;</p>
-<p></p>
-<ul class="ConfigMarkupAttlistDesc">
-<li><b>id</b> - a unique name that can be used to identify this category</li>
-<li><b>name</b> - a translatable name of the category that will be used in the dialog box</li>
-<li><b>parentCategory</b> - a path to another category if this category should be added as a child</li>
-</ul>
-<br><p class="code SchemaDtd">&lt;!ELEMENT <a name="e.wizard">wizard</a> (<a href="#e.description">description</a>?)&gt;</p>
-<p class="code SchemaDtd">&lt;!ATTLIST wizard</p>
-<p class="code SchemaDtdAttlist">id&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED</p><p class="code SchemaDtdAttlist">name&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED</p><p class="code SchemaDtdAttlist">category&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #IMPLIED</p><p class="code SchemaDtdAttlist">class&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED</p><p class="code SchemaDtdAttlist">icon&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #IMPLIED</p><p class="code SchemaDtdAttlist">containerFactoryName&nbsp;CDATA #REQUIRED</p>&gt;</p>
-<p></p>
-<p class="ConfigMarkupElementDesc">
-an element that will be used to create export wizard</p>
-<br>
-<ul class="ConfigMarkupAttlistDesc">
-<li><b>id</b> - a unique name that will be used to identify this wizard</li>
-<li><b>name</b> - a translatable name that will be used in the dialog box to represent this wizard</li>
-<li><b>category</b> - a slash-delimited path ('/') of category IDs. Each token in the
-path must represent a valid category ID previously defined
-by this or some other plug-in. If omitted, the wizard will be
-added to the "Other" category.</li>
-<li><b>class</b> - a fully qualified name of the class that implements <tt>org.eclipse.ecf.ui.IConnectWizard</tt>
-interface</li>
-<li><b>icon</b> - a relative name of the icon that will be used
-alongside the wizard name in the export engine listing.</li>
-<li><b>containerFactoryName</b> - The ContainerTypeName of the container to be created. For example, "ecf.generic.client".</li>
-</ul>
-<br><p class="code SchemaDtd">&lt;!ELEMENT <a name="e.description">description</a> (#PCDATA)&gt;</p>
-<p></p>
-<p class="ConfigMarkupElementDesc">
-an optional subelement whose body should represent a short description
-of the export engine functionality.</p>
-<br><br>
-<h6 class="CaptionFigColumn SchemaHeader">Examples: </h6>Implementers of this extension point must specify an extension of the <b>org.eclipse.ecf.ui.connectWizards</b> extension point.
-
-<pre class="Example"><span class="code SchemaTag">
- &lt;extension
- point=</span><span class="code SchemaCstring">&quot;org.eclipse.ecf.ui.connectWizards&quot;</span><span class="code SchemaTag">&gt;
- &lt;wizard
- class=</span><span class="code SchemaCstring">&quot;org.my.client.MyClientConnectWizard&quot;</span><span class="code SchemaTag">
- containerFactoryName=</span><span class="code SchemaCstring">&quot;org.my.client&quot;</span><span class="code SchemaTag">
- id=</span><span class="code SchemaCstring">&quot;my.client.connect.wizard&quot;</span><span class="code SchemaTag">
- name=</span><span class="code SchemaCstring">&quot;My Client Connect Wizard&quot;</span><span class="code SchemaTag">
- icon=</span><span class="code SchemaCstring">&quot;icons/connect.png&quot;</span><span class="code SchemaTag">&gt;
- &lt;/wizard&gt;
- &lt;/extension&gt;
-</span></pre>
-<p></p>
-
-<h6 class="CaptionFigColumn SchemaHeader">API Information: </h6>The "class" attribute (required) must have a class that implements the <b>org.eclipse.ecf.ui.IConfigurationWizard</b> interface:
-
-<pre class="Example"><span class="code SchemaTag">
-/**
- * Required interface for implementing &lt;b&gt;org.eclipse.ecf.ui.connectWizards&lt;/b&gt;
- * extension point. Extensions for extension point
- * &lt;b&gt;org.eclipse.ecf.ui.connectWizards&lt;/b&gt; must provide a class implementing
- * this interface.
- */
-public interface IConnectWizard extends IWizard {
-
- /**
- * Initialize the connect wizard.
- *
- * @param workbench
- * the currently working workbench instance. Will not be null.
- * @param container
- * the container that is to be connected. Will not be null.
- */
- public void init(IWorkbench workbench, IContainer container);
-}
-
-</span></pre>
-<p></p>
-
-<br>
-<p class="note SchemaCopyright">
-/****************************************************************************
- * Copyright (c) 2004 Composent, Inc. and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
- *****************************************************************************/
-
-</p>
-</BODY>
-</HTML>
diff --git a/doc/bundles/org.eclipse.ecf.doc/intro/css/overview.css b/doc/bundles/org.eclipse.ecf.doc/intro/css/overview.css
index 98d70453d..267f94446 100644
--- a/doc/bundles/org.eclipse.ecf.doc/intro/css/overview.css
+++ b/doc/bundles/org.eclipse.ecf.doc/intro/css/overview.css
@@ -1,3 +1,2 @@
-
a#orgeclipseecfdoc-introLink img { background-image : url(images/ecf_intro.gif); }
a#orgeclipseecfdoc-introLink:hover img { background-image : url(images/ecf_intro_hov.gif); } \ No newline at end of file
diff --git a/doc/bundles/org.eclipse.ecf.doc/intro/css/samples.css b/doc/bundles/org.eclipse.ecf.doc/intro/css/samples.css
index 267f94446..ca47e3442 100644
--- a/doc/bundles/org.eclipse.ecf.doc/intro/css/samples.css
+++ b/doc/bundles/org.eclipse.ecf.doc/intro/css/samples.css
@@ -1,2 +1,8 @@
-a#orgeclipseecfdoc-introLink img { background-image : url(images/ecf_intro.gif); }
-a#orgeclipseecfdoc-introLink:hover img { background-image : url(images/ecf_intro_hov.gif); } \ No newline at end of file
+a#orgeclipseecfdoc-tut-buildingyourfirstosgiremoteservice img { background-image : url(images/ecf_intro.gif); }
+a#orgeclipseecfdoc-tut-buildingyourfirstosgiremoteservice:hover img { background-image : url(images/ecf_intro_hov.gif);}
+a#orgeclipseecfdoc-tut-buildingyourfirstasyncosgiremoteservice img { background-image : url(images/ecf_intro.gif); }
+a#orgeclipseecfdoc-tut-buildingyourfirstasyncosgiremoteservice:hover img {background-image : url(images/ecf_intro_hov.gif);}
+a#orgeclipseecfdoc-tut-osgiremoteservicesfortheraspberrypi img { background-image : url(images/ecf_intro.gif); }
+a#orgeclipseecfdoc-tut-osgiremoteservicesfortheraspberrypi:hover img {background-image : url(images/ecf_intro_hov.gif);}
+a#orgeclipseecfdoc-tut-creatingrestfulremoteserviceprovider img { background-image : url(images/ecf_intro.gif); }
+a#orgeclipseecfdoc-tut-creatingrestfulremoteserviceprovider:hover img {background-image : url(images/ecf_intro_hov.gif);}
diff --git a/doc/bundles/org.eclipse.ecf.doc/intro/overviewExtensionContent.xml b/doc/bundles/org.eclipse.ecf.doc/intro/overviewExtensionContent.xml
index 536b1eb7a..da1481112 100644
--- a/doc/bundles/org.eclipse.ecf.doc/intro/overviewExtensionContent.xml
+++ b/doc/bundles/org.eclipse.ecf.doc/intro/overviewExtensionContent.xml
@@ -1,10 +1,12 @@
<?xml version="1.0" encoding="utf-8" ?>
<introContent>
- <extensionContent id="orgeclipseecfdoc-introExtension" style="css/overview.css" name="ECF Remote Services" path="overview/@">
- <group style-id="content-group" id="orgeclipseecfdoc-introLink-group">
- <link label="ECF Remote Services" url="http://org.eclipse.ui.intro/showHelpTopic?id=https://wiki.eclipse.org/ECF" id="orgeclipseecfdoc-introLink" style-id="content-link">
- <text>Learn how to use Remote Services for Inter-Process Communications</text>
- </link>
- </group>
- </extensionContent>
+ <extensionContent id="orgeclipseecfdoc-introExtension" style="css/overview.css" name="ECF Remote Services" path="overview/@">
+ <group style-id="content-group" id="content-group">
+ <link label="ECF Remote Services"
+ url="http://org.eclipse.ui.intro/openBrowser?url=https://wiki.eclipse.org/Eclipse_Communication_Framework_Project"
+ id="orgeclipseecfdoc-introLink" style-id="content-link">
+ <text>Learn how to use Remote Services for Inter-Process Communications</text>
+ </link>
+ </group>
+ </extensionContent>
</introContent> \ No newline at end of file
diff --git a/doc/bundles/org.eclipse.ecf.doc/intro/samplesExtensionContent.xml b/doc/bundles/org.eclipse.ecf.doc/intro/samplesExtensionContent.xml
index cfdc5d01a..9508192fc 100644
--- a/doc/bundles/org.eclipse.ecf.doc/intro/samplesExtensionContent.xml
+++ b/doc/bundles/org.eclipse.ecf.doc/intro/samplesExtensionContent.xml
@@ -3,23 +3,23 @@
<extensionContent id="orgeclipseecfdoc-introExtension" name="ECF Remote Services"
style="css/samples.css" path="samples/@">
<group label="ECF Remote Services" id="orgeclipseecfdoc-introLink-group" style-id="content-group">
- <link
- url="http://org.eclipse.ui.intro/showHelpTopic?id=https://wiki.eclipse.org/Tutorial:_Building_your_first_OSGi_Remote_Service"
- label="Building Your First Remote Service" id="orgeclipseecfdoc-tut-buildingyourfirstosgiremoteservice" style-id="content-link">
+ <link
+ url="http://org.eclipse.ui.intro/openBrowser?url=https://wiki.eclipse.org/Tutorial:_Building_your_first_OSGi_Remote_Service"
+ label="Building Your First OSGi Remote Service" id="orgeclipseecfdoc-tut-buildingyourfirstosgiremoteservice" style-id="content-link">
<text>An introductory tutorial showing how to create and run a simple Remote Service</text>
</link>
<link
- url="http://org.eclipse.ui.intro/showHelpTopic?id=https://wiki.eclipse.org/Tutorial:_Building_your_first_Asynchronous_OSGi_Remote_Service"
+ url="http://org.eclipse.ui.intro/openBrowser?url=https://wiki.eclipse.org/Tutorial:_Building_your_first_Asynchronous_OSGi_Remote_Service"
label="Building Your First Asynchronous Remote Service" id="orgeclipseecfdoc-tut-buildingyourfirstasyncosgiremoteservice" style-id="content-link">
<text>An introductory tutorial showing how to create an run a non-blocking asynchronous Remote Service</text>
</link>
<link
- url="http://org.eclipse.ui.intro/showHelpTopic?id=https://wiki.eclipse.org/Tutorial:_OSGi_Remote_Services_for_the_Raspberry_Pi"
+ url="http://org.eclipse.ui.intro/openBrowser?url=https://wiki.eclipse.org/Tutorial:_OSGi_Remote_Services_for_the_Raspberry_Pi"
label="Remote Services for the Raspberry Pi" id="orgeclipseecfdoc-tut-osgiremoteservicesfortheraspberrypi" style-id="content-link">
<text>An introductory Internet of Things (IoT) tutorial showing how to create and use Remote Services on a Raspberry Pi</text>
</link>
<link
- url="http://org.eclipse.ui.intro/showHelpTopic?id=https://wiki.eclipse.org/Tutorial:_Creating_a_RESTful_Remote_Service_Provider"
+ url="http://org.eclipse.ui.intro/openBrowser?url=https://wiki.eclipse.org/Tutorial:_Creating_a_RESTful_Remote_Service_Provider"
label="Creating a RESTful Remote Service Provider" id="orgeclipseecfdoc-tut-creatingrestfulremoteserviceprovider" style-id="content-link">
<text>A more advanced tutorial showing how to create a custom Remote Services distribution provider</text>
</link>
diff --git a/doc/bundles/org.eclipse.ecf.doc/intro/tutorialsExtensionContent.xml b/doc/bundles/org.eclipse.ecf.doc/intro/tutorialsExtensionContent.xml
index 4084921cf..c92c940e5 100644
--- a/doc/bundles/org.eclipse.ecf.doc/intro/tutorialsExtensionContent.xml
+++ b/doc/bundles/org.eclipse.ecf.doc/intro/tutorialsExtensionContent.xml
@@ -3,23 +3,23 @@
<extensionContent id="orgeclipseecfdoc-introExtension" name="ECF Remote Services"
style="css/tutorials.css" path="tutorials/@">
<group label="ECF Remote Services" id="orgeclipseecfdoc-introLink-group" style-id="content-group">
- <link
- url="http://org.eclipse.ui.intro/showHelpTopic?id=https://wiki.eclipse.org/Tutorial:_Building_your_first_OSGi_Remote_Service"
- label="Building Your First OSGi Remote Service" id="orgeclipseecfdoc-tut-buildingyourfirstosgiremoteservice" style-id="content-link">
+ <link
+ url="http://org.eclipse.ui.intro/openBrowser?url=https://wiki.eclipse.org/Tutorial:_Building_your_first_OSGi_Remote_Service"
+ label="Building Your First OSGi Remote Service" id="orgeclipseecfdoc-tut-buildingyourfirstosgiremoteservice" style-id="content-link">
<text>An introductory tutorial showing how to create and run a simple Remote Service</text>
</link>
<link
- url="http://org.eclipse.ui.intro/showHelpTopic?id=https://wiki.eclipse.org/Tutorial:_Building_your_first_Asynchronous_OSGi_Remote_Service"
+ url="http://org.eclipse.ui.intro/openBrowser?url=https://wiki.eclipse.org/Tutorial:_Building_your_first_Asynchronous_OSGi_Remote_Service"
label="Building Your First Asynchronous Remote Service" id="orgeclipseecfdoc-tut-buildingyourfirstasyncosgiremoteservice" style-id="content-link">
<text>An introductory tutorial showing how to create an run a non-blocking asynchronous Remote Service</text>
</link>
<link
- url="http://org.eclipse.ui.intro/showHelpTopic?id=https://wiki.eclipse.org/Tutorial:_OSGi_Remote_Services_for_the_Raspberry_Pi"
+ url="http://org.eclipse.ui.intro/openBrowser?url=https://wiki.eclipse.org/Tutorial:_OSGi_Remote_Services_for_the_Raspberry_Pi"
label="Remote Services for the Raspberry Pi" id="orgeclipseecfdoc-tut-osgiremoteservicesfortheraspberrypi" style-id="content-link">
<text>An introductory Internet of Things (IoT) tutorial showing how to create and use Remote Services on a Raspberry Pi</text>
</link>
<link
- url="http://org.eclipse.ui.intro/showHelpTopic?id=https://wiki.eclipse.org/Tutorial:_Creating_a_RESTful_Remote_Service_Provider"
+ url="http://org.eclipse.ui.intro/openBrowser?url=https://wiki.eclipse.org/Tutorial:_Creating_a_RESTful_Remote_Service_Provider"
label="Creating a RESTful Remote Service Provider" id="orgeclipseecfdoc-tut-creatingrestfulremoteserviceprovider" style-id="content-link">
<text>A more advanced tutorial showing how to create a custom Remote Services distribution provider</text>
</link>
diff --git a/doc/bundles/org.eclipse.ecf.doc/intro/whatsnewExtensionContent.xml b/doc/bundles/org.eclipse.ecf.doc/intro/whatsnewExtensionContent.xml
index 91a1e5a8c..cf5ecbefa 100644
--- a/doc/bundles/org.eclipse.ecf.doc/intro/whatsnewExtensionContent.xml
+++ b/doc/bundles/org.eclipse.ecf.doc/intro/whatsnewExtensionContent.xml
@@ -4,7 +4,7 @@
style="css/whatsnew.css" path="whatsnew/@">
<group id="content-group" style-id="content-group">
<link label="ECF Remote Services"
- url="http://org.eclipse.ui.intro/showHelpTopic?id=http://www.eclipse.org/ecf/NewAndNoteworthy.html"
+ url="http://org.eclipse.ui.intro/openBrowser?url=https://www.eclipse.org/ecf/NewAndNoteworthy.html"
id="orgeclipseecfdoc-introLink" style-id="content-link">
<text>
Find out the significant changes made to ECF in recent versions
diff --git a/doc/bundles/org.eclipse.ecf.doc/javadoc.xml b/doc/bundles/org.eclipse.ecf.doc/javadoc.xml
deleted file mode 100644
index baa959538..000000000
--- a/doc/bundles/org.eclipse.ecf.doc/javadoc.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project default="javadoc">
- <target name="javadoc">
- <javadoc access="protected" additionalparam="-J-Xmx256m -tag model:a:Model -tag generated:a:Generated -tag noreference:tcmf:DoNotReference -tag ordered:a:Ordered -tag noimplement:a:NoImplement -tag noextend:a:NoExtend " author="false" classpath="../org.apache.log4j;../org.eclipse.ecf.remoteservice/bin;C:\eclipse3.6rc4\eclipse\plugins\org.eclipse.equinox.concurrent_1.0.100.v20100503.jar;../org.eclipse.ecf.presence.ui/bin;C:\eclipse3.6rc4\eclipse\plugins\org.eclipse.core.resources_3.6.0.v20100526-0737.jar;C:\eclipse3.6rc4\eclipse\plugins\org.eclipse.equinox.security_1.0.200.v20100503.jar;C:\eclipse3.6rc4\eclipse\plugins\org.eclipse.swt_3.6.0.v3650b.jar;C:\eclipse3.6rc4\eclipse\plugins\org.eclipse.osgi.services_3.2.100.v20100503.jar;C:\eclipse3.6rc4\eclipse\plugins\org.eclipse.equinox.preferences_3.3.0.v20100503.jar;C:\eclipse3.6rc4\eclipse\plugins\org.eclipse.equinox.registry_3.5.0.v20100503.jar;C:\eclipse3.6rc4\eclipse\plugins\org.eclipse.core.expressions_3.4.200.v20100505.jar;C:\eclipse3.6rc4\eclipse\plugins\org.eclipse.ui.workbench.texteditor_3.6.0.v20100520-0800.jar;C:\eclipse3.6rc4\eclipse\plugins\org.eclipse.core.jobs_3.5.0.v20100515.jar;../org.eclipse.emf.ecore.change/bin;C:\eclipse3.6rc4\eclipse\plugins\org.eclipse.ui_3.6.0.I20100603-1100.jar;C:\eclipse3.6rc4\eclipse\plugins\org.eclipse.core.runtime_3.6.0.v20100505.jar;../org.eclipse.ecf.provider.remoteservice/bin;../org.eclipse.ecf.presence/bin;../org.eclipse.ecf.provider.xmpp/bin;C:\eclipse3.6rc4\eclipse\plugins\org.eclipse.core.contenttype_3.4.100.v20100505-1235.jar;C:\eclipse3.6rc4\eclipse\plugins\org.eclipse.ui.forms_3.5.0.v20100427.jar;../org.eclipse.ecf.provider.irc/lib/irclib.jar;C:\eclipse3.6rc4\eclipse\plugins\org.eclipse.jface.text_3.6.0.v20100526-0800.jar;../org.eclipse.ecf/bin;../org.eclipse.ecf.provider.datashare/bin;../org.eclipse.ecf.discovery.ui.edit/bin;../org.jivesoftware.smack/bin;../org.eclipse.ecf.sync/bin;C:\eclipse3.6rc4\eclipse\plugins\org.apache.commons.httpclient_3.1.0.v201005080502.jar;C:\eclipse3.6rc4\eclipse\plugins\org.eclipse.core.net_1.2.100.I20100511-0800.jar;../org.eclipse.ecf.provider.filetransfer/bin;../org.eclipse.ecf.identity/bin;../org.eclipse.emf.ecore/bin;../org.eclipse.ecf.ui/bin;C:\eclipse3.6rc4\eclipse\plugins\org.eclipse.jface_3.6.0.I20100601-0800.jar;C:\eclipse3.6rc4\eclipse\plugins\org.eclipse.core.filebuffers_3.5.100.v20100520-0800.jar;C:\eclipse3.6rc4\eclipse\plugins\org.eclipse.equinox.common_3.6.0.v20100503.jar;../org.jivesoftware.smack/jars/xpp.jar;../org.eclipse.emf.edit/bin;C:\eclipse3.6rc4\eclipse\plugins\org.eclipse.core.runtime.compatibility.registry_3.3.0.v20100520\runtime_registry_compatibility.jar;C:\eclipse3.6rc4\eclipse\plugins\org.eclipse.ui.editors_3.6.0.v20100520-0800.jar;../org.eclipse.ecf.provider.irc/bin;C:\eclipse3.6rc4\eclipse\plugins\org.eclipse.equinox.app_1.3.0.v20100512.jar;C:\eclipse3.6rc4\eclipse\plugins\org.eclipse.ui.ide_3.6.0.I20100601-0800.jar;../org.eclipse.ecf.telephony.call/bin;../org.eclipse.ecf.sharedobject/bin;C:\eclipse3.6rc4\eclipse\plugins\org.eclipse.ui.workbench_3.6.0.I20100603-1100.jar;../org.eclipse.ecf.provider.datashare.nio/bin;C:\eclipse3.6rc4\eclipse\plugins\org.objectweb.asm_3.2.0.v200909071300.jar;../org.eclipse.emf.edit.ui/bin;C:\eclipse3.6rc4\eclipse\plugins\org.eclipse.osgi_3.6.0.v20100517.jar;C:\eclipse3.6rc4\eclipse\plugins\org.eclipse.text_3.5.0.v20100601-1300.jar;../org.eclipse.ecf.filetransfer/bin;../org.eclipse.ecf.provider/bin;../ch.ethz.iks.slp/bin;C:\eclipse3.6rc4\eclipse\plugins\org.eclipse.ui.views_3.5.0.I20100527-0800.jar;C:\eclipse3.6rc4\eclipse\plugins\org.eclipse.ui.console_3.5.0.v20100526.jar;../org.eclipse.ecf.discovery/bin;../org.eclipse.ecf.datashare/bin;C:\eclipse3.6rc4\eclipse\plugins\org.eclipse.core.commands_3.6.0.I20100512-1500.jar;../ch.ethz.iks.r_osgi.remote/bin;C:\eclipse3.6rc4\eclipse\plugins\org.eclipse.core.filesystem_1.3.0.v20100526-0737.jar;../org.eclipse.emf.common.ui/bin;C:\eclipse3.6rc4\eclipse\plugins\org.eclipse.swt.win32.win32.x86_3.6.0.v3650b.jar;../org.eclipse.ecf.discovery.ui.model/bin;../org.eclipse.emf.common/bin;../org.eclipse.ecf.discovery.ui/bin;../org.eclipse.ecf.osgi.services.discovery/bin" destdir="html/reference/api" doctitle="Eclipse Communication Framework 3.3.0" nodeprecated="false" nodeprecatedlist="false" noindex="false" nonavbar="false" notree="false" packagenames="org.eclipse.ecf.ui.hyperlink,org.eclipse.ecf.core.sharedobject.util,org.eclipse.ecf.filetransfer.ui,org.eclipse.ecf.core.sharedobject.provider,org.eclipse.ecf.example.clients,org.eclipse.ecf.presence.im,org.eclipse.ecf.ui.actions,org.eclipse.ecf.telephony.call.ui.actions,org.eclipse.ecf.core.provider,org.eclipse.ecf.discovery.service,org.eclipse.ecf.presence.bot,org.eclipse.ecf.provider.zookeeper,org.eclipse.ecf.provider.remoteservice,org.eclipse.ecf.core.sharedobject.events,org.eclipse.ecf.provider.jslp.identity,org.eclipse.ecf.remoteservice.soap.identity,org.eclipse.ecf.telephony.call.events,org.eclipse.ecf.presence.collab.ui,org.eclipse.ecf.core.identity,org.eclipse.ecf.provider.remoteservice.generic,org.eclipse.ecf.remoteservice.soap.client,org.eclipse.ecf.docshare,org.eclipse.ecf.provider.irc.bot,org.eclipse.ecf.presence.collab.ui.url,org.eclipse.ecf.remoteservice.rest,org.eclipse.ecf.presence.roster,org.eclipse.ecf.core.events,org.eclipse.ecf.provider.zookeeper.node.internal,org.eclipse.ecf.discovery.ui.model,org.eclipse.ecf.provider.discovery,org.eclipse.ecf.provider.filetransfer.events.socket,org.eclipse.ecf.provider.generic.gmm,org.eclipse.ecf.examples.remoteservices.hello,org.eclipse.ecf.presence.collab.ui.screencapture,org.eclipse.ecf.provider.zookeeper.core,org.eclipse.ecf.provider.filetransfer.outgoing,org.eclipse.ecf.filetransfer.events,org.eclipse.ecf.datashare.service,org.eclipse.ecf.filetransfer.ui.actions,org.eclipse.ecf.core.sharedobject,org.eclipse.ecf.filetransfer.events.socket,org.eclipse.ecf.sync.doc,org.eclipse.ecf.ui.util,org.eclipse.ecf.core.sharedobject.security,org.eclipse.ecf.provider.zookeeper.core.internal,org.eclipse.ecf.remoteservice.client,org.eclipse.ecf.provider.filetransfer.retrieve,org.eclipse.ecf.core.user,org.eclipse.ecf.presence.chatroom,org.eclipse.ecf.provider.filetransfer.identity,org.eclipse.ecf.remoteservices.ui,org.eclipse.ecf.provider.generic,org.eclipse.ecf.presence.ui.dnd,org.eclipse.ecf.presence.bot.application,org.eclipse.ecf.provider.comm,org.eclipse.ecf.ui.screencapture,org.eclipse.ecf.presence.search.message,org.eclipse.ecf.provider.jslp.container,org.eclipse.ecf.provider.ui.wizards,org.eclipse.ecf.ui.dialogs,org.eclipse.ecf.ui.wizards,org.eclipse.ecf.presence.history,org.eclipse.ecf.presence.collab.ui.view,org.eclipse.ecf.core.start,org.eclipse.ecf.osgi.services.distribution,org.eclipse.ecf.docshare.messages,org.eclipse.ecf.provider.filetransfer.browse,org.eclipse.ecf.remoteservice.rest.util,org.eclipse.ecf.provider.localdiscovery,org.eclipse.ecf.core.security,org.eclipse.ecf.protocol.bittorrent,org.eclipse.ecf.discovery.ui.model.resource,org.eclipse.ecf.provider.irc.bot.handler,org.eclipse.ecf.remoteservice.rest.client,org.eclipse.ecf.presence.ui.menu,org.eclipse.ecf.protocol.msn.events,org.eclipse.ecf.presence.search,org.eclipse.ecf.provider.zookeeper.util,org.eclipse.ecf.ui,org.eclipse.ecf.provider.comm.tcp,org.eclipse.ecf.protocol.msn,org.eclipse.ecf.remoteservice.util.tracker,org.eclipse.ecf.presence.bot.impl,org.eclipse.ecf.presence.ui,org.eclipse.ecf.storage,org.eclipse.ecf.remoteservice.eventadmin,org.eclipse.ecf.filetransfer.events.socketfactory,org.eclipse.ecf.presence.ui.chatroom,org.eclipse.ecf.server.generic,org.eclipse.ecf.provider.xmpp.identity,org.eclipse.ecf.docshare.menu,org.eclipse.ecf.datashare.events,org.eclipse.ecf.provider.datashare.nio,org.eclipse.ecf.example.clients.applications,org.eclipse.ecf.provider.jmdns.identity,org.eclipse.ecf.telephony.call.service,org.eclipse.ecf.filetransfer.identity,org.eclipse.ecf.telephony.call,org.eclipse.ecf.server.generic.app,org.eclipse.ecf.datashare,org.eclipse.ecf.provider.xmpp,org.eclipse.ecf.discovery.ui.model.provider,org.eclipse.ecf.provider.r_osgi.identity,org.eclipse.ecf.remoteservice.util,org.eclipse.ecf.sync,org.eclipse.ecf.discovery.ui.model.impl,org.eclipse.ecf.presence.collab.ui.console,org.eclipse.ecf.provider.jmdns.container,org.eclipse.ecf.datashare.mergeable,org.eclipse.ecf.discovery.identity,org.eclipse.ecf.provider.util,org.eclipse.ecf.presence.ui.roster,org.eclipse.ecf.remoteservice.rest.identity,org.eclipse.ecf.examples.provider.trivial,org.eclipse.ecf.filetransfer.service,org.eclipse.ecf.discovery.ui.model.util,org.eclipse.ecf.presence.service,org.eclipse.ecf.core.util,org.eclipse.ecf.provider.filetransfer.httpclient,org.eclipse.ecf.provider.filetransfer.util,org.eclipse.ecf.core.jobs,org.eclipse.ecf.osgi.services.discovery.local,org.eclipse.ecf.remoteservice.events,org.eclipse.ecf.core.status" source="1.5" sourcefiles="../org.eclipse.ecf.discovery.ui/src/org/eclipse/ecf/discovery/ui/DiscoveryPropertyTesterUtil.java,../org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IRemoteFileSystemListener.java,../org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IPresenceContainerAdapter.java,../org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IRemoteServiceRegistration.java,../org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/RemoteServiceHelper.java,../org.eclipse.ecf/src/org/eclipse/ecf/core/ContainerTypeDescription.java,../org.eclipse.ecf/src/org/eclipse/ecf/core/IContainerManager.java,../org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/ServiceProperties.java,../org.eclipse.ecf/src/org/eclipse/ecf/core/IContainerFactory.java,../org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IRemoteFile.java,../org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/Constants.java,../org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/IServiceProperties.java,../org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/FileTransferJob.java,../org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IFileTransferPausable.java,../org.eclipse.ecf.server/src/org/eclipse/ecf/server/IServiceClientManager.java,../org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IRemoteServiceReference.java,../org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/UserCancelledException.java,../org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/BrowseFileTransferException.java,../org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/AbstractDiscoveryContainerAdapter.java,../org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IIncomingFileTransferRequestListener.java,../org.eclipse.ecf/src/org/eclipse/ecf/core/AbstractContainerAdapterFactory.java,../org.eclipse.ecf.provider.datashare/src/org/eclipse/ecf/provider/datashare/SharedObjectDatashareContainerAdapter.java,../org.eclipse.ecf.provider.datashare/src/org/eclipse/ecf/provider/datashare/BaseChannel.java,../org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/AbstractRemoteCallListener.java,../org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IRemoteServiceProxy.java,../org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IIncomingFileTransfer.java,../org.eclipse.ecf/src/org/eclipse/ecf/core/ContainerCreateException.java,../org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/IServiceEvent.java,../org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/IServiceTypeListener.java,../org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IRemoteFilter.java,../org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IFileTransferRateControl.java,../org.eclipse.ecf.provider.datashare/src/org/eclipse/ecf/provider/datashare/DatashareContainer.java,../org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/RemoteServiceID.java,../org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IRemoteFileAttributes.java,../org.eclipse.ecf/src/org/eclipse/ecf/core/IContainerManagerListener.java,../org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/IServiceInfo.java,../org.eclipse.ecf.osgi.services.discovery/src/org/eclipse/ecf/osgi/services/discovery/IProxyDiscoveryListener.java,../org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/RemoteServiceContainer.java,../org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IFileRangeSpecification.java,../org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IIMMessageEvent.java,../org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IFileTransferInfo.java,../org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/Presence.java,../org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IPresenceSender.java,../org.eclipse.ecf/src/org/eclipse/ecf/core/IReliableContainer.java,../org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IRemoteFileInfo.java,../org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/ServiceContainerEvent.java,../org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IRemoteServiceListener.java,../org.eclipse.ecf.osgi.services.discovery/src/org/eclipse/ecf/osgi/services/discovery/RemoteServiceEndpointDescription.java,../org.eclipse.ecf/src/org/eclipse/ecf/core/ContainerAuthenticationException.java,../org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/DiscoveryContainerConfig.java,../org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IRemoteCallListener.java,../org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IPresenceListener.java,../org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IFileTransferRunnable.java,../org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IMMessage.java,../org.eclipse.ecf.discovery.ui/src/org/eclipse/ecf/discovery/ui/DiscoveryHandlerUtil.java,../org.eclipse.ecf.osgi.services.discovery/src/org/eclipse/ecf/osgi/services/discovery/RemoteServicePublication.java,../org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IRemoteCall.java,../org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/InvalidFileRangeSpecificationException.java,../org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IFileTransferListener.java,../org.eclipse.ecf/src/org/eclipse/ecf/core/BaseContainer.java,../org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IAccountManager.java,../org.eclipse.ecf.provider.datashare/src/org/eclipse/ecf/provider/datashare/DatashareContainerAdapterFactory.java,../org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/SendFileTransferException.java,../org.eclipse.ecf/src/org/eclipse/ecf/core/ContainerFactory.java,../org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IRetrieveFileTransferContainerAdapter.java,../org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/ServiceTypeContainerEvent.java,../org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IRemoteServiceID.java,../org.eclipse.ecf.provider.datashare/src/org/eclipse/ecf/provider/datashare/DatashareContainerConfig.java,../org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IncomingFileTransferException.java,../org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IRemoteServiceContainer.java,../org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/ISendFileTransferContainerAdapter.java,../org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IIMMessageListener.java,../org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/IServiceListener.java,../org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IRemoteFileSystemRequest.java,../org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IPresence.java,../org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/RemoteFileSystemException.java,../org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/IServiceTypeEvent.java,../org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/IDiscoveryContainerAdapter.java,../org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/AbstractPresenceContainer.java,../org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IOutgoingFileTransfer.java,../org.eclipse.ecf/src/org/eclipse/ecf/core/AbstractContainer.java,../org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/ServiceInfo.java,../org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IFileTransfer.java,../org.eclipse.ecf.provider.datashare/src/org/eclipse/ecf/provider/datashare/DatashareContainerAdapter.java,../org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IRemoteService.java,../org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IIMMessage.java,../org.eclipse.ecf/src/org/eclipse/ecf/core/IContainerListener.java,../org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/FileTransferInfo.java,../org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/IContainerServiceInfoAdapter.java,../org.eclipse.ecf.server/src/org/eclipse/ecf/server/IServiceClient.java,../org.eclipse.ecf.server/src/org/eclipse/ecf/server/IServiceHost.java,../org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IRemoteServiceContainerAdapter.java,../org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IRemoteFileSystemBrowserContainerAdapter.java,../org.eclipse.ecf/src/org/eclipse/ecf/core/IContainer.java,../org.eclipse.ecf.osgi.services.discovery/src/org/eclipse/ecf/osgi/services/discovery/IRemoteServiceEndpointDescription.java,../org.eclipse.ecf.osgi.services.discovery/src/org/eclipse/ecf/osgi/services/discovery/IHostDiscoveryListener.java,../org.eclipse.ecf/src/org/eclipse/ecf/core/ContainerConnectException.java" sourcepath="../org.eclipse.ecf.provider.jslp/src;../org.eclipse.ecf.provider.ui/src;../org.eclipse.ecf.identity/src;../org.eclipse.ecf.ui/src;../org.eclipse.ecf.presence.collab.ui/src;../org.eclipse.ecf.osgi.services.discovery/src;../org.eclipse.ecf.examples.provider.trivial/src;../org.eclipse.ecf.storage/src;../org.eclipse.ecf.remoteservice.ui/src;../org.eclipse.ecf.server/src;../org.eclipse.ecf.osgi.services.discovery.local/src;../org.eclipse.ecf.provider.r_osgi/src;../org.eclipse.ecf.provider.zookeeper/src;../org.eclipse.ecf.remoteservice.eventadmin/src;../org.eclipse.ecf.protocol.bittorrent/src;../org.eclipse.ecf.provider.datashare.nio/src;../org.eclipse.ecf.osgi.services.distribution/src;../org.eclipse.ecf.provider.filetransfer/src;../org.eclipse.ecf.filetransfer.ui/src;../org.eclipse.ecf.remoteservice.rest/src;../org.eclipse.ecf.protocol.msn/src;../org.eclipse.ecf.provider.filetransfer.httpclient/src;../org.eclipse.ecf.discovery.ui/src;../org.eclipse.ecf.remoteservice/src;../org.eclipse.ecf.provider.localdiscovery/src;../org.eclipse.ecf.provider/src;../org.eclipse.ecf.datashare/src;../org.eclipse.ecf.presence.bot/src;../org.eclipse.ecf/src;../org.eclipse.ecf.discovery.ui.edit/src;../org.eclipse.ecf.presence.ui/src;../org.eclipse.ecf.telephony.call/src;../org.eclipse.ecf.sharedobject/src;../org.eclipse.ecf.sync/src;../org.eclipse.ecf.provider.discovery/src;../org.eclipse.ecf.provider.datashare/src;../org.eclipse.ecf.docshare/src;../org.eclipse.ecf.remoteservice.soap/src;../org.eclipse.ecf.discovery/src;../org.eclipse.ecf.provider.remoteservice/src;../org.eclipse.ecf.provider.jmdns/jmdns;../org.eclipse.ecf.provider.irc.bot/src;../org.eclipse.ecf.presence/src;../org.eclipse.ecf.telephony.call.ui/src;../org.eclipse.ecf.examples.remoteservices.hello/src;../org.eclipse.ecf.provider.xmpp/src;../org.eclipse.ecf.discovery.ui.model/src;../org.eclipse.ecf.example.clients/src;../org.eclipse.ecf.server.generic/src;../org.eclipse.ecf.filetransfer/src;../org.eclipse.ecf.provider.jmdns/src" splitindex="true" use="true" version="true"/>
- </target>
-</project>
diff --git a/doc/bundles/org.eclipse.ecf.doc/notices.html b/doc/bundles/org.eclipse.ecf.doc/notices.html
index 53e329900..aa1b39e98 100755
--- a/doc/bundles/org.eclipse.ecf.doc/notices.html
+++ b/doc/bundles/org.eclipse.ecf.doc/notices.html
@@ -2,18 +2,18 @@
<html>
<head>
-<meta name="copyright" content="Copyright (c) Composent, Inc., IBM Corporation, and others 2004, 2007. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
+<meta name="copyright" content="Copyright (c) Composent, Inc., IBM Corporation, and others 2004, 2020. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
- <LINK REL="STYLESHEET" HREF="book.css" CHARSET="ISO-8859-1" TYPE="text/css">
+ <LINK REL="STYLESHEET" HREF="../org.eclipse.platform.doc.user/book.css" CHARSET="ISO-8859-1" TYPE="text/css">
<title>Legal Notices</title>
</head>
<body>
-<h2>
-<a NAME="Notices"></a>Notices</h2>
+<h3>
+<a NAME="Notices"></a>Notices</h3>
<p>
-The material in this guide is Copyright (c) Composent, Inc., IBM Corporation, and others 2004, 2007.
+The material in this guide is Copyright (c) Composent, Inc., IBM Corporation, and others 2004, 2020.
</p>
<p>
<a href="about.html">Terms and conditions regarding the use of this guide.</a>
diff --git a/doc/bundles/org.eclipse.ecf.doc/plugin.properties b/doc/bundles/org.eclipse.ecf.doc/plugin.properties
index bd7f38e88..c86642039 100644
--- a/doc/bundles/org.eclipse.ecf.doc/plugin.properties
+++ b/doc/bundles/org.eclipse.ecf.doc/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 Documentation
plugin.provider=Eclipse.org - ECF
diff --git a/doc/bundles/org.eclipse.ecf.doc/plugin.xml b/doc/bundles/org.eclipse.ecf.doc/plugin.xml
index 016d61e6c..67e9d3510 100644
--- a/doc/bundles/org.eclipse.ecf.doc/plugin.xml
+++ b/doc/bundles/org.eclipse.ecf.doc/plugin.xml
@@ -10,17 +10,11 @@
<!-- ============================================================================= -->
<extension point="org.eclipse.help.toc">
<toc file="toc.xml" primary="true"/>
- <toc file="topics_Tutorials.xml"/>
+ <!-- Ignore the warning for tocjavadoc.xml, this file is generated by tycho -->
+ <toc file="tocjavadoc.xml"/>
<toc file="topics_Reference.xml"/>
- <toc file="topics_Extpoint.xml"/>
- <toc
- file="tocapi.xml"
- primary="false">
- </toc>
- <toc
- file="topics_Reference_RemoteServices.xml"
- primary="false">
- </toc>
+ <toc file="topics_Resources.xml"/>
+ <index path="index"/>
</extension>
diff --git a/doc/bundles/org.eclipse.ecf.doc/pom.xml b/doc/bundles/org.eclipse.ecf.doc/pom.xml
index 63d99a7d3..23f36df02 100644
--- a/doc/bundles/org.eclipse.ecf.doc/pom.xml
+++ b/doc/bundles/org.eclipse.ecf.doc/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.eclipse.ecf</groupId>
@@ -10,6 +10,95 @@
</parent>
<groupId>org.eclipse.ecf</groupId>
<artifactId>org.eclipse.ecf.doc</artifactId>
- <version>1.3.201-SNAPSHOT</version>
+ <version>1.3.300-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho.extras</groupId>
+ <artifactId>tycho-document-bundle-plugin</artifactId>
+ <version>${tycho-version}</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>javadoc</goal>
+ </goals>
+ <configuration>
+ <javadocOptions>
+ <additionalArguments>
+ <additionalArgument>-Xdoclint:none</additionalArgument>
+ <additionalArgument>-splitindex</additionalArgument>
+ <additionalArgument>-use</additionalArgument>
+ <additionalArgument>-doctitle "Eclipse Communication Framework (ECF) 3.14.8 API"</additionalArgument>
+ <additionalArgument>-windowtitle "Eclipse Communication Framework (ECF) 3.14.8 API"</additionalArgument>
+ <additionalArgument>-link https://docs.oracle.com/javase/8/docs/api/</additionalArgument>
+ <additionalArgument>-link https://osgi.org/javadoc/r6/core/</additionalArgument>
+ <additionalArgument>-tag 'noimplement:a:Restriction:'</additionalArgument>
+ <additionalArgument>-tag 'noextend:a:Restriction:'</additionalArgument>
+ <additionalArgument>-tag 'noreference:a:Restriction:'</additionalArgument>
+ <additionalArgument>-tag 'noinstantiate:a:Restriction:'</additionalArgument>
+ <additionalArgument>-tag 'nooverride:a:Restriction:'</additionalArgument>
+ <additionalArgument>-bottom "Copyright &amp;#169; ${project.inceptionYear}&amp;#x2013;2020 &lt;a href=\"${project.organization.url}\"&gt;${project.organization.name}&lt;/a&gt;. All rights reserved."</additionalArgument>
+ </additionalArguments>
+ <excludes>
+ <exclude>ch.*</exclude>
+ <exclude>*.internal.*</exclude>
+ <exclude>*.internal</exclude>
+ <exclude>org.eclipse.ecf.core.start</exclude>
+ <exclude>org.eclipse.ecf.core.user</exclude>
+ <exclude>org.eclipse.ecf.docshare*</exclude>
+ <exclude>org.eclipse.ecf.datashare*</exclude>
+ <exclude>org.eclipse.ecf.presence*</exclude>
+ <exclude>org.eclipse.ecf.storage</exclude>
+ <exclude>org.eclipse.ecf.sync</exclude>
+ </excludes>
+ </javadocOptions>
+ <outputDirectory>${project.basedir}/html/reference/api</outputDirectory>
+ <tocFile>${project.basedir}/tocjavadoc.xml</tocFile>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho.extras</groupId>
+ <artifactId>tycho-eclipserun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>build-schema-docs</id>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>eclipse-run</goal>
+ </goals>
+ <configuration>
+ <appArgLine>-consolelog -data target/workspace -application org.eclipse.ant.core.antRunner -quiet -buildfile buildschemadocs.xml
+ </appArgLine>
+ <dependencies>
+ <dependency>
+ <artifactId>org.eclipse.ant.core</artifactId>
+ <type>eclipse-plugin</type>
+ </dependency>
+ <dependency>
+ <artifactId>org.apache.ant</artifactId>
+ <type>eclipse-plugin</type>
+ </dependency>
+ <dependency>
+ <artifactId>org.eclipse.pde.build</artifactId>
+ <type>eclipse-plugin</type>
+ </dependency>
+ <dependency>
+ <artifactId>org.eclipse.pde.core</artifactId>
+ <type>eclipse-plugin</type>
+ </dependency>
+ <dependency>
+ <artifactId>org.eclipse.help.base</artifactId>
+ <type>eclipse-plugin</type>
+ </dependency>
+ </dependencies>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/doc/bundles/org.eclipse.ecf.doc/schema.xml b/doc/bundles/org.eclipse.ecf.doc/schema.xml
deleted file mode 100644
index e3782d1ea..000000000
--- a/doc/bundles/org.eclipse.ecf.doc/schema.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<project default="schema">
-
- <property name="dest.path" value="html/reference/extension-points"/>
-
- <target name="org.eclipse.ecf.identity">
- <eclipse.convertPath property="org.eclipse.ecf.identity.manifest" resourcePath="/org.eclipse.ecf.identity/plugin.xml"/>
- <antcall target="_plugin">
- <param name="manifest.path" value="${org.eclipse.ecf.identity.manifest}"/>
- </antcall>
- </target>
-
- <target name="org.eclipse.ecf">
- <eclipse.convertPath property="org.eclipse.ecf.manifest" resourcePath="/org.eclipse.ecf/plugin.xml"/>
- <antcall target="_plugin">
- <param name="manifest.path" value="${org.eclipse.ecf.manifest}"/>
- </antcall>
- </target>
-
- <target name="org.eclipse.ecf.sharedobject">
- <eclipse.convertPath property="org.eclipse.ecf.sharedobject.manifest" resourcePath="/org.eclipse.ecf.sharedobject/plugin.xml"/>
- <antcall target="_plugin">
- <param name="manifest.path" value="${org.eclipse.ecf.sharedobject.manifest}"/>
- </antcall>
- </target>
-
-
- <target name="org.eclipse.ecf.provider">
- <eclipse.convertPath property="org.eclipse.ecf.provider.manifest" resourcePath="/org.eclipse.ecf.provider/plugin.xml"/>
- <antcall target="_plugin">
- <param name="manifest.path" value="${org.eclipse.ecf.provider.manifest}"/>
- </antcall>
- </target>
-
- <target name="org.eclipse.ecf.provider.filetransfer">
- <eclipse.convertPath property="org.eclipse.ecf.provider.filetransfer.manifest" resourcePath="/org.eclipse.ecf.provider.filetransfer/plugin.xml"/>
- <antcall target="_plugin">
- <param name="manifest.path" value="${org.eclipse.ecf.provider.filetransfer.manifest}"/>
- </antcall>
- </target>
-
- <target name="org.eclipse.ecf.presence.bot">
- <eclipse.convertPath property="org.eclipse.ecf.provider.manifest" resourcePath="/org.eclipse.ecf.presence.bot/plugin.xml"/>
- <antcall target="_plugin">
- <param name="manifest.path" value="${org.eclipse.ecf.provider.manifest}"/>
- </antcall>
- </target>
-
-
- <target name="org.eclipse.ecf.server.generic">
- <eclipse.convertPath property="org.eclipse.ecf.server.generic.manifest" resourcePath="/org.eclipse.ecf.server.generic/plugin.xml"/>
- <antcall target="_plugin">
- <param name="manifest.path" value="${org.eclipse.ecf.server.generic.manifest}"/>
- </antcall>
- </target>
-
- <target name="org.eclipse.ecf.presence.ui">
- <eclipse.convertPath property="org.eclipse.ecf.presence.ui.manifest" resourcePath="/org.eclipse.ecf.presence.ui/plugin.xml"/>
- <antcall target="_plugin">
- <param name="manifest.path" value="${org.eclipse.ecf.presence.ui.manifest}"/>
- </antcall>
- </target>
-
- <target name="org.eclipse.ecf.ui">
- <eclipse.convertPath property="org.eclipse.ecf.ui.manifest" resourcePath="/org.eclipse.ecf.ui/plugin.xml"/>
- <antcall target="_plugin">
- <param name="manifest.path" value="${org.eclipse.ecf.ui.manifest}"/>
- </antcall>
- </target>
-
- <target name="org.eclipse.ecf.discovery.ui">
- <eclipse.convertPath property="org.eclipse.ecf.discovery.ui.manifest" resourcePath="/org.eclipse.ecf.discovery.ui/plugin.xml"/>
- <antcall target="_plugin">
- <param name="manifest.path" value="${org.eclipse.ecf.discovery.ui.manifest}"/>
- </antcall>
- </target>
-
- <target name="schema" depends="org.eclipse.ecf,org.eclipse.ecf.identity,org.eclipse.ecf.sharedobject,org.eclipse.ecf.provider,org.eclipse.ecf.provider.filetransfer,org.eclipse.ecf.server.generic,org.eclipse.ecf.ui,org.eclipse.ecf.presence.ui,org.eclipse.ecf.presence.bot,org.eclipse.ecf.discovery.ui">
- <!-- unfortunately, the task generates local filesystem references... fix them! -->
- <property name="cssurl" value="${osgi.install.area}plugins/org.eclipse.platform.doc.isv_3.1.0"/>
- <replace dir="${dest.path}" token="${cssurl}" value="../../../../org.eclipse.platform.doc.isv" includes="*.html"/>
- </target>
-
- <target name="_plugin">
- <pde.convertSchemaToHTML manifest="${manifest.path}" destination="${dest.path}"/>
- </target>
-
- <target name="clean">
- <delete>
- <fileset dir="${dest.path}" includes="*.html"/>
- </delete>
- </target>
-</project> \ No newline at end of file
diff --git a/doc/bundles/org.eclipse.ecf.doc/toc.xml b/doc/bundles/org.eclipse.ecf.doc/toc.xml
index 0407b0dc0..2e68527a8 100644
--- a/doc/bundles/org.eclipse.ecf.doc/toc.xml
+++ b/doc/bundles/org.eclipse.ecf.doc/toc.xml
@@ -2,12 +2,14 @@
<?NLS TYPE="org.eclipse.help.toc"?>
<toc label="ECF Remote Services Developer Guide" link_to="toc.xml">
- <topic label="New and Noteworthy" href="http://www.eclipse.org/ecf/NewAndNoteworthy.html"/>
- <topic label="Download and Install" href="http://www.eclipse.org/ecf/downloads.php"/>
- <topic label="Remote Services" href="http://wiki.eclipse.org/ECF">
- <link toc="topics_Reference_RemoteServices.xml"/>
- </topic>
- <topic label="Resources">
- <link toc="topics_Reference.xml"/>
- </topic>
+ <topic label="New and Noteworthy" href="https://www.eclipse.org/ecf/NewAndNoteworthy.html"/>
+ <topic label="Download and Install" href="https://www.eclipse.org/ecf/downloads.php"/>
+ <topic label="Tutorials, Examples, and Documentation" href="https://wiki.eclipse.org/Eclipse_Communication_Framework_Project"/>
+ <topic label="Reference">
+ <link toc="topics_Reference.xml"/>
+ </topic>
+ <topic label="Other Resources">
+ <link toc="topics_Resources.xml"/>
+ </topic>
+ <topic label="Legal" href="notices.html"/>
</toc>
diff --git a/doc/bundles/org.eclipse.ecf.doc/tocapi.xml b/doc/bundles/org.eclipse.ecf.doc/tocapi.xml
deleted file mode 100644
index 338422be0..000000000
--- a/doc/bundles/org.eclipse.ecf.doc/tocapi.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-
-<toc label="API JavaDoc">
- <topic label="Remote Services API">
-<topic label="ECF Core API">
-<topic label="org.eclipse.ecf.core" href="http://download.eclipse.org/rt/ecf/latest/javadoc/org/eclipse/ecf/core/package-summary.html"/>
-<topic label="org.eclipse.ecf.core.events" href="http://download.eclipse.org/rt/ecf/latest/javadoc/org/eclipse/ecf/core/events/package-summary.html"/>
-<topic label="org.eclipse.ecf.core.identity" href="http://download.eclipse.org/rt/ecf/latest/javadoc/org/eclipse/ecf/core/identity/package-summary.html"/>
-<topic label="org.eclipse.ecf.core.jobs" href="http://download.eclipse.org/rt/ecf/latest/javadoc/org/eclipse/ecf/core/jobs/package-summary.html"/>
-<topic label="org.eclipse.ecf.core.provider" href="http://download.eclipse.org/rt/ecf/latest/javadoc/org/eclipse/ecf/core/provider/package-summary.html"/>
-<topic label="org.eclipse.ecf.core.security" href="http://download.eclipse.org/rt/ecf/latest/javadoc/org/eclipse/ecf/core/security/package-summary.html"/>
-<topic label="org.eclipse.ecf.core.start" href="http://download.eclipse.org/rt/ecf/latest/javadoc/org/eclipse/ecf/core/start/package-summary.html"/>
-<topic label="org.eclipse.ecf.core.status" href="http://download.eclipse.org/rt/ecf/latest/javadoc/org/eclipse/ecf/core/status/package-summary.html"/>
-<topic label="org.eclipse.ecf.core.util" href="http://download.eclipse.org/rt/ecf/latest/javadoc/org/eclipse/ecf/core/util/package-summary.html"/>
-<topic label="org.eclipse.ecf.core.util.reflection" href="http://download.eclipse.org/rt/ecf/latest/javadoc/org/eclipse/ecf/core/util/reflection/package-summary.html"/>
-</topic>
-<topic label="Discovery API">
-<topic label="org.eclipse.ecf.discovery" href="http://download.eclipse.org/rt/ecf/latest/javadoc/org/eclipse/ecf/discovery/package-summary.html"/>
-<topic label="org.eclipse.ecf.discovery.identity" href="http://download.eclipse.org/rt/ecf/latest/javadoc/org/eclipse/ecf/discovery/identity/package-summary.html"/>
-<topic label="org.eclipse.ecf.discovery.service" href="http://download.eclipse.org/rt/ecf/latest/javadoc/org/eclipse/ecf/discovery/service/package-summary.html"/>
-<topic label="org.eclipse.ecf.provider.discovery" href="http://download.eclipse.org/rt/ecf/latest/javadoc/org/eclipse/ecf/provider/discovery/package-summary.html"/>
-</topic>
-<topic label="Remote Service API">
-<topic label="org.eclipse.ecf.remoteservice" href="http://download.eclipse.org/rt/ecf/latest/javadoc/org/eclipse/ecf/remoteservice/package-summary.html"/>
-<topic label="org.eclipse.ecf.remoteservice.client" href="http://download.eclipse.org/rt/ecf/latest/javadoc/org/eclipse/ecf/remoteservice/client/package-summary.html"/>
-<topic label="org.eclipse.ecf.remoteservice.events" href="http://download.eclipse.org/rt/ecf/latest/javadoc/org/eclipse/ecf/remoteservice/events/package-summary.html"/>
-<topic label="org.eclipse.ecf.remoteservice.provider" href="http://download.eclipse.org/rt/ecf/latest/javadoc/org/eclipse/ecf/remoteservice/provider/package-summary.html"/>
-<topic label="org.eclipse.ecf.remoteservice.util" href="http://download.eclipse.org/rt/ecf/latest/javadoc/org/eclipse/ecf/remoteservice/util/package-summary.html"/>
-<topic label="org.eclipse.ecf.remoteservice.util.tracker" href="http://download.eclipse.org/rt/ecf/latest/javadoc/org/eclipse/ecf/remoteservice/util/tracker/package-summary.html"/>
-</topic>
-<topic label="OSGi Remote Service Admin API">
-<topic label="org.eclipse.ecf.osgi.services.remoteserviceadmin" href="http://download.eclipse.org/rt/ecf/latest/javadoc/org/eclipse/ecf/osgi/services/remoteserviceadmin/package-summary.html"/>
-<topic label="org.osgi.service.remoteserviceadmin" href="http://download.eclipse.org/rt/ecf/latest/javadoc/org/osgi/service/remoteserviceadmin/package-summary.html"/>
-</topic>
-<topic label="Distributed EventAdmin API">
-<topic label="org.eclipse.ecf.remoteservice.eventadmin" href="http://download.eclipse.org/rt/ecf/latest/javadoc/org/eclipse/ecf/remoteservice/eventadmin/package-summary.html"/>
-<topic label="org.eclipse.ecf.remoteservice.eventadmin.serialization" href="http://download.eclipse.org/rt/ecf/latest/javadoc/org/eclipse/ecf/remoteservice/eventadmin/serialization/package-summary.html"/>
-</topic>
-</topic>
-</toc>
diff --git a/doc/bundles/org.eclipse.ecf.doc/topics_Extpoint.xml b/doc/bundles/org.eclipse.ecf.doc/topics_Extpoint.xml
deleted file mode 100644
index 38611e2ab..000000000
--- a/doc/bundles/org.eclipse.ecf.doc/topics_Extpoint.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-<toc label="Extension Points">
-<topic label="org.eclipse.ecf.container" href="html/reference/extension-points/org_eclipse_ecf_container.html"/>
-<topic label="org.eclipse.ecf.containerFactory" href="html/reference/extension-points/org_eclipse_ecf_containerFactory.html"/>
-<topic label="org.eclipse.ecf.identity.namespace" href="html/reference/extension-points/org_eclipse_ecf_identity_namespace.html"/>
-<topic label="org.eclipse.ecf.discovery.ui.serviceAccessHandler" href="html/reference/extension-points/org_eclipse_ecf_discovery_ui_serviceAccessHandler.html"/>
-<topic label="org.eclipse.ecf.provider.filetransfer.retrieveFileTransferFactory" href="html/reference/extension-points/org_eclipse_ecf_provider_filetransfer_retrieveFileTransferProtocolFactory.html"/>
-<topic label="org.eclipse.ecf.provider.filetransfer.sendFileTransferFactory" href="html/reference/extension-points/org_eclipse_ecf_provider_filetransfer_sendFileTransferProtocolFactory.html"/>
-<topic label="org.eclipse.ecf.provider.filetransfer.browseFileTransferFactory" href="html/reference/extension-points/org_eclipse_ecf_provider_filetransfer_browseFileTransferProtocolFactory.html"/>
-
-</toc>
diff --git a/doc/bundles/org.eclipse.ecf.doc/topics_GettingStarted.xml b/doc/bundles/org.eclipse.ecf.doc/topics_GettingStarted.xml
deleted file mode 100644
index bd0d9898d..000000000
--- a/doc/bundles/org.eclipse.ecf.doc/topics_GettingStarted.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
-
-<toc label="Getting Started">
- <topic label="Download" href="http://www.eclipse.org/ecf/downloads.php"/>
- <topic label="Remote Services Tutorials, Examples, and Documentation" href="http://wiki.eclipse.org/ECF"/>
-</toc>
diff --git a/doc/bundles/org.eclipse.ecf.doc/topics_Reference.xml b/doc/bundles/org.eclipse.ecf.doc/topics_Reference.xml
index 693d20324..f4ce2f2b3 100644
--- a/doc/bundles/org.eclipse.ecf.doc/topics_Reference.xml
+++ b/doc/bundles/org.eclipse.ecf.doc/topics_Reference.xml
@@ -1,10 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?>
<?NLS TYPE="org.eclipse.help.toc"?>
-<toc label="Reference" link_to="toc.xml#reference">
- <topic label="ECF Homepage" href="http://www.eclipse.org/ecf"/>
- <topic label="Mailing List" href="https://dev.eclipse.org/mailman/listinfo/ecf-dev"/>
- <topic label="Newsgroup" href="http://www.eclipse.org/forums/index.php"/>
- <topic label="Blog" href="http://eclipseecf.blogspot.com/"/>
- <topic label="Project Dashboard" href="https://projects.eclipse.org/projects/rt.ecf"/>
+<toc label="Reference">
+ <link toc="tocjavadoc.xml"/>
+
+ <topic label="Extension Points Reference">
+ <topic label="org.eclipse.ecf.containerFactory" href="html/reference/extension-points/org_eclipse_ecf_containerFactory.html" />
+ <topic label="org.eclipse.ecf.container" href="html/reference/extension-points/org_eclipse_ecf_container.html" />
+ <topic label="org.eclipse.ecf.filetransfer.urlStreamHandlerService" href="html/reference/extension-points/org_eclipse_ecf_filetransfer_urlStreamHandlerService.html" />
+ <topic label="org.eclipse.ecf.identity.namespace" href="html/reference/extension-points/org_eclipse_ecf_identity_namespace.html" />
+ <topic label="org.eclipse.ecf.presence.bot.chatRoomMessageHandler" href="html/reference/extension-points/org_eclipse_ecf_presence_bot_chatRoomMessageHandler.html" />
+ <topic label="org.eclipse.ecf.presence.bot.chatRoomRobot" href="html/reference/extension-points/org_eclipse_ecf_presence_bot_chatRoomRobot.html" />
+ <topic label="org.eclipse.ecf.presence.bot.imMessageHandler" href="html/reference/extension-points/org_eclipse_ecf_presence_bot_imMessageHandler.html" />
+ <topic label="org.eclipse.ecf.presence.bot.imRobot" href="html/reference/extension-points/org_eclipse_ecf_presence_bot_imRobot.html" />
+ <topic label="org.eclipse.ecf.presence.ui.rosterViewerDropTarget" href="html/reference/extension-points/org_eclipse_ecf_presence_ui_rosterViewerDropTarget.html" />
+ <topic label="org.eclipse.ecf.provider.filetransfer.browseFileTransferProtocolFactory" href="html/reference/extension-points/org_eclipse_ecf_provider_filetransfer_browseFileTransferProtocolFactory.html" />
+ <topic label="org.eclipse.ecf.provider.filetransfer.retrieveFileTransferProtocolFactory" href="html/reference/extension-points/org_eclipse_ecf_provider_filetransfer_retrieveFileTransferProtocolFactory.html" />
+ <topic label="org.eclipse.ecf.provider.filetransfer.sendFileTransferProtocolFactory" href="html/reference/extension-points/org_eclipse_ecf_provider_filetransfer_sendFileTransferProtocolFactory.html" />
+ <topic label="org.eclipse.ecf.remoteservice.ui.servicesview" href="html/reference/extension-points/org_eclipse_ecf_remoteservice_ui_servicesview.html" />
+ <topic label="org.eclipse.ecf.server.generic.configuration" href="html/reference/extension-points/org_eclipse_ecf_server_generic_configuration.html" />
+ <topic label="org.eclipse.ecf.sharedobject.sharedObjectFactory" href="html/reference/extension-points/org_eclipse_ecf_sharedobject_sharedObjectFactory.html" />
+ <topic label="org.eclipse.ecf.start" href="html/reference/extension-points/org_eclipse_ecf_start.html" />
+ <topic label="org.eclipse.ecf.ui.configurationWizards" href="html/reference/extension-points/org_eclipse_ecf_ui_configurationWizards.html" />
+ <topic label="org.eclipse.ecf.ui.connectWizards" href="html/reference/extension-points/org_eclipse_ecf_ui_connectWizards.html" />
+ </topic>
</toc>
diff --git a/doc/bundles/org.eclipse.ecf.doc/topics_Reference_RemoteServices.xml b/doc/bundles/org.eclipse.ecf.doc/topics_Reference_RemoteServices.xml
deleted file mode 100644
index d28b587b0..000000000
--- a/doc/bundles/org.eclipse.ecf.doc/topics_Reference_RemoteServices.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
-<toc label="Remote Services">
- <topic label="See ECF Wiki Page for Latest" href="wiki.eclipse.org/ECF"/>
- <topic label="JavaDoc">
- <link toc="tocapi.xml"/>
- </topic>
-</toc>
diff --git a/doc/bundles/org.eclipse.ecf.doc/topics_Resources.xml b/doc/bundles/org.eclipse.ecf.doc/topics_Resources.xml
new file mode 100644
index 000000000..02d84119d
--- /dev/null
+++ b/doc/bundles/org.eclipse.ecf.doc/topics_Resources.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?NLS TYPE="org.eclipse.help.toc"?>
+
+<toc label="Other Resources">
+ <topic label="ECF Homepage" href="https://www.eclipse.org/ecf"/>
+ <topic label="Mailing List" href="https://dev.eclipse.org/mailman/listinfo/ecf-dev"/>
+ <topic label="Newsgroup" href="https://www.eclipse.org/forums/index.php"/>
+ <topic label="Blog" href="https://eclipseecf.blogspot.com/"/>
+ <topic label="Project Dashboard" href="https://projects.eclipse.org/projects/rt.ecf"/>
+</toc>
diff --git a/doc/bundles/org.eclipse.ecf.doc/topics_Samples.xml b/doc/bundles/org.eclipse.ecf.doc/topics_Samples.xml
deleted file mode 100644
index e90c67c86..000000000
--- a/doc/bundles/org.eclipse.ecf.doc/topics_Samples.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
-
-<toc label="Samples" link_to="toc.xml#samples">
-</toc>
diff --git a/doc/bundles/org.eclipse.ecf.doc/topics_Tutorials.xml b/doc/bundles/org.eclipse.ecf.doc/topics_Tutorials.xml
deleted file mode 100644
index 6455f64e8..000000000
--- a/doc/bundles/org.eclipse.ecf.doc/topics_Tutorials.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
-
-<toc label="Tutorials" link_to="toc.xml#tutorials">
- <topic label="See ECF Wiki page for latest tutorials" href="https://wiki.eclipse.org/Eclipse_Communication_Framework_Project#Tutorials"/>
-</toc>
diff --git a/doc/bundles/org.eclipse.ecf.tutorial/plugin.properties b/doc/bundles/org.eclipse.ecf.tutorial/plugin.properties
index 5bf45473d..bd14e5858 100644
--- a/doc/bundles/org.eclipse.ecf.tutorial/plugin.properties
+++ b/doc/bundles/org.eclipse.ecf.tutorial/plugin.properties
@@ -1,13 +1,12 @@
-/****************************************************************************
-* Copyright (c) 2004 Composent, Inc. and others.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
-*
-* Contributors:
-* Composent, Inc. - initial API and implementation
-*****************************************************************************/
+############################################################################
+# Copyright (c) 2004 Composent, Inc. and others.
+#
+# This program and the accompanying materials are made
+# available under the terms of the Eclipse Public License 2.0
+# which is available at https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+############################################################################
plugin.name=ECF Tutorial
plugin.provider=Eclipse.org
diff --git a/doc/bundles/org.eclipse.ecf.tutorial/src/org/eclipse/ecf/tutorial/Activator.java b/doc/bundles/org.eclipse.ecf.tutorial/src/org/eclipse/ecf/tutorial/Activator.java
index dc8cd0f6d..0e3bb96cb 100644
--- a/doc/bundles/org.eclipse.ecf.tutorial/src/org/eclipse/ecf/tutorial/Activator.java
+++ b/doc/bundles/org.eclipse.ecf.tutorial/src/org/eclipse/ecf/tutorial/Activator.java
@@ -1,11 +1,14 @@
-/*******************************************************************************
- * Copyright (c) 2004 Composent, Inc. All rights reserved. This
- * program and the accompanying materials are made available under the terms of
- * the Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html
- *
+/****************************************************************************
+ * Copyright (c) 2004 Composent, Inc.
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
* Contributors: Composent, Inc. - initial API and implementation
- ******************************************************************************/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *****************************************************************************/
package org.eclipse.ecf.tutorial;
import org.osgi.framework.Bundle;
diff --git a/doc/bundles/org.eclipse.ecf.tutorial/src/org/eclipse/ecf/tutorial/actions/StartClientAction.java b/doc/bundles/org.eclipse.ecf.tutorial/src/org/eclipse/ecf/tutorial/actions/StartClientAction.java
index e41a98d16..4748ede30 100644
--- a/doc/bundles/org.eclipse.ecf.tutorial/src/org/eclipse/ecf/tutorial/actions/StartClientAction.java
+++ b/doc/bundles/org.eclipse.ecf.tutorial/src/org/eclipse/ecf/tutorial/actions/StartClientAction.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.tutorial.actions;
import org.eclipse.core.runtime.IProgressMonitor;
diff --git a/doc/bundles/org.eclipse.ecf.tutorial/src/org/eclipse/ecf/tutorial/basic/Client1.java b/doc/bundles/org.eclipse.ecf.tutorial/src/org/eclipse/ecf/tutorial/basic/Client1.java
index 6ce5f0346..e86b0d42b 100644
--- a/doc/bundles/org.eclipse.ecf.tutorial/src/org/eclipse/ecf/tutorial/basic/Client1.java
+++ b/doc/bundles/org.eclipse.ecf.tutorial/src/org/eclipse/ecf/tutorial/basic/Client1.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.tutorial.basic;
import org.eclipse.ecf.core.ContainerFactory;
diff --git a/doc/bundles/org.eclipse.ecf.tutorial/src/org/eclipse/ecf/tutorial/basic/Client2.java b/doc/bundles/org.eclipse.ecf.tutorial/src/org/eclipse/ecf/tutorial/basic/Client2.java
index 238db8a56..6f834df8f 100644
--- a/doc/bundles/org.eclipse.ecf.tutorial/src/org/eclipse/ecf/tutorial/basic/Client2.java
+++ b/doc/bundles/org.eclipse.ecf.tutorial/src/org/eclipse/ecf/tutorial/basic/Client2.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.tutorial.basic;
import org.eclipse.ecf.core.util.ECFException;
diff --git a/doc/bundles/org.eclipse.ecf.tutorial/src/org/eclipse/ecf/tutorial/basic/Client3.java b/doc/bundles/org.eclipse.ecf.tutorial/src/org/eclipse/ecf/tutorial/basic/Client3.java
index 0f6add71b..cc13c8b05 100644
--- a/doc/bundles/org.eclipse.ecf.tutorial/src/org/eclipse/ecf/tutorial/basic/Client3.java
+++ b/doc/bundles/org.eclipse.ecf.tutorial/src/org/eclipse/ecf/tutorial/basic/Client3.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.tutorial.basic;
import org.eclipse.ecf.core.util.ECFException;
diff --git a/doc/bundles/org.eclipse.ecf.tutorial/src/org/eclipse/ecf/tutorial/basic/Client4.java b/doc/bundles/org.eclipse.ecf.tutorial/src/org/eclipse/ecf/tutorial/basic/Client4.java
index 09a6cb9fe..5045dca8d 100644
--- a/doc/bundles/org.eclipse.ecf.tutorial/src/org/eclipse/ecf/tutorial/basic/Client4.java
+++ b/doc/bundles/org.eclipse.ecf.tutorial/src/org/eclipse/ecf/tutorial/basic/Client4.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.tutorial.basic;
import org.eclipse.ecf.core.identity.ID;
diff --git a/doc/bundles/org.eclipse.ecf.tutorial/src/org/eclipse/ecf/tutorial/datashare/DsClient1.java b/doc/bundles/org.eclipse.ecf.tutorial/src/org/eclipse/ecf/tutorial/datashare/DsClient1.java
index 069e0d937..e01d15bef 100644
--- a/doc/bundles/org.eclipse.ecf.tutorial/src/org/eclipse/ecf/tutorial/datashare/DsClient1.java
+++ b/doc/bundles/org.eclipse.ecf.tutorial/src/org/eclipse/ecf/tutorial/datashare/DsClient1.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.tutorial.datashare;
import java.util.HashMap;
diff --git a/doc/bundles/org.eclipse.ecf.tutorial/src/org/eclipse/ecf/tutorial/datashare/DsClient2.java b/doc/bundles/org.eclipse.ecf.tutorial/src/org/eclipse/ecf/tutorial/datashare/DsClient2.java
index 7570f2d34..fd3b78e17 100644
--- a/doc/bundles/org.eclipse.ecf.tutorial/src/org/eclipse/ecf/tutorial/datashare/DsClient2.java
+++ b/doc/bundles/org.eclipse.ecf.tutorial/src/org/eclipse/ecf/tutorial/datashare/DsClient2.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.tutorial.datashare;
import java.util.HashMap;
diff --git a/doc/bundles/org.eclipse.ecf.tutorial/src/org/eclipse/ecf/tutorial/scribbleshare/BasicScribbleView.java b/doc/bundles/org.eclipse.ecf.tutorial/src/org/eclipse/ecf/tutorial/scribbleshare/BasicScribbleView.java
index 51a23b2c9..f2fafef9a 100644
--- a/doc/bundles/org.eclipse.ecf.tutorial/src/org/eclipse/ecf/tutorial/scribbleshare/BasicScribbleView.java
+++ b/doc/bundles/org.eclipse.ecf.tutorial/src/org/eclipse/ecf/tutorial/scribbleshare/BasicScribbleView.java
@@ -1,11 +1,14 @@
-/*******************************************************************************
- * Copyright (c) 2006 IBM, Inc and Composent, Inc. All rights reserved. This
- * program and the accompanying materials are made available under the terms of
- * the Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html
- *
+/****************************************************************************
+ * Copyright (c) 2006 IBM, Inc and Composent, Inc.
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
* Contributors: Chris Aniszczyk <zx@us.ibm.com> - initial API and implementation
- ******************************************************************************/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *****************************************************************************/
package org.eclipse.ecf.tutorial.scribbleshare;
import org.eclipse.swt.SWT;
diff --git a/doc/bundles/org.eclipse.ecf.tutorial/src/org/eclipse/ecf/tutorial/scribbleshare/ScribbleClient.java b/doc/bundles/org.eclipse.ecf.tutorial/src/org/eclipse/ecf/tutorial/scribbleshare/ScribbleClient.java
index b509a667e..5ad954ab1 100644
--- a/doc/bundles/org.eclipse.ecf.tutorial/src/org/eclipse/ecf/tutorial/scribbleshare/ScribbleClient.java
+++ b/doc/bundles/org.eclipse.ecf.tutorial/src/org/eclipse/ecf/tutorial/scribbleshare/ScribbleClient.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.tutorial.scribbleshare;
import java.util.HashMap;
diff --git a/doc/bundles/org.eclipse.ecf.tutorial/src/org/eclipse/ecf/tutorial/scribbleshare/ScribbleView.java b/doc/bundles/org.eclipse.ecf.tutorial/src/org/eclipse/ecf/tutorial/scribbleshare/ScribbleView.java
index 3cbc8d967..dc09e137a 100644
--- a/doc/bundles/org.eclipse.ecf.tutorial/src/org/eclipse/ecf/tutorial/scribbleshare/ScribbleView.java
+++ b/doc/bundles/org.eclipse.ecf.tutorial/src/org/eclipse/ecf/tutorial/scribbleshare/ScribbleView.java
@@ -1,12 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2006 IBM, Inc and Composent, Inc. All rights reserved. This
- * program and the accompanying materials are made available under the terms of
- * the Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html
- *
+/****************************************************************************
+ * Copyright (c) 2006 IBM, Inc and Composent, Inc.
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
* Contributors: Chris Aniszczyk <zx@us.ibm.com> - initial API and implementation
* Ken Gilmer <kgilmer@gmail.com>
- ******************************************************************************/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *****************************************************************************/
package org.eclipse.ecf.tutorial.scribbleshare;
import java.io.ByteArrayInputStream;
diff --git a/doc/bundles/org.eclipse.ecf.tutorial/src/org/eclipse/ecf/tutorial/scribbleshare/toolbox/AbstractTool.java b/doc/bundles/org.eclipse.ecf.tutorial/src/org/eclipse/ecf/tutorial/scribbleshare/toolbox/AbstractTool.java
index 97bc3e411..1c84f55e2 100644
--- a/doc/bundles/org.eclipse.ecf.tutorial/src/org/eclipse/ecf/tutorial/scribbleshare/toolbox/AbstractTool.java
+++ b/doc/bundles/org.eclipse.ecf.tutorial/src/org/eclipse/ecf/tutorial/scribbleshare/toolbox/AbstractTool.java
@@ -1,11 +1,14 @@
-/*******************************************************************************
- * Copyright (c) 2006 IBM, Inc and Composent, Inc. All rights reserved. This
- * program and the accompanying materials are made available under the terms of
- * the Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html
- *
+/****************************************************************************
+ * Copyright (c) 2006 IBM, Inc and Composent, Inc.
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
* Contributors: Ken Gilmer <kgilmer@gmail.com> - initial API and implementation
- ******************************************************************************/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *****************************************************************************/
package org.eclipse.ecf.tutorial.scribbleshare.toolbox;
diff --git a/doc/bundles/org.eclipse.ecf.tutorial/src/org/eclipse/ecf/tutorial/scribbleshare/toolbox/Box.java b/doc/bundles/org.eclipse.ecf.tutorial/src/org/eclipse/ecf/tutorial/scribbleshare/toolbox/Box.java
index b6b46af17..2d826ac2c 100644
--- a/doc/bundles/org.eclipse.ecf.tutorial/src/org/eclipse/ecf/tutorial/scribbleshare/toolbox/Box.java
+++ b/doc/bundles/org.eclipse.ecf.tutorial/src/org/eclipse/ecf/tutorial/scribbleshare/toolbox/Box.java
@@ -1,11 +1,14 @@
-/*******************************************************************************
- * Copyright (c) 2006 IBM, Inc and Composent, Inc. All rights reserved. This
- * program and the accompanying materials are made available under the terms of
- * the Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html
- *
+/****************************************************************************
+ * Copyright (c) 2006 IBM, Inc and Composent, Inc.
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
* Contributors: Ken Gilmer <kgilmer@gmail.com> - initial API and implementation
- ******************************************************************************/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *****************************************************************************/
package org.eclipse.ecf.tutorial.scribbleshare.toolbox;
diff --git a/doc/bundles/org.eclipse.ecf.tutorial/src/org/eclipse/ecf/tutorial/scribbleshare/toolbox/DrawSettings.java b/doc/bundles/org.eclipse.ecf.tutorial/src/org/eclipse/ecf/tutorial/scribbleshare/toolbox/DrawSettings.java
index 963d760b3..681c59a7a 100644
--- a/doc/bundles/org.eclipse.ecf.tutorial/src/org/eclipse/ecf/tutorial/scribbleshare/toolbox/DrawSettings.java
+++ b/doc/bundles/org.eclipse.ecf.tutorial/src/org/eclipse/ecf/tutorial/scribbleshare/toolbox/DrawSettings.java
@@ -1,11 +1,14 @@
-/*******************************************************************************
- * Copyright (c) 2006 IBM, Inc and Composent, Inc. All rights reserved. This
- * program and the accompanying materials are made available under the terms of
- * the Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html
- *
+/****************************************************************************
+ * Copyright (c) 2006 IBM, Inc and Composent, Inc.
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
* Contributors: Ken Gilmer <kgilmer@gmail.com> - initial API and implementation
- ******************************************************************************/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *****************************************************************************/
package org.eclipse.ecf.tutorial.scribbleshare.toolbox;
diff --git a/doc/bundles/org.eclipse.ecf.tutorial/src/org/eclipse/ecf/tutorial/scribbleshare/toolbox/Line.java b/doc/bundles/org.eclipse.ecf.tutorial/src/org/eclipse/ecf/tutorial/scribbleshare/toolbox/Line.java
index 528b0f859..e61bb5e87 100644
--- a/doc/bundles/org.eclipse.ecf.tutorial/src/org/eclipse/ecf/tutorial/scribbleshare/toolbox/Line.java
+++ b/doc/bundles/org.eclipse.ecf.tutorial/src/org/eclipse/ecf/tutorial/scribbleshare/toolbox/Line.java
@@ -1,3 +1,14 @@
+/****************************************************************************
+ * Copyright (c) 2006 IBM, Inc and Composent, Inc.
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * Contributors: Ken Gilmer <kgilmer@gmail.com> - initial API and implementation
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *****************************************************************************/
package org.eclipse.ecf.tutorial.scribbleshare.toolbox;
import org.eclipse.swt.SWT;
@@ -7,14 +18,6 @@ import org.eclipse.swt.widgets.Canvas;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Event;
-/*******************************************************************************
- * Copyright (c) 2006 IBM, Inc and Composent, Inc. All rights reserved. This
- * program and the accompanying materials are made available under the terms of
- * the Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: Ken Gilmer <kgilmer@gmail.com> - initial API and implementation
- ******************************************************************************/
/**
* A line shape.
diff --git a/doc/bundles/org.eclipse.ecf.tutorial/src/org/eclipse/ecf/tutorial/scribbleshare/toolbox/ListContentProvider.java b/doc/bundles/org.eclipse.ecf.tutorial/src/org/eclipse/ecf/tutorial/scribbleshare/toolbox/ListContentProvider.java
index 1b5a07a7b..cd19184bb 100644
--- a/doc/bundles/org.eclipse.ecf.tutorial/src/org/eclipse/ecf/tutorial/scribbleshare/toolbox/ListContentProvider.java
+++ b/doc/bundles/org.eclipse.ecf.tutorial/src/org/eclipse/ecf/tutorial/scribbleshare/toolbox/ListContentProvider.java
@@ -1,11 +1,14 @@
-/*******************************************************************************
- * Copyright (c) 2006 IBM, Inc and Composent, Inc. All rights reserved. This
- * program and the accompanying materials are made available under the terms of
- * the Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html
- *
+/****************************************************************************
+ * Copyright (c) 2006 IBM, Inc and Composent, Inc.
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
* Contributors: Ken Gilmer <kgilmer@gmail.com> - initial API and implementation
- ******************************************************************************/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *****************************************************************************/
package org.eclipse.ecf.tutorial.scribbleshare.toolbox;
diff --git a/doc/bundles/org.eclipse.ecf.tutorial/src/org/eclipse/ecf/tutorial/scribbleshare/toolbox/Oval.java b/doc/bundles/org.eclipse.ecf.tutorial/src/org/eclipse/ecf/tutorial/scribbleshare/toolbox/Oval.java
index e7c5dc2a9..93101d315 100644
--- a/doc/bundles/org.eclipse.ecf.tutorial/src/org/eclipse/ecf/tutorial/scribbleshare/toolbox/Oval.java
+++ b/doc/bundles/org.eclipse.ecf.tutorial/src/org/eclipse/ecf/tutorial/scribbleshare/toolbox/Oval.java
@@ -1,11 +1,14 @@
-/*******************************************************************************
- * Copyright (c) 2006 IBM, Inc and Composent, Inc. All rights reserved. This
- * program and the accompanying materials are made available under the terms of
- * the Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html
- *
+/****************************************************************************
+ * Copyright (c) 2006 IBM, Inc and Composent, Inc.
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
* Contributors: Ken Gilmer <kgilmer@gmail.com> - initial API and implementation
- ******************************************************************************/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *****************************************************************************/
package org.eclipse.ecf.tutorial.scribbleshare.toolbox;
diff --git a/doc/bundles/org.eclipse.ecf.tutorial/src/org/eclipse/ecf/tutorial/scribbleshare/toolbox/Pencil.java b/doc/bundles/org.eclipse.ecf.tutorial/src/org/eclipse/ecf/tutorial/scribbleshare/toolbox/Pencil.java
index 63fd19734..a5091b1b4 100644
--- a/doc/bundles/org.eclipse.ecf.tutorial/src/org/eclipse/ecf/tutorial/scribbleshare/toolbox/Pencil.java
+++ b/doc/bundles/org.eclipse.ecf.tutorial/src/org/eclipse/ecf/tutorial/scribbleshare/toolbox/Pencil.java
@@ -1,11 +1,14 @@
-/*******************************************************************************
- * Copyright (c) 2006 IBM, Inc and Composent, Inc. All rights reserved. This
- * program and the accompanying materials are made available under the terms of
- * the Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html
- *
+/****************************************************************************
+ * Copyright (c) 2006 IBM, Inc and Composent, Inc.
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
* Contributors: Ken Gilmer <kgilmer@gmail.com> - initial API and implementation
- ******************************************************************************/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *****************************************************************************/
package org.eclipse.ecf.tutorial.scribbleshare.toolbox;
diff --git a/doc/bundles/org.eclipse.ecf.tutorial/src/org/eclipse/ecf/tutorial/scribbleshare/toolbox/ToolboxLabelProvider.java b/doc/bundles/org.eclipse.ecf.tutorial/src/org/eclipse/ecf/tutorial/scribbleshare/toolbox/ToolboxLabelProvider.java
index 2a8b2e57f..632cb40ff 100644
--- a/doc/bundles/org.eclipse.ecf.tutorial/src/org/eclipse/ecf/tutorial/scribbleshare/toolbox/ToolboxLabelProvider.java
+++ b/doc/bundles/org.eclipse.ecf.tutorial/src/org/eclipse/ecf/tutorial/scribbleshare/toolbox/ToolboxLabelProvider.java
@@ -1,11 +1,14 @@
-/*******************************************************************************
- * Copyright (c) 2006 IBM, Inc and Composent, Inc. All rights reserved. This
- * program and the accompanying materials are made available under the terms of
- * the Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html
- *
+/****************************************************************************
+ * Copyright (c) 2006 IBM, Inc and Composent, Inc.
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
* Contributors: Ken Gilmer <kgilmer@gmail.com> - initial API and implementation
- ******************************************************************************/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *****************************************************************************/
package org.eclipse.ecf.tutorial.scribbleshare.toolbox;
diff --git a/framework/bundles/org.eclipse.ecf.filetransfer/schema/urlStreamHandlerService.exsd b/framework/bundles/org.eclipse.ecf.filetransfer/schema/urlStreamHandlerService.exsd
index fd1672e33..8a97130c3 100644
--- a/framework/bundles/org.eclipse.ecf.filetransfer/schema/urlStreamHandlerService.exsd
+++ b/framework/bundles/org.eclipse.ecf.filetransfer/schema/urlStreamHandlerService.exsd
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.ecf.filetransfer">
+<schema targetNamespace="org.eclipse.ecf.filetransfer" xmlns="http://www.w3.org/2001/XMLSchema">
<annotation>
<appInfo>
<meta.schema plugin="org.eclipse.ecf.filetransfer" id="urlStreamHandlerService" name="URL Stream Handler Service"/>
@@ -53,6 +53,11 @@ Note that the class &lt;code&gt;org.eclipse.ecf.tests.filetransfer.TestURLStream
</annotation>
<element name="extension">
+ <annotation>
+ <appInfo>
+ <meta.element />
+ </appInfo>
+ </annotation>
<complexType>
<sequence minOccurs="1" maxOccurs="unbounded">
<element ref="urlStreamHandlerService"/>
@@ -290,7 +295,13 @@ public abstract class AbstractURLStreamHandlerService extends URLStreamHandler
</appInfo>
<documentation>
Copyright (c) 2004 Composent, Inc. and others.
-All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Composent, Inc. - initial API and implementation
+
+This program and the accompanying materials are made
+available under the terms of the Eclipse Public License 2.0
+which is available at https://www.eclipse.org/legal/epl-2.0/
+
+SPDX-License-Identifier: EPL-2.0
+
</documentation>
</annotation>
diff --git a/framework/bundles/org.eclipse.ecf.identity/schema/namespace.exsd b/framework/bundles/org.eclipse.ecf.identity/schema/namespace.exsd
index 02564e3cc..5e271dd0a 100644
--- a/framework/bundles/org.eclipse.ecf.identity/schema/namespace.exsd
+++ b/framework/bundles/org.eclipse.ecf.identity/schema/namespace.exsd
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.ecf.identity">
+<schema targetNamespace="org.eclipse.ecf.identity" xmlns="http://www.w3.org/2001/XMLSchema">
<annotation>
<appInfo>
<meta.schema plugin="org.eclipse.ecf.identity" id="namespace" name="ECF Namespace"/>
@@ -13,6 +13,11 @@ Plugins implementing this extension point must define a Namespace class that ext
</annotation>
<element name="extension">
+ <annotation>
+ <appInfo>
+ <meta.element />
+ </appInfo>
+ </annotation>
<complexType>
<sequence>
<element ref="namespace" minOccurs="1" maxOccurs="unbounded"/>
@@ -180,7 +185,13 @@ ID newID = org.eclipse.ecf.core.identity.IDFactory.createGUID(16);
</appInfo>
<documentation>
Copyright (c) 2004 Composent, Inc. and others.
-All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Composent, Inc. - initial API and implementation
+
+This program and the accompanying materials are made
+available under the terms of the Eclipse Public License 2.0
+which is available at https://www.eclipse.org/legal/epl-2.0/
+
+SPDX-License-Identifier: EPL-2.0
+
</documentation>
</annotation>
diff --git a/framework/bundles/org.eclipse.ecf.presence.bot/schema/chatRoomMessageHandler.exsd b/framework/bundles/org.eclipse.ecf.presence.bot/schema/chatRoomMessageHandler.exsd
index 319ce4983..592dee9f7 100644
--- a/framework/bundles/org.eclipse.ecf.presence.bot/schema/chatRoomMessageHandler.exsd
+++ b/framework/bundles/org.eclipse.ecf.presence.bot/schema/chatRoomMessageHandler.exsd
@@ -1,18 +1,21 @@
<?xml version='1.0' encoding='UTF-8'?>
<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.ecf.presence.bot">
+<schema targetNamespace="org.eclipse.ecf.presence.bot" xmlns="http://www.w3.org/2001/XMLSchema">
<annotation>
<appInfo>
<meta.schema plugin="org.eclipse.ecf.presence.bot" id="chatRoomMessageHandler" name="Chat Room Message Handler"/>
</appInfo>
<documentation>
This extension point allows message handlers to be associated with a given chatroomrobot (via chatroomrobotid attribute). Note that the chatroomrobotid must exist or the handler will not be called.
-
-
</documentation>
</annotation>
<element name="extension">
+ <annotation>
+ <appInfo>
+ <meta.element />
+ </appInfo>
+ </annotation>
<complexType>
<sequence minOccurs="1" maxOccurs="unbounded">
<element ref="handler"/>
@@ -116,8 +119,6 @@ Note that the given chatroomrobotid=&lt;b&gt;org.eclipse.ecf.presence.bot.defaul
&lt;/chatRoomRobot&gt;
&lt;/extension&gt;
&lt;/pre&gt;
-
-
</documentation>
</annotation>
@@ -131,20 +132,19 @@ Note that the given chatroomrobotid=&lt;b&gt;org.eclipse.ecf.presence.bot.defaul
&lt;pre&gt;
public interface IChatRoomMessageHandler extends IChatRoomContainerAdvisor {
- /**
- * This method is called when a {@link IChatRoomMessage} is received.
- *
- * @param message
- * the {@link IChatRoomMessage} received. Will not be
- * &lt;code&gt;null&lt;/code&gt;. Implementers should not block the
- * calling thread. Any methods on the given &lt;code&gt;message&lt;/code&gt;
- * parameter may be called.
- */
- public void handleRoomMessage(IChatRoomMessage message);
+ /**
+ * This method is called when a {@link IChatRoomMessage} is received.
+ *
+ * @param message
+ * the {@link IChatRoomMessage} received. Will not be
+ * &lt;code&gt;null&lt;/code&gt;. Implementers should not block the
+ * calling thread. Any methods on the given &lt;code&gt;message&lt;/code&gt;
+ * parameter may be called.
+ */
+ public void handleRoomMessage(IChatRoomMessage message);
}
&lt;/pre&gt;
-
</documentation>
</annotation>
@@ -162,7 +162,13 @@ public interface IChatRoomMessageHandler extends IChatRoomContainerAdvisor {
<meta.section type="copyright"/>
</appInfo>
<documentation>
- Copyright (c) 2007 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html
+ Copyright (c) 2007 IBM Corporation and others.
+
+This program and the accompanying materials are made
+available under the terms of the Eclipse Public License 2.0
+which is available at https://www.eclipse.org/legal/epl-2.0/
+
+SPDX-License-Identifier: EPL-2.0
</documentation>
</annotation>
diff --git a/framework/bundles/org.eclipse.ecf.presence.bot/schema/chatRoomRobot.exsd b/framework/bundles/org.eclipse.ecf.presence.bot/schema/chatRoomRobot.exsd
index 93e681629..5fbd9c2c7 100644
--- a/framework/bundles/org.eclipse.ecf.presence.bot/schema/chatRoomRobot.exsd
+++ b/framework/bundles/org.eclipse.ecf.presence.bot/schema/chatRoomRobot.exsd
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.ecf.presence.bot">
+<schema targetNamespace="org.eclipse.ecf.presence.bot" xmlns="http://www.w3.org/2001/XMLSchema">
<annotation>
<appInfo>
<meta.schema plugin="org.eclipse.ecf.presence.bot" id="chatRoomRobot" name="Chat Room Robot"/>
@@ -11,6 +11,11 @@
</annotation>
<element name="extension">
+ <annotation>
+ <appInfo>
+ <meta.element />
+ </appInfo>
+ </annotation>
<complexType>
<sequence minOccurs="1" maxOccurs="unbounded">
<element ref="chatRoomRobot"/>
@@ -184,7 +189,14 @@ using the id for the chatRoomRobot given above. For example:
<meta.section type="copyright"/>
</appInfo>
<documentation>
- Copyright (c) 2007 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html
+ Copyright (c) 2007 IBM Corporation and others.
+
+This program and the accompanying materials are made
+available under the terms of the Eclipse Public License 2.0
+which is available at https://www.eclipse.org/legal/epl-2.0/
+
+SPDX-License-Identifier: EPL-2.0
+
</documentation>
</annotation>
diff --git a/framework/bundles/org.eclipse.ecf.presence.bot/schema/imMessageHandler.exsd b/framework/bundles/org.eclipse.ecf.presence.bot/schema/imMessageHandler.exsd
index 297d07dbe..19795421a 100644
--- a/framework/bundles/org.eclipse.ecf.presence.bot/schema/imMessageHandler.exsd
+++ b/framework/bundles/org.eclipse.ecf.presence.bot/schema/imMessageHandler.exsd
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.ecf.presence.bot">
+<schema targetNamespace="org.eclipse.ecf.presence.bot" xmlns="http://www.w3.org/2001/XMLSchema">
<annotation>
<appInfo>
<meta.schema plugin="org.eclipse.ecf.presence.bot" id="imMessageHandler" name="IM Message Handler"/>
@@ -12,6 +12,11 @@ with imrobot instances.
</annotation>
<element name="extension">
+ <annotation>
+ <appInfo>
+ <meta.element />
+ </appInfo>
+ </annotation>
<complexType>
<sequence>
<element ref="handler" minOccurs="1" maxOccurs="unbounded"/>
@@ -156,7 +161,14 @@ public interface IIMMessageHandler extends IContainerAdvisor {
<meta.section type="copyright"/>
</appInfo>
<documentation>
- Copyright (c) 2007 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html
+ Copyright (c) 2007 IBM Corporation and others.
+
+This program and the accompanying materials are made
+available under the terms of the Eclipse Public License 2.0
+which is available at https://www.eclipse.org/legal/epl-2.0/
+
+SPDX-License-Identifier: EPL-2.0
+
</documentation>
</annotation>
diff --git a/framework/bundles/org.eclipse.ecf.presence.bot/schema/imRobot.exsd b/framework/bundles/org.eclipse.ecf.presence.bot/schema/imRobot.exsd
index 7ddb7f1b1..6de50d42c 100644
--- a/framework/bundles/org.eclipse.ecf.presence.bot/schema/imRobot.exsd
+++ b/framework/bundles/org.eclipse.ecf.presence.bot/schema/imRobot.exsd
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.ecf.presence.bot">
+<schema targetNamespace="org.eclipse.ecf.presence.bot" xmlns="http://www.w3.org/2001/XMLSchema">
<annotation>
<appInfo>
<meta.schema plugin="org.eclipse.ecf.presence.bot" id="imRobot" name="IM Robot"/>
@@ -11,6 +11,11 @@
</annotation>
<element name="extension">
+ <annotation>
+ <appInfo>
+ <meta.element />
+ </appInfo>
+ </annotation>
<complexType>
<sequence minOccurs="1" maxOccurs="unbounded">
<element ref="imRobot"/>
@@ -155,7 +160,14 @@ using the id for the imrobot given above. For example:
<meta.section type="copyright"/>
</appInfo>
<documentation>
- Copyright (c) 2007 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html
+ Copyright (c) 2007 IBM Corporation and others.
+
+This program and the accompanying materials are made
+available under the terms of the Eclipse Public License 2.0
+which is available at https://www.eclipse.org/legal/epl-2.0/
+
+SPDX-License-Identifier: EPL-2.0
+
</documentation>
</annotation>
diff --git a/framework/bundles/org.eclipse.ecf.presence.ui/schema/rosterViewerDropTarget.exsd b/framework/bundles/org.eclipse.ecf.presence.ui/schema/rosterViewerDropTarget.exsd
index f17944e31..22e2e32ba 100644
--- a/framework/bundles/org.eclipse.ecf.presence.ui/schema/rosterViewerDropTarget.exsd
+++ b/framework/bundles/org.eclipse.ecf.presence.ui/schema/rosterViewerDropTarget.exsd
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.ecf.presence.ui">
+<schema targetNamespace="org.eclipse.ecf.presence.ui" xmlns="http://www.w3.org/2001/XMLSchema">
<annotation>
<appInfo>
<meta.schema plugin="org.eclipse.ecf.presence.ui" id="rosterViewerDropTarget" name="Roster Viewer Drop Target"/>
@@ -11,6 +11,11 @@
</annotation>
<element name="extension">
+ <annotation>
+ <appInfo>
+ <meta.element />
+ </appInfo>
+ </annotation>
<complexType>
<sequence>
<element ref="dropTarget" minOccurs="1" maxOccurs="unbounded"/>
@@ -145,7 +150,13 @@ public interface IRosterViewerDropTarget {
</appInfo>
<documentation>
Copyright (c) 2004 Composent, Inc. and others.
-All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Composent, Inc. - initial API and implementation
+
+This program and the accompanying materials are made
+available under the terms of the Eclipse Public License 2.0
+which is available at https://www.eclipse.org/legal/epl-2.0/
+
+SPDX-License-Identifier: EPL-2.0
+
</documentation>
</annotation>
diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/schema/org.eclipse.ecf.remoteservice.ui.servicesview.exsd b/framework/bundles/org.eclipse.ecf.remoteservice.ui/schema/org.eclipse.ecf.remoteservice.ui.servicesview.exsd
index fc3c9c06f..c1cdd05fd 100644
--- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/schema/org.eclipse.ecf.remoteservice.ui.servicesview.exsd
+++ b/framework/bundles/org.eclipse.ecf.remoteservice.ui/schema/org.eclipse.ecf.remoteservice.ui.servicesview.exsd
@@ -104,7 +104,6 @@
&lt;/servicesview&gt;
&lt;/extension&gt;
&lt;/pre&gt;
-
</documentation>
</annotation>
@@ -114,7 +113,6 @@
</appInfo>
<documentation>
See the IServicesView interface. This interface allows other views to set the selected service in the associated view. If the view given does not implement IServicesView then it will not be used in this manner, but this interface should be implemented by Service View extensions.
-
</documentation>
</annotation>
@@ -124,16 +122,14 @@
<meta.section type="copyright"/>
</appInfo>
<documentation>
- /*******************************************************************************
- * Copyright (c) 2015 Composent, Inc. All rights reserved. This
- * program and the accompanying materials are made available under the terms of
- * the Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: Scott Lewis - initial API and implementation
- ******************************************************************************/
+ Copyright (c) 2015 Composent, Inc. and others.
+
+This program and the accompanying materials are made
+available under the terms of the Eclipse Public License 2.0
+which is available at https://www.eclipse.org/legal/epl-2.0/
+
+SPDX-License-Identifier: EPL-2.0
-
</documentation>
</annotation>
diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/schema/sharedObjectFactory.exsd b/framework/bundles/org.eclipse.ecf.sharedobject/schema/sharedObjectFactory.exsd
index 5dca5be47..625718b11 100644
--- a/framework/bundles/org.eclipse.ecf.sharedobject/schema/sharedObjectFactory.exsd
+++ b/framework/bundles/org.eclipse.ecf.sharedobject/schema/sharedObjectFactory.exsd
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.ecf">
+<schema targetNamespace="org.eclipse.ecf" xmlns="http://www.w3.org/2001/XMLSchema">
<annotation>
<appInfo>
<meta.schema plugin="org.eclipse.ecf" id="sharedObjectFactory" name="ECF Shared Object Factory"/>
@@ -12,45 +12,49 @@ extensions must implement:
&lt;pre&gt;
public interface ISharedObjectInstantiator {
- /**
- * Create instance of ISharedObject. This is the interface that plugin
- * implementations must implement for the sharedObjectFactory extension
- * point. The caller may optionally specify both argument types and
- * arguments that will be passed into this method (and therefore to the
- * provider implementation implementing this method). For example:
- * &lt;p&gt;
- * &lt;/p&gt;
- * &lt;p&gt;
- * &lt;b&gt;
- * SharedObjectFactory.getDefault().createSharedObject(&quot;foosharedobject&quot;,new
- * String [] { java.lang.String }, new Object { &quot;hello&quot; });&lt;/b&gt;
- * &lt;/p&gt;
- * &lt;p&gt;
- * &lt;/p&gt;
- *
- * @param typeDescription
- * the SharedObjectTypeDescription associated with the registered
- * shared object provider implementation plugin
- * @param args
- * arguments specified by the caller. May be null if no arguments
- * are passed in by caller to
- * SharedObjectFactory.getDefault().createSharedObject(...)
- * @return ISharedObject instance. The provider implementation must return a
- * valid object implementing ISharedObject OR throw a
- * SharedObjectCreateException
- * @throws SharedObjectCreateException
- * if shared object instance cannot be created
- */
- public ISharedObject createInstance(
- SharedObjectTypeDescription typeDescription, Object[] args)
- throws SharedObjectCreateException;
+ /**
+ * Create instance of ISharedObject. This is the interface that plugin
+ * implementations must implement for the sharedObjectFactory extension
+ * point. The caller may optionally specify both argument types and
+ * arguments that will be passed into this method (and therefore to the
+ * provider implementation implementing this method). For example:
+ * &lt;p&gt;
+ * &lt;/p&gt;
+ * &lt;p&gt;
+ * &lt;b&gt;
+ * SharedObjectFactory.getDefault().createSharedObject(&quot;foosharedobject&quot;,new
+ * String [] { java.lang.String }, new Object { &quot;hello&quot; });&lt;/b&gt;
+ * &lt;/p&gt;
+ * &lt;p&gt;
+ * &lt;/p&gt;
+ *
+ * @param typeDescription
+ * the SharedObjectTypeDescription associated with the registered
+ * shared object provider implementation plugin
+ * @param args
+ * arguments specified by the caller. May be null if no arguments
+ * are passed in by caller to
+ * SharedObjectFactory.getDefault().createSharedObject(...)
+ * @return ISharedObject instance. The provider implementation must return a
+ * valid object implementing ISharedObject OR throw a
+ * SharedObjectCreateException
+ * @throws SharedObjectCreateException
+ * if shared object instance cannot be created
+ */
+ public ISharedObject createInstance(
+ SharedObjectTypeDescription typeDescription, Object[] args)
+ throws SharedObjectCreateException;
}
&lt;/pre&gt;
-
</documentation>
</annotation>
<element name="extension">
+ <annotation>
+ <appInfo>
+ <meta.element />
+ </appInfo>
+ </annotation>
<complexType>
<sequence>
<element ref="sharedObjectFactory" minOccurs="1" maxOccurs="unbounded"/>
@@ -165,10 +169,10 @@ and the TestSharedObjectInstantiator is defined:
&lt;pre&gt;
public class TestSharedObjectInstantiator implements ISharedObjectInstantiator {
- public ISharedObject createInstance(SharedObjectTypeDescription description, Object[] args) throws SharedObjectCreateException {
- System.out.println(&quot;createInstance(&quot;+description+&quot;,&quot;+((args==null)?&quot;null&quot;:Arrays.asList(args).toString()));
- return new TestSharedObject();
- }
+ public ISharedObject createInstance(SharedObjectTypeDescription description, Object[] args) throws SharedObjectCreateException {
+ System.out.println(&quot;createInstance(&quot;+description+&quot;,&quot;+((args==null)?&quot;null&quot;:Arrays.asList(args).toString()));
+ return new TestSharedObject();
+ }
}
&lt;/pre&gt;
@@ -179,9 +183,6 @@ Clients may use the extension via calls such as:
&lt;pre&gt;
ISharedObject obj = SharedObjectFactory.getDefault().createSharedObject(&quot;ecf.test.sharedobjectfactory&quot;);
&lt;/pre&gt;
-
-
-
</documentation>
</annotation>
@@ -197,145 +198,135 @@ Here is the &lt;b&gt;org.eclipse.ecf.core.sharedobject.ISharedObjectFactory&lt;/
&lt;pre&gt;
public interface ISharedObjectFactory {
- /*
- * Add a SharedObjectTypeDescription to the set of known
- * SharedObjectTypeDescriptions.
- *
- * @param scd the SharedObjectTypeDescription to add to this factory @return
- * SharedObjectTypeDescription the old description of the same name, null if
- * none found
- */
- public SharedObjectTypeDescription addDescription(
- SharedObjectTypeDescription description);
-
- /**
- * Get a collection of the SharedObjectTypeDescriptions currently known to
- * this factory. This allows clients to query the factory to determine what
- * if any other SharedObjectTypeDescriptions are currently registered with
- * the factory, and if so, what they are.
- *
- * @return List of SharedObjectTypeDescription instances. Will not be null.
- */
- public List getDescriptions();
-
- /**
- * Check to see if a given named description is already contained by this
- * factory
- *
- * @param description
- * the SharedObjectTypeDescription to look for
- * @return true if description is already known to factory, false otherwise
- */
- public boolean containsDescription(SharedObjectTypeDescription description);
-
- /**
- * Get the known SharedObjectTypeDescription given it&apos;s name.
- *
- * @param name
- * @return SharedObjectTypeDescription found. Null if description not found.
- * @throws SharedObjectCreateException
- */
- public SharedObjectTypeDescription getDescriptionByName(String name)
- throws SharedObjectCreateException;
-
- /**
- * Create ISharedObject instance. Given a SharedObjectTypeDescription
- * object, a String [] of argument types, and an Object [] of parameters,
- * this method will
- * &lt;p&gt;
- * &lt;ul&gt;
- * &lt;li&gt;lookup the known SharedObjectTypeDescriptions to find one of
- * matching name&lt;/li&gt;
- * &lt;li&gt;if found, will retrieve or create an ISharedObjectInstantiator for
- * that description&lt;/li&gt;
- * &lt;li&gt;Call the ISharedObjectInstantiator.createInstance method to return
- * an instance of ISharedObject&lt;/li&gt;
- * &lt;/ul&gt;
- *
- * @param typeDescription
- * the SharedObjectTypeDescription to use to create the instance
- * @param args
- * an Object [] of arguments passed to the createInstance method
- * of the ISharedObjectInstantiator
- * @return a valid instance of ISharedObject. Will not be null.
- * @throws SharedObjectCreateException
- * if shared object cannot be created
- */
- public ISharedObject createSharedObject(
- SharedObjectTypeDescription typeDescription, Object[] args)
- throws SharedObjectCreateException;
-
- /**
- * Create ISharedObject instance. Given a SharedObjectTypeDescription name,
- * this method will
- * &lt;p&gt;
- * &lt;ul&gt;
- * &lt;li&gt;lookup the known SharedObjectTypeDescriptions to find one of
- * matching name&lt;/li&gt;
- * &lt;li&gt;if found, will retrieve or create an ISharedObjectInstantiator for
- * that description&lt;/li&gt;
- * &lt;li&gt;Call the ISharedObjectInstantiator.createInstance method to return
- * an instance of ISharedObject&lt;/li&gt;
- * &lt;/ul&gt;
- *
- * @param descriptionName
- * the SharedObjectTypeDescription name to lookup
- * @return a valid instance of ISharedObject. Will not be null.
- * @throws SharedObjectCreateException
- */
- public ISharedObject createSharedObject(String descriptionName)
- throws SharedObjectCreateException;
-
- /**
- * Create ISharedObject instance. Given a SharedObjectTypeDescription name,
- * this method will
- * &lt;p&gt;
- * &lt;ul&gt;
- * &lt;li&gt;lookup the known SharedObjectTypeDescriptions to find one of
- * matching name&lt;/li&gt;
- * &lt;li&gt;if found, will retrieve or create an ISharedObjectInstantiator for
- * that description&lt;/li&gt;
- * &lt;li&gt;Call the ISharedObjectInstantiator.createInstance method to return
- * an instance of ISharedObject&lt;/li&gt;
- * &lt;/ul&gt;
- *
- * @param descriptionName
- * the SharedObjectTypeDescription name to lookup
- * @param args
- * the Object [] of arguments passed to the
- * ISharedObjectInstantiator.createInstance method
- * @return a valid instance of IContainer. Will not be null.
- * @throws SharedObjectCreateException
- */
- public ISharedObject createSharedObject(String descriptionName,
- Object[] args) throws SharedObjectCreateException;
-
- /**
- * Remove given description from set known to this factory.
- *
- * @param scd
- * the SharedObjectTypeDescription to remove
- * @return the removed SharedObjectTypeDescription, null if nothing removed
- */
- public SharedObjectTypeDescription removeDescription(
- SharedObjectTypeDescription scd);
+ /*
+ * Add a SharedObjectTypeDescription to the set of known
+ * SharedObjectTypeDescriptions.
+ *
+ * @param scd the SharedObjectTypeDescription to add to this factory @return
+ * SharedObjectTypeDescription the old description of the same name, null if
+ * none found
+ */
+ public SharedObjectTypeDescription addDescription(
+ SharedObjectTypeDescription description);
+
+ /**
+ * Get a collection of the SharedObjectTypeDescriptions currently known to
+ * this factory. This allows clients to query the factory to determine what
+ * if any other SharedObjectTypeDescriptions are currently registered with
+ * the factory, and if so, what they are.
+ *
+ * @return List of SharedObjectTypeDescription instances. Will not be null.
+ */
+ public List getDescriptions();
+
+ /**
+ * Check to see if a given named description is already contained by this
+ * factory
+ *
+ * @param description
+ * the SharedObjectTypeDescription to look for
+ * @return true if description is already known to factory, false otherwise
+ */
+ public boolean containsDescription(SharedObjectTypeDescription description);
+
+ /**
+ * Get the known SharedObjectTypeDescription given it&apos;s name.
+ *
+ * @param name
+ * @return SharedObjectTypeDescription found. Null if description not found.
+ * @throws SharedObjectCreateException
+ */
+ public SharedObjectTypeDescription getDescriptionByName(String name)
+ throws SharedObjectCreateException;
+
+ /**
+ * Create ISharedObject instance. Given a SharedObjectTypeDescription
+ * object, a String [] of argument types, and an Object [] of parameters,
+ * this method will
+ * &lt;p&gt;
+ * &lt;ul&gt;
+ * &lt;li&gt;lookup the known SharedObjectTypeDescriptions to find one of
+ * matching name&lt;/li&gt;
+ * &lt;li&gt;if found, will retrieve or create an ISharedObjectInstantiator for
+ * that description&lt;/li&gt;
+ * &lt;li&gt;Call the ISharedObjectInstantiator.createInstance method to return
+ * an instance of ISharedObject&lt;/li&gt;
+ * &lt;/ul&gt;
+ *
+ * @param typeDescription
+ * the SharedObjectTypeDescription to use to create the instance
+ * @param args
+ * an Object [] of arguments passed to the createInstance method
+ * of the ISharedObjectInstantiator
+ * @return a valid instance of ISharedObject. Will not be null.
+ * @throws SharedObjectCreateException
+ * if shared object cannot be created
+ */
+ public ISharedObject createSharedObject(
+ SharedObjectTypeDescription typeDescription, Object[] args)
+ throws SharedObjectCreateException;
+
+ /**
+ * Create ISharedObject instance. Given a SharedObjectTypeDescription name,
+ * this method will
+ * &lt;p&gt;
+ * &lt;ul&gt;
+ * &lt;li&gt;lookup the known SharedObjectTypeDescriptions to find one of
+ * matching name&lt;/li&gt;
+ * &lt;li&gt;if found, will retrieve or create an ISharedObjectInstantiator for
+ * that description&lt;/li&gt;
+ * &lt;li&gt;Call the ISharedObjectInstantiator.createInstance method to return
+ * an instance of ISharedObject&lt;/li&gt;
+ * &lt;/ul&gt;
+ *
+ * @param descriptionName
+ * the SharedObjectTypeDescription name to lookup
+ * @return a valid instance of ISharedObject. Will not be null.
+ * @throws SharedObjectCreateException
+ */
+ public ISharedObject createSharedObject(String descriptionName)
+ throws SharedObjectCreateException;
+
+ /**
+ * Create ISharedObject instance. Given a SharedObjectTypeDescription name,
+ * this method will
+ * &lt;p&gt;
+ * &lt;ul&gt;
+ * &lt;li&gt;lookup the known SharedObjectTypeDescriptions to find one of
+ * matching name&lt;/li&gt;
+ * &lt;li&gt;if found, will retrieve or create an ISharedObjectInstantiator for
+ * that description&lt;/li&gt;
+ * &lt;li&gt;Call the ISharedObjectInstantiator.createInstance method to return
+ * an instance of ISharedObject&lt;/li&gt;
+ * &lt;/ul&gt;
+ *
+ * @param descriptionName
+ * the SharedObjectTypeDescription name to lookup
+ * @param args
+ * the Object [] of arguments passed to the
+ * ISharedObjectInstantiator.createInstance method
+ * @return a valid instance of IContainer. Will not be null.
+ * @throws SharedObjectCreateException
+ */
+ public ISharedObject createSharedObject(String descriptionName,
+ Object[] args) throws SharedObjectCreateException;
+
+ /**
+ * Remove given description from set known to this factory.
+ *
+ * @param scd
+ * the SharedObjectTypeDescription to remove
+ * @return the removed SharedObjectTypeDescription, null if nothing removed
+ */
+ public SharedObjectTypeDescription removeDescription(
+ SharedObjectTypeDescription scd);
}
&lt;/pre&gt;
See the &quot;Examples&quot; page for an example usage of the extension point.
-
-
</documentation>
</annotation>
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
<annotation>
<appInfo>
@@ -343,7 +334,13 @@ See the &quot;Examples&quot; page for an example usage of the extension point.
</appInfo>
<documentation>
Copyright (c) 2004 Composent, Inc. and others.
-All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Composent, Inc. - initial API and implementation
+
+This program and the accompanying materials are made
+available under the terms of the Eclipse Public License 2.0
+which is available at https://www.eclipse.org/legal/epl-2.0/
+
+SPDX-License-Identifier: EPL-2.0
+
</documentation>
</annotation>
diff --git a/framework/bundles/org.eclipse.ecf.ui/schema/configurationWizards.exsd b/framework/bundles/org.eclipse.ecf.ui/schema/configurationWizards.exsd
index f7bd6d5b1..752720831 100644
--- a/framework/bundles/org.eclipse.ecf.ui/schema/configurationWizards.exsd
+++ b/framework/bundles/org.eclipse.ecf.ui/schema/configurationWizards.exsd
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.ecf.ui">
+<schema targetNamespace="org.eclipse.ecf.ui" xmlns="http://www.w3.org/2001/XMLSchema">
<annotation>
<appInfo>
<meta.schema plugin="org.eclipse.ecf.ui" id="configurationWizards" name="ECF Configuration Wizards"/>
@@ -12,6 +12,11 @@ instances.
</annotation>
<element name="extension">
+ <annotation>
+ <appInfo>
+ <meta.element />
+ </appInfo>
+ </annotation>
<complexType>
<choice minOccurs="0" maxOccurs="unbounded">
<element ref="category"/>
@@ -190,8 +195,6 @@ of the export engine functionality.
&lt;/wizard&gt;
&lt;/extension&gt;
&lt;/pre&gt;
-
-
</documentation>
</annotation>
@@ -211,58 +214,45 @@ of the export engine functionality.
*/
public interface IConfigurationWizard extends IWizard {
- /**
- * Initialize the wizard with the workbench and the desired container type
- * description
- *
- * @param workbench
- * the workbench for the wizard. Will not be null.
- * @param description
- * the {@link ContainerTypeDescription} to use to
- * create/configure the new IContainer instance
- */
- public void init(IWorkbench workbench,
- ContainerTypeDescription description);
+ /**
+ * Initialize the wizard with the workbench and the desired container type
+ * description
+ *
+ * @param workbench
+ * the workbench for the wizard. Will not be null.
+ * @param description
+ * the {@link ContainerTypeDescription} to use to
+ * create/configure the new IContainer instance
+ */
+ public void init(IWorkbench workbench,
+ ContainerTypeDescription description);
- /**
- * Get result of configuration.
- *
- * @return ContainerHolder the result of the configuration. If null, the container could not be
- * created.
- */
- public ContainerHolder getConfigurationResult();
+ /**
+ * Get result of configuration.
+ *
+ * @return ContainerHolder the result of the configuration. If null, the container could not be
+ * created.
+ */
+ public ContainerHolder getConfigurationResult();
}
&lt;/pre&gt;
-
</documentation>
</annotation>
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
<annotation>
<appInfo>
<meta.section type="copyright"/>
</appInfo>
<documentation>
- /****************************************************************************
- * Copyright (c) 2004 Composent, Inc. and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Composent, Inc. - initial API and implementation
- *****************************************************************************/
+ Copyright (c) 2004 Composent, Inc. and others.
+
+This program and the accompanying materials are made
+available under the terms of the Eclipse Public License 2.0
+which is available at https://www.eclipse.org/legal/epl-2.0/
+SPDX-License-Identifier: EPL-2.0
</documentation>
</annotation>
diff --git a/framework/bundles/org.eclipse.ecf.ui/schema/connectWizards.exsd b/framework/bundles/org.eclipse.ecf.ui/schema/connectWizards.exsd
index ff3a2b3e5..c09725919 100644
--- a/framework/bundles/org.eclipse.ecf.ui/schema/connectWizards.exsd
+++ b/framework/bundles/org.eclipse.ecf.ui/schema/connectWizards.exsd
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.ecf.ui">
+<schema targetNamespace="org.eclipse.ecf.ui" xmlns="http://www.w3.org/2001/XMLSchema">
<annotation>
<appInfo>
<meta.schema plugin="org.eclipse.ecf.ui" id="connectWizards" name="ECF Connect Wizard"/>
@@ -12,6 +12,11 @@ instances.
</annotation>
<element name="extension">
+ <annotation>
+ <appInfo>
+ <meta.element />
+ </appInfo>
+ </annotation>
<complexType>
<choice minOccurs="0" maxOccurs="unbounded">
<element ref="category"/>
@@ -190,7 +195,6 @@ of the export engine functionality.
&lt;/wizard&gt;
&lt;/extension&gt;
&lt;/pre&gt;
-
</documentation>
</annotation>
@@ -210,48 +214,34 @@ of the export engine functionality.
*/
public interface IConnectWizard extends IWizard {
- /**
- * Initialize the connect wizard.
- *
- * @param workbench
- * the currently working workbench instance. Will not be null.
- * @param container
- * the container that is to be connected. Will not be null.
- */
- public void init(IWorkbench workbench, IContainer container);
+ /**
+ * Initialize the connect wizard.
+ *
+ * @param workbench
+ * the currently working workbench instance. Will not be null.
+ * @param container
+ * the container that is to be connected. Will not be null.
+ */
+ public void init(IWorkbench workbench, IContainer container);
}
&lt;/pre&gt;
-
-
</documentation>
</annotation>
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
<annotation>
<appInfo>
<meta.section type="copyright"/>
</appInfo>
<documentation>
- /****************************************************************************
- * Copyright (c) 2004 Composent, Inc. and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Composent, Inc. - initial API and implementation
- *****************************************************************************/
+ Copyright (c) 2004 Composent, Inc. and others.
+
+This program and the accompanying materials are made
+available under the terms of the Eclipse Public License 2.0
+which is available at https://www.eclipse.org/legal/epl-2.0/
+SPDX-License-Identifier: EPL-2.0
</documentation>
</annotation>
diff --git a/framework/bundles/org.eclipse.ecf/schema/container.exsd b/framework/bundles/org.eclipse.ecf/schema/container.exsd
index c424608e3..dc47a7f94 100644
--- a/framework/bundles/org.eclipse.ecf/schema/container.exsd
+++ b/framework/bundles/org.eclipse.ecf/schema/container.exsd
@@ -167,7 +167,13 @@
</appInfo>
<documentation>
Copyright (c) 2009 Composent, Inc. and others.
-All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Composent, Inc. - initial API and implementation.
+
+This program and the accompanying materials are made
+available under the terms of the Eclipse Public License 2.0
+which is available at https://www.eclipse.org/legal/epl-2.0/
+
+SPDX-License-Identifier: EPL-2.0
+
</documentation>
</annotation>
diff --git a/framework/bundles/org.eclipse.ecf/schema/containerFactory.exsd b/framework/bundles/org.eclipse.ecf/schema/containerFactory.exsd
index 16dc504b4..a41a55b74 100644
--- a/framework/bundles/org.eclipse.ecf/schema/containerFactory.exsd
+++ b/framework/bundles/org.eclipse.ecf/schema/containerFactory.exsd
@@ -305,7 +305,13 @@ org.eclipse.ecf.provider.generic.GenericContainerInstantiator
</appInfo>
<documentation>
Copyright (c) 2004 Composent, Inc. and others.
-All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Composent, Inc. - initial API and implementation.
+
+This program and the accompanying materials are made
+available under the terms of the Eclipse Public License 2.0
+which is available at https://www.eclipse.org/legal/epl-2.0/
+
+SPDX-License-Identifier: EPL-2.0
+
</documentation>
</annotation>
diff --git a/framework/bundles/org.eclipse.ecf/schema/start.exsd b/framework/bundles/org.eclipse.ecf/schema/start.exsd
index d809ed9c7..d47685d71 100644
--- a/framework/bundles/org.eclipse.ecf/schema/start.exsd
+++ b/framework/bundles/org.eclipse.ecf/schema/start.exsd
@@ -1,16 +1,21 @@
<?xml version='1.0' encoding='UTF-8'?>
<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.ecf">
+<schema targetNamespace="org.eclipse.ecf" xmlns="http://www.w3.org/2001/XMLSchema">
<annotation>
<appInfo>
<meta.schema plugin="org.eclipse.ecf" id="start" name="ECF start"/>
</appInfo>
<documentation>
- ECF Core Start Extension Point. This extension point (&lt;b&gt;org.eclipse.ecf.start&lt;/b&gt;) allows extensions to run upon ECF core bundle startup. Note that extensions will be run when the ECF core bundle (ID: &lt;b&gt;org.eclipse.ecf&lt;/b&gt;) is started by the runtime, not necessarily upon platform startup.
+ ECF Core Start Extension Point. This extension point (&lt;b&gt;org.eclipse.ecf.start&lt;/b&gt;) allows extensions to run upon ECF core bundle startup. Note that extensions will be run when the ECF core bundle (ID: &lt;b&gt;org.eclipse.ecf&lt;/b&gt;) is started by the runtime, not necessarily upon platform startup.
</documentation>
</annotation>
<element name="extension">
+ <annotation>
+ <appInfo>
+ <meta.element />
+ </appInfo>
+ </annotation>
<complexType>
<sequence minOccurs="1" maxOccurs="unbounded">
<element ref="run"/>
@@ -152,7 +157,13 @@ public interface IECFStart {
</appInfo>
<documentation>
Copyright (c) 2007 Composent, Inc. and others.
-All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Composent, Inc. - initial API and implementation
+
+This program and the accompanying materials are made
+available under the terms of the Eclipse Public License 2.0
+which is available at https://www.eclipse.org/legal/epl-2.0/
+
+SPDX-License-Identifier: EPL-2.0
+
</documentation>
</annotation>
diff --git a/pom.xml b/pom.xml
index c69ed69e0..7e25a8738 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.ecf</groupId>
<artifactId>ecf-parent</artifactId>
@@ -14,6 +14,7 @@
the OSGi Remote Services standard.
</description>
<url>https://www.eclipse.org/ecf/</url>
+ <inceptionYear>2004</inceptionYear>
<organization>
<name>Eclipse Foundation</name>
@@ -73,6 +74,7 @@
<tycho-version>1.6.0</tycho-version>
<cbi-version>1.1.7</cbi-version>
<target-platform>photon</target-platform>
+ <eclipserun-repo>https://download.eclipse.org/eclipse/updates/latest/</eclipserun-repo>
<project.build.sourceEncoding>ISO-8859-1</project.build.sourceEncoding>
<project.resources.sourceEncoding>ISO-8859-1</project.resources.sourceEncoding>
<tycho.scmUrl>${project.scm.connection}</tycho.scmUrl>
@@ -391,49 +393,24 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-clean-plugin</artifactId>
- <version>3.1.0</version>
+ <groupId>org.eclipse.tycho.extras</groupId>
+ <artifactId>tycho-eclipserun-plugin</artifactId>
+ <version>${tycho-version}</version>
+ <configuration>
+ <repositories>
+ <repository>
+ <id>eclipse</id>
+ <layout>p2</layout>
+ <url>${eclipserun-repo}</url>
+ </repository>
+ </repositories>
+ <executionEnvironment>JavaSE-1.8</executionEnvironment>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>3.1.1</version>
- <configuration>
- <additionalDependencies>
- <additionalDependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.annotation</artifactId>
- <version>6.0.0</version>
- </additionalDependency>
- </additionalDependencies>
- <additionalOptions>-Xdoclint:none</additionalOptions>
- <author>false</author>
- <doctitle>${project.name} 3.14.8 API</doctitle>
- <excludePackageNames>*.ui*:*.smack.*:*.incubation.*:*.internal.*:ch.*:*.jmdns.*:*.tests.*:*.sdo.*:*.twitter.*:*.jivesoftware.*:*.collab.*:*.osgi.services.discovery.*:com.mycorp.*:org.eclipse.ecf.core.start:org.eclipse.ecf.core.user:org.eclipse.ecf.docshare.*:org.eclipse.ecf.datashare.*:org.eclipse.ecf.example.*:org.eclipse.ecf.presence.*:org.eclipse.ecf.protocol.bittorrent:org.eclipse.ecf.protocol.msn:org.eclipse.ecf.provider.irc:org.eclipse.ecf.provider.datashare.*:org.eclipse.ecf.provider.discovery.*:org.eclipse.ecf.provider.xmpp:org.eclipse.ecf.remoteservice.rpc:org.eclipse.ecf.remoteservice.soap:org.eclipse.ecf.server:org.eclipse.ecf.storage:org.eclipse.ecf.sync:org.eclipse.ecf.telephony:org.eclipse.ecf.remoteservice.asyncproxy.j8:org.eclipse.ecf.remoteservices.tooling.pde:org.eclipse.ecf.tests.*:org.eclipse.ecf.remoteservices.rest.rss:org.eclipse.ecf.examples.*</excludePackageNames>
- <links>
- <link>https://osgi.org/javadoc/r6/core/</link>
- </links>
- <splitindex>true</splitindex>
- <tags>
- <tag>
- <name>noimplement</name><placement>a</placement><head>Restriction:</head>
- </tag>
- <tag>
- <name>noextend</name><placement>a</placement><head>Restriction:</head>
- </tag>
- <tag>
- <name>noreference</name><placement>a</placement><head>Restriction:</head>
- </tag>
- <tag>
- <name>noinstantiate</name><placement>a</placement><head>Restriction:</head>
- </tag>
- <tag>
- <name>nooverride</name><placement>a</placement><head>Restriction:</head>
- </tag>
- </tags>
- <windowtitle>${project.name} 3.14.8 API</windowtitle>
- </configuration>
+ <artifactId>maven-clean-plugin</artifactId>
+ <version>3.1.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/providers/bundles/org.eclipse.ecf.provider.filetransfer/schema/browseFileTransferProtocolFactory.exsd b/providers/bundles/org.eclipse.ecf.provider.filetransfer/schema/browseFileTransferProtocolFactory.exsd
index c00183c25..455897ee7 100644
--- a/providers/bundles/org.eclipse.ecf.provider.filetransfer/schema/browseFileTransferProtocolFactory.exsd
+++ b/providers/bundles/org.eclipse.ecf.provider.filetransfer/schema/browseFileTransferProtocolFactory.exsd
@@ -157,7 +157,13 @@ public interface IRemoteFileSystemBrowserFactory {
</appInfo>
<documentation>
Copyright (c) 2004 Composent, Inc., IBM and others.
-All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Composent, Inc. - initial API and implementation, IBM, Inc. - Initial API and implementation
+
+This program and the accompanying materials are made
+available under the terms of the Eclipse Public License 2.0
+which is available at https://www.eclipse.org/legal/epl-2.0/
+
+SPDX-License-Identifier: EPL-2.0
+
</documentation>
</annotation>
diff --git a/providers/bundles/org.eclipse.ecf.provider.filetransfer/schema/retrieveFileTransferProtocolFactory.exsd b/providers/bundles/org.eclipse.ecf.provider.filetransfer/schema/retrieveFileTransferProtocolFactory.exsd
index b48263eeb..147bcd691 100644
--- a/providers/bundles/org.eclipse.ecf.provider.filetransfer/schema/retrieveFileTransferProtocolFactory.exsd
+++ b/providers/bundles/org.eclipse.ecf.provider.filetransfer/schema/retrieveFileTransferProtocolFactory.exsd
@@ -161,7 +161,13 @@ public interface IRetrieveFileTransferFactory {
</appInfo>
<documentation>
Copyright (c) 2004 Composent, Inc., IBM and others.
-All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Composent, Inc. - initial API and implementation, IBM, Inc. - Initial API and implementation
+
+This program and the accompanying materials are made
+available under the terms of the Eclipse Public License 2.0
+which is available at https://www.eclipse.org/legal/epl-2.0/
+
+SPDX-License-Identifier: EPL-2.0
+
</documentation>
</annotation>
diff --git a/providers/bundles/org.eclipse.ecf.provider.filetransfer/schema/sendFileTransferProtocolFactory.exsd b/providers/bundles/org.eclipse.ecf.provider.filetransfer/schema/sendFileTransferProtocolFactory.exsd
index 376604f97..0b68f9aab 100644
--- a/providers/bundles/org.eclipse.ecf.provider.filetransfer/schema/sendFileTransferProtocolFactory.exsd
+++ b/providers/bundles/org.eclipse.ecf.provider.filetransfer/schema/sendFileTransferProtocolFactory.exsd
@@ -156,8 +156,14 @@ public interface IRetrieveFileTransferFactory {
<meta.section type="copyright"/>
</appInfo>
<documentation>
- Copyright (c) 2004 Composent, Inc., IBM and others.
-All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Composent, Inc. - initial API and implementation, IBM, Inc. - Initial API and implementation
+ Copyright (c) 2004 Composent, Inc. and others.
+
+This program and the accompanying materials are made
+available under the terms of the Eclipse Public License 2.0
+which is available at https://www.eclipse.org/legal/epl-2.0/
+
+SPDX-License-Identifier: EPL-2.0
+
</documentation>
</annotation>
diff --git a/providers/bundles/org.eclipse.ecf.provider.irc.bot/schema/commandHandler.exsd b/providers/bundles/org.eclipse.ecf.provider.irc.bot/schema/commandHandler.exsd
index 03a1ac7c2..20b590fe6 100644
--- a/providers/bundles/org.eclipse.ecf.provider.irc.bot/schema/commandHandler.exsd
+++ b/providers/bundles/org.eclipse.ecf.provider.irc.bot/schema/commandHandler.exsd
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.ecf.provider.irc.bot">
+<schema targetNamespace="org.eclipse.ecf.provider.irc.bot" xmlns="http://www.w3.org/2001/XMLSchema">
<annotation>
<appInfo>
<meta.schema plugin="org.eclipse.ecf.provider.irc.bot" id="commandHandler" name="commandHandler"/>
@@ -11,6 +11,11 @@
</annotation>
<element name="extension">
+ <annotation>
+ <appInfo>
+ <meta.element />
+ </appInfo>
+ </annotation>
<complexType>
<sequence>
<element ref="handlers" minOccurs="1" maxOccurs="unbounded"/>
@@ -112,7 +117,14 @@
<meta.section type="copyright"/>
</appInfo>
<documentation>
-
+ Copyright (c) 2007 IBM Corporation and others.
+
+This program and the accompanying materials are made
+available under the terms of the Eclipse Public License 2.0
+which is available at https://www.eclipse.org/legal/epl-2.0/
+
+SPDX-License-Identifier: EPL-2.0
+
</documentation>
</annotation>
diff --git a/providers/bundles/org.eclipse.ecf.provider.irc.bot/schema/ircbot.exsd b/providers/bundles/org.eclipse.ecf.provider.irc.bot/schema/ircbot.exsd
index f703d1fcf..3632094af 100644
--- a/providers/bundles/org.eclipse.ecf.provider.irc.bot/schema/ircbot.exsd
+++ b/providers/bundles/org.eclipse.ecf.provider.irc.bot/schema/ircbot.exsd
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.ecf.provider.irc.bot">
+<schema targetNamespace="org.eclipse.ecf.provider.irc.bot" xmlns="http://www.w3.org/2001/XMLSchema">
<annotation>
<appInfo>
<meta.schema plugin="org.eclipse.ecf.provider.irc.bot" id="ircbot" name="ircbot"/>
@@ -11,6 +11,11 @@
</annotation>
<element name="extension">
+ <annotation>
+ <appInfo>
+ <meta.element />
+ </appInfo>
+ </annotation>
<complexType>
<sequence>
<element ref="bot" minOccurs="1" maxOccurs="unbounded"/>
@@ -116,7 +121,14 @@
<meta.section type="copyright"/>
</appInfo>
<documentation>
-
+ Copyright (c) 2007 IBM Corporation and others.
+
+This program and the accompanying materials are made
+available under the terms of the Eclipse Public License 2.0
+which is available at https://www.eclipse.org/legal/epl-2.0/
+
+SPDX-License-Identifier: EPL-2.0
+
</documentation>
</annotation>
diff --git a/providers/bundles/org.eclipse.ecf.provider.xmpp/schema/extensionProvider.exsd b/providers/bundles/org.eclipse.ecf.provider.xmpp/schema/extensionProvider.exsd
index 636ee1f64..62b30d5dc 100644
--- a/providers/bundles/org.eclipse.ecf.provider.xmpp/schema/extensionProvider.exsd
+++ b/providers/bundles/org.eclipse.ecf.provider.xmpp/schema/extensionProvider.exsd
@@ -1,16 +1,21 @@
<?xml version='1.0' encoding='UTF-8'?>
<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jabber">
+<schema targetNamespace="org.eclipse.jabber" xmlns="http://www.w3.org/2001/XMLSchema">
<annotation>
- <appInfo>
+ <appinfo>
<meta.schema plugin="org.eclipse.jabber" id="extensionProvider" name="Extension Provider"/>
- </appInfo>
+ </appinfo>
<documentation>
[Enter description of this extension point.]
</documentation>
</annotation>
<element name="extension">
+ <annotation>
+ <appinfo>
+ <meta.element />
+ </appinfo>
+ </annotation>
<complexType>
<sequence>
<element ref="provider" minOccurs="1" maxOccurs="unbounded"/>
@@ -66,47 +71,54 @@
</element>
<annotation>
- <appInfo>
+ <appinfo>
<meta.section type="since"/>
- </appInfo>
+ </appinfo>
<documentation>
[Enter the first release in which this extension point appears.]
</documentation>
</annotation>
<annotation>
- <appInfo>
+ <appinfo>
<meta.section type="examples"/>
- </appInfo>
+ </appinfo>
<documentation>
[Enter extension point usage example here.]
</documentation>
</annotation>
<annotation>
- <appInfo>
+ <appinfo>
<meta.section type="apiInfo"/>
- </appInfo>
+ </appinfo>
<documentation>
[Enter API information here.]
</documentation>
</annotation>
<annotation>
- <appInfo>
+ <appinfo>
<meta.section type="implementation"/>
- </appInfo>
+ </appinfo>
<documentation>
[Enter information about supplied implementation of this extension point.]
</documentation>
</annotation>
<annotation>
- <appInfo>
+ <appinfo>
<meta.section type="copyright"/>
- </appInfo>
+ </appinfo>
<documentation>
-
+ Copyright (c) 2004 Composent, Inc. and others.
+
+This program and the accompanying materials are made
+available under the terms of the Eclipse Public License 2.0
+which is available at https://www.eclipse.org/legal/epl-2.0/
+
+SPDX-License-Identifier: EPL-2.0
+
</documentation>
</annotation>
diff --git a/providers/bundles/org.eclipse.ecf.provider.xmpp/schema/iqProvider.exsd b/providers/bundles/org.eclipse.ecf.provider.xmpp/schema/iqProvider.exsd
index fd0839382..738aba36f 100644
--- a/providers/bundles/org.eclipse.ecf.provider.xmpp/schema/iqProvider.exsd
+++ b/providers/bundles/org.eclipse.ecf.provider.xmpp/schema/iqProvider.exsd
@@ -1,16 +1,21 @@
<?xml version='1.0' encoding='UTF-8'?>
<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jabber">
+<schema targetNamespace="org.eclipse.jabber" xmlns="http://www.w3.org/2001/XMLSchema">
<annotation>
- <appInfo>
+ <appinfo>
<meta.schema plugin="org.eclipse.jabber" id="iqProvider" name="IQ Provider"/>
- </appInfo>
+ </appinfo>
<documentation>
[Enter description of this extension point.]
</documentation>
</annotation>
<element name="extension">
+ <annotation>
+ <appinfo>
+ <meta.element />
+ </appinfo>
+ </annotation>
<complexType>
<sequence>
<element ref="provider" minOccurs="1" maxOccurs="unbounded"/>
@@ -66,47 +71,54 @@
</element>
<annotation>
- <appInfo>
+ <appinfo>
<meta.section type="since"/>
- </appInfo>
+ </appinfo>
<documentation>
[Enter the first release in which this extension point appears.]
</documentation>
</annotation>
<annotation>
- <appInfo>
+ <appinfo>
<meta.section type="examples"/>
- </appInfo>
+ </appinfo>
<documentation>
[Enter extension point usage example here.]
</documentation>
</annotation>
<annotation>
- <appInfo>
+ <appinfo>
<meta.section type="apiInfo"/>
- </appInfo>
+ </appinfo>
<documentation>
[Enter API information here.]
</documentation>
</annotation>
<annotation>
- <appInfo>
+ <appinfo>
<meta.section type="implementation"/>
- </appInfo>
+ </appinfo>
<documentation>
[Enter information about supplied implementation of this extension point.]
</documentation>
</annotation>
<annotation>
- <appInfo>
+ <appinfo>
<meta.section type="copyright"/>
- </appInfo>
+ </appinfo>
<documentation>
-
+ Copyright (c) 2004 Composent, Inc. and others.
+
+This program and the accompanying materials are made
+available under the terms of the Eclipse Public License 2.0
+which is available at https://www.eclipse.org/legal/epl-2.0/
+
+SPDX-License-Identifier: EPL-2.0
+
</documentation>
</annotation>
diff --git a/providers/bundles/org.eclipse.ecf.provider.xmpp/schema/providerDirectories.exsd b/providers/bundles/org.eclipse.ecf.provider.xmpp/schema/providerDirectories.exsd
index e3c8c5597..2f7edbd9a 100644
--- a/providers/bundles/org.eclipse.ecf.provider.xmpp/schema/providerDirectories.exsd
+++ b/providers/bundles/org.eclipse.ecf.provider.xmpp/schema/providerDirectories.exsd
@@ -1,16 +1,21 @@
<?xml version='1.0' encoding='UTF-8'?>
<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jabber">
+<schema targetNamespace="org.eclipse.jabber" xmlns="http://www.w3.org/2001/XMLSchema">
<annotation>
- <appInfo>
+ <appinfo>
<meta.schema plugin="org.eclipse.jabber" id="providerDirectories" name="Provider Directories"/>
- </appInfo>
+ </appinfo>
<documentation>
[Enter description of this extension point.]
</documentation>
</annotation>
<element name="extension">
+ <annotation>
+ <appinfo>
+ <meta.element />
+ </appinfo>
+ </annotation>
<complexType>
<sequence>
<element ref="directory" minOccurs="1" maxOccurs="unbounded"/>
@@ -52,47 +57,54 @@
</element>
<annotation>
- <appInfo>
+ <appinfo>
<meta.section type="since"/>
- </appInfo>
+ </appinfo>
<documentation>
[Enter the first release in which this extension point appears.]
</documentation>
</annotation>
<annotation>
- <appInfo>
+ <appinfo>
<meta.section type="examples"/>
- </appInfo>
+ </appinfo>
<documentation>
[Enter extension point usage example here.]
</documentation>
</annotation>
<annotation>
- <appInfo>
+ <appinfo>
<meta.section type="apiInfo"/>
- </appInfo>
+ </appinfo>
<documentation>
[Enter API information here.]
</documentation>
</annotation>
<annotation>
- <appInfo>
+ <appinfo>
<meta.section type="implementation"/>
- </appInfo>
+ </appinfo>
<documentation>
[Enter information about supplied implementation of this extension point.]
</documentation>
</annotation>
<annotation>
- <appInfo>
+ <appinfo>
<meta.section type="copyright"/>
- </appInfo>
+ </appinfo>
<documentation>
-
+ Copyright (c) 2004 Composent, Inc. and others.
+
+This program and the accompanying materials are made
+available under the terms of the Eclipse Public License 2.0
+which is available at https://www.eclipse.org/legal/epl-2.0/
+
+SPDX-License-Identifier: EPL-2.0
+
</documentation>
</annotation>
diff --git a/server-side/bundles/org.eclipse.ecf.server.generic/schema/configuration.exsd b/server-side/bundles/org.eclipse.ecf.server.generic/schema/configuration.exsd
index 8fcc6984f..b6ce92dc3 100644
--- a/server-side/bundles/org.eclipse.ecf.server.generic/schema/configuration.exsd
+++ b/server-side/bundles/org.eclipse.ecf.server.generic/schema/configuration.exsd
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.ecf.server.generic">
+<schema targetNamespace="org.eclipse.ecf.server.generic" xmlns="http://www.w3.org/2001/XMLSchema">
<annotation>
<appInfo>
<meta.schema plugin="org.eclipse.ecf.server.generic" id="configuration" name="ECF Generic Server Configuration"/>
@@ -11,6 +11,11 @@
</annotation>
<element name="extension">
+ <annotation>
+ <appInfo>
+ <meta.element />
+ </appInfo>
+ </annotation>
<complexType>
<sequence>
<element ref="connector" minOccurs="1" maxOccurs="unbounded"/>
@@ -143,14 +148,6 @@ Produces a server with groupID: ecftcp://localhost:3333/groupName
</documentation>
</annotation>
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
<annotation>
<appInfo>
@@ -158,7 +155,13 @@ Produces a server with groupID: ecftcp://localhost:3333/groupName
</appInfo>
<documentation>
Copyright (c) 2004 Composent, Inc. and others.
-All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: Composent, Inc. - initial API and implementation
+
+This program and the accompanying materials are made
+available under the terms of the Eclipse Public License 2.0
+which is available at https://www.eclipse.org/legal/epl-2.0/
+
+SPDX-License-Identifier: EPL-2.0
+
</documentation>
</annotation>
diff --git a/tooling/plugins/org.eclipse.ecf.remoteservices.tooling.pde/META-INF/MANIFEST.MF b/tooling/plugins/org.eclipse.ecf.remoteservices.tooling.pde/META-INF/MANIFEST.MF
index c2210e5dd..c8323963b 100644
--- a/tooling/plugins/org.eclipse.ecf.remoteservices.tooling.pde/META-INF/MANIFEST.MF
+++ b/tooling/plugins/org.eclipse.ecf.remoteservices.tooling.pde/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %plugin.name
Bundle-SymbolicName: org.eclipse.ecf.remoteservices.tooling.pde;singleton:=true
Automatic-Module-Name: org.eclipse.ecf.remoteservices.tooling.pde
-Bundle-Version: 1.0.101.qualifier
+Bundle-Version: 1.0.200.qualifier
Bundle-Activator: org.eclipse.ecf.remoteservices.internal.tooling.pde.Activator
Bundle-Vendor: %plugin.provider
Require-Bundle: org.eclipse.ui,
diff --git a/tooling/plugins/org.eclipse.ecf.remoteservices.tooling.pde/plugin.properties b/tooling/plugins/org.eclipse.ecf.remoteservices.tooling.pde/plugin.properties
index 6430f9d99..e59c3c6e6 100644
--- a/tooling/plugins/org.eclipse.ecf.remoteservices.tooling.pde/plugin.properties
+++ b/tooling/plugins/org.eclipse.ecf.remoteservices.tooling.pde/plugin.properties
@@ -1,10 +1,11 @@
############################################################################
# Copyright (c) 2013 Composent Inc. and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
#
+# This program and the accompanying materials are made
+# available under the terms of the Eclipse Public License 2.0
+# which is available at https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
############################################################################
plugin.name=ECF Remote Services PDE Tooling
plugin.provider=Eclipse.org - ECF
diff --git a/tooling/plugins/org.eclipse.ecf.remoteservices.tooling.pde/pom.xml b/tooling/plugins/org.eclipse.ecf.remoteservices.tooling.pde/pom.xml
index ffa07ffce..d9c4b29dc 100644
--- a/tooling/plugins/org.eclipse.ecf.remoteservices.tooling.pde/pom.xml
+++ b/tooling/plugins/org.eclipse.ecf.remoteservices.tooling.pde/pom.xml
@@ -10,6 +10,6 @@
</parent>
<groupId>org.eclipse.ecf</groupId>
<artifactId>org.eclipse.ecf.remoteservices.tooling.pde</artifactId>
- <version>1.0.101-SNAPSHOT</version>
+ <version>1.0.200-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>

Back to the top