diff options
| author | slewis | 2005-08-03 05:11:02 +0000 |
|---|---|---|
| committer | slewis | 2005-08-03 05:11:02 +0000 |
| commit | b84998541d3bd2c7c618a3c5a96352f18cd33299 (patch) | |
| tree | f61e1030596147adbd420773486f5b01cf7a7f2f | |
| parent | aae077b936fdd219414aca3ed992bcf23731b3d8 (diff) | |
| download | org.eclipse.ecf-b84998541d3bd2c7c618a3c5a96352f18cd33299.tar.gz org.eclipse.ecf-b84998541d3bd2c7c618a3c5a96352f18cd33299.tar.xz org.eclipse.ecf-b84998541d3bd2c7c618a3c5a96352f18cd33299.zip | |
Removed SharedObjectContainerDescription and SharedObjectContainerInstantiationException. Also removed methods from ISharedObjectContainerFactory. Fixed all broken implementations.
24 files changed, 423 insertions, 1317 deletions
diff --git a/examples/bundles/org.eclipse.ecf.example.collab/launchconfigs/ECF Example Collab Client 1.launch b/examples/bundles/org.eclipse.ecf.example.collab/launchconfigs/ECF Example Collab Client 1.launch index 366107dc9..a0fd8b48b 100644 --- a/examples/bundles/org.eclipse.ecf.example.collab/launchconfigs/ECF Example Collab Client 1.launch +++ b/examples/bundles/org.eclipse.ecf.example.collab/launchconfigs/ECF Example Collab Client 1.launch @@ -7,313 +7,319 @@ <booleanAttribute key="tracing" value="true"/> <stringAttribute key="location2" value="C:\eclipse3.1m4\eclipse\second-runtime-workspace"/> <mapAttribute key="tracingOptions"> -<mapEntry key="org.eclipse.team.cvs.core/syncchangeevents" value="false"/> -<mapEntry key="org.eclipse.ecf.provider.xmpp/debug/smackconnection" value="true"/> -<mapEntry key="org.eclipse.core.resources/perf/listeners" value="500"/> -<mapEntry key="org.eclipse.core.resources/build/needbuild" value="false"/> -<mapEntry key="org.eclipse.update.configurator/debug" value="false"/> -<mapEntry key="org.eclipse.osgi/monitor/activation" value="false"/> -<mapEntry key="org.eclipse.ui.ide/debug/gc" value="false"/> -<mapEntry key="org.eclipse.core.resources/contenttype/cache" value="false"/> -<mapEntry key="org.eclipse.core.runtime/loader/debug" value="false"/> -<mapEntry key="org.eclipse.ui/debug/showSystemJobs" value="false"/> -<mapEntry key="org.eclipse.ecf.sdo/DataGraphSharingFactory" value="true"/> -<mapEntry key="org.eclipse.core.runtime/url/debug" value="false"/> -<mapEntry key="org.eclipse.osgi/monitor/classes" value="false"/> -<mapEntry key="org.eclipse.update.core/debug" value="true"/> -<mapEntry key="org.eclipse.core.runtime/debug/context" value="false"/> -<mapEntry key="org.eclipse.ui/debug/swtdebug" value="false"/> -<mapEntry key="org.eclipse.ecf.provider/debug/containerfactory" value="false"/> -<mapEntry key="org.eclipse.jdt.core/debug/javamodel" value="false"/> -<mapEntry key="org.eclipse.ecf/debug" value="true"/> -<mapEntry key="org.eclipse.ui.intro/trace/printHTML" value="false"/> -<mapEntry key="org.eclipse.jdt.core/debug/javadelta/verbose" value="false"/> -<mapEntry key="org.eclipse.jdt.core/debug" value="true"/> -<mapEntry key="org.eclipse.core.expressions/tracePropertyResolving" value="false"/> -<mapEntry key="org.eclipse.ltk.core.refactoring/perf/participants/checkConditions" value="300"/> -<mapEntry key="org.eclipse.core.resources/restore" value="false"/> -<mapEntry key="org.eclipse.ui/perf/perspective.listeners" value="200"/> -<mapEntry key="org.eclipse.ecf/debug/filter" value="*"/> -<mapEntry key="org.eclipse.jdt.core/perf/containerinitializer" value="5000"/> -<mapEntry key="org.eclipse.osgi/trace/filename" value="runtime.traces"/> -<mapEntry key="org.eclipse.update.core/debug/web" value="false"/> -<mapEntry key="org.eclipse.ecf/debug/containerfactory" value="false"/> -<mapEntry key="org.eclipse.ecf.provider.xmpp/debug/flag" value="true"/> -<mapEntry key="org.eclipse.core.runtime/registry/debug/resolve" value="false"/> +<mapEntry key="org.eclipse.ecf.provider.xmpp/debug/filter" value="*"/> +<mapEntry key="org.eclipse.help.ui/debug/embeddedBrowser" value="false"/> +<mapEntry key="org.eclipse.ui/perf/part.create" value="800"/> +<mapEntry key="org.eclipse.core.resources/save/mastertable" value="false"/> <mapEntry key="org.eclipse.osgi/debug" value="false"/> -<mapEntry key="org.eclipse.osgi/trace/activation" value="false"/> -<mapEntry key="org.eclipse.ui/perf/perspective.switch" value="800"/> -<mapEntry key="org.eclipse.ecf/debug/idfactory" value="false"/> -<mapEntry key="org.eclipse.ecf.example.collab/debug/genericsharedobject" value="true"/> -<mapEntry key="org.eclipse.ui/perf/part.input" value="200"/> -<mapEntry key="org.eclipse.ecf.provider.jmdns/debug/filter" value="*"/> -<mapEntry key="org.eclipse.jface.text/debug/AnnotationPainter" value="false"/> -<mapEntry key="org.eclipse.ecf.provider/debug/sharedobjectmanager" value="false"/> -<mapEntry key="org.eclipse.ecf.datashare/debug" value="true"/> -<mapEntry key="org.eclipse.ecf/debug/factoryinit" value="true"/> -<mapEntry key="org.eclipse.ecf.sdo/debug" value="true"/> -<mapEntry key="org.eclipse.osgi/resolver/imports" value="false"/> -<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug/platformadmin/resolver" value="false"/> -<mapEntry key="org.eclipse.help.ui/debug/infopop" value="false"/> -<mapEntry key="org.eclipse.osgi/trace/filters" value="trace.properties"/> -<mapEntry key="org.eclipse.ecf.sdo/EMFUpdateManager" value="true"/> +<mapEntry key="org.eclipse.jdt.core/debug/selection" value="false"/> +<mapEntry key="org.eclipse.core.resources/strings" value="false"/> +<mapEntry key="org.eclipse.ui.ide/debug/internalerror/openDialog" value="false"/> +<mapEntry key="org.eclipse.ui/listeners/IWorkbenchPage.IPartListener" value="false"/> +<mapEntry key="org.eclipse.ui/perf/page.listeners" value="200"/> +<mapEntry key="org.eclipse.core.resources/save/tree" value="false"/> +<mapEntry key="org.eclipse.jdt.core/debug/postaction" value="false"/> +<mapEntry key="org.eclipse.ecf.example.collab/debug/urlsharedobject" value="false"/> +<mapEntry key="org.eclipse.core.runtime/loader/debug" value="false"/> +<mapEntry key="org.eclipse.core.runtime/url/debug/cachelookup" value="false"/> +<mapEntry key="org.eclipse.team.cvs.core/debug" value="false"/> <mapEntry key="org.eclipse.core.runtime/registry/debug/events/extension" value="false"/> -<mapEntry key="org.eclipse.ecf.ui/debug/textchatcomposite" value="true"/> +<mapEntry key="org.eclipse.osgi/debug/packages" value="false"/> +<mapEntry key="org.eclipse.osgi/monitor/resources" value="false"/> <mapEntry key="org.eclipse.ecf.example.collab/debug/transactionsharedobject" value="true"/> -<mapEntry key="org.eclipse.ecf.datashare/ConsistentMulticaster" value="true"/> -<mapEntry key="org.eclipse.team.cvs.core/debug" value="false"/> +<mapEntry key="org.eclipse.core.resources/restore/markers" value="false"/> +<mapEntry key="org.eclipse.ecf.ui/debug" value="true"/> +<mapEntry key="org.eclipse.osgi/debug/messageBundles" value="false"/> +<mapEntry key="org.eclipse.ecf.ui/debug/filter" value="*"/> +<mapEntry key="org.eclipse.core.runtime/loader/debug/filter/class" value="*"/> +<mapEntry key="org.eclipse.core.runtime/loader/debug/failure" value="false"/> +<mapEntry key="org.eclipse.update.core/debug/parsing" value="false"/> +<mapEntry key="org.eclipse.core.runtime/url/debug/connect" value="false"/> +<mapEntry key="org.eclipse.osgi/debug/packageadmin/timing" value="false"/> +<mapEntry key="org.eclipse.help.base/debug/search" value="false"/> +<mapEntry key="org.eclipse.pde.core/cache" value="false"/> +<mapEntry key="org.eclipse.team.core/streams" value="false"/> +<mapEntry key="org.eclipse.ecf.provider.xmpp/debug" value="true"/> <mapEntry key="org.eclipse.team.cvs.core/threading" value="false"/> -<mapEntry key="org.eclipse.ecf.example.collab/debug/flag" value="true"/> -<mapEntry key="org.eclipse.jdt.ui/perf/search/participants" value="300"/> -<mapEntry key="org.eclipse.ui/perf/part.listeners" value="200"/> -<mapEntry key="org.eclipse.osgi/resolver/debug" value="false"/> -<mapEntry key="org.eclipse.update.core/debug/install" value="false"/> +<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug/platformadmin/resolver" value="false"/> +<mapEntry key="org.eclipse.ecf.example.collab/debug/filter" value="*"/> +<mapEntry key="org.eclipse.ecf.provider/debug/transactioneventprocessor" value="true"/> +<mapEntry key="org.eclipse.ui/perf/perspective.switch" value="800"/> +<mapEntry key="org.eclipse.ui/debug/declaredImages" value="false"/> +<mapEntry key="org.eclipse.ui/perf/contentTypes" value="200"/> +<mapEntry key="org.eclipse.ui/debug/swtdebug" value="false"/> +<mapEntry key="org.eclipse.jdt.core/perf/selection" value="300"/> +<mapEntry key="org.eclipse.ecf.datashare/ConsistentMulticaster" value="true"/> +<mapEntry key="org.eclipse.osgi/profile/debug" value="false"/> +<mapEntry key="org.eclipse.core.resources/contenttype/cache" value="false"/> +<mapEntry key="org.eclipse.ui.ide/debug/gc" value="false"/> +<mapEntry key="org.eclipse.jdt.core/debug/indexmanager" value="false"/> +<mapEntry key="org.eclipse.ecf.provider.jms/debug/flag" value="true"/> <mapEntry key="org.eclipse.core.runtime/jobs/errorondeadlock" value="false"/> +<mapEntry key="org.eclipse.ecf/debug/connectionfactory" value="false"/> <mapEntry key="org.eclipse.help.ui/debug/embeddedBrowser/inprocess" value="false"/> -<mapEntry key="org.eclipse.core.resources/debug" value="false"/> -<mapEntry key="org.eclipse.ui/perf/part.control" value="800"/> -<mapEntry key="org.eclipse.osgi/profile/impl" value="org.eclipse.osgi.internal.profile.DefaultProfileLogger"/> -<mapEntry key="org.eclipse.ecf.provider.xmpp/debug" value="true"/> -<mapEntry key="org.eclipse.osgi/profile/benchmark" value="false"/> -<mapEntry key="org.eclipse.team.cvs.core/cvsprotocol" value="true"/> -<mapEntry key="org.eclipse.jdt.core/debug/postaction" value="false"/> -<mapEntry key="org.eclipse.osgi/debug/manifest" value="false"/> -<mapEntry key="org.eclipse.jdt.core/perf/selection" value="300"/> -<mapEntry key="org.eclipse.help/debug/context" value="false"/> -<mapEntry key="org.eclipse.jdt.core/debug/builder" value="false"/> -<mapEntry key="org.eclipse.osgi/resolver/requires" value="false"/> -<mapEntry key="org.eclipse.core.runtime/loader/debug/activateplugin" value="false"/> -<mapEntry key="org.eclipse.team.cvs.ssh/debug" value="false"/> -<mapEntry key="org.eclipse.ui/trace/handlers.verbose" value="false"/> -<mapEntry key="org.eclipse.ecf.provider.xmpp/debug/filter" value="*"/> -<mapEntry key="org.eclipse.osgi/debug/startlevel" value="false"/> -<mapEntry key="org.eclipse.update.core/debug/installhandler" value="false"/> -<mapEntry key="org.eclipse.jdt.core/debug/javadelta" value="false"/> -<mapEntry key="org.eclipse.core.resources/restore/tree" value="false"/> -<mapEntry key="org.eclipse.core.resources/preferences" value="false"/> -<mapEntry key="org.eclipse.help/debug/protocols" value="false"/> -<mapEntry key="org.eclipse.core.resources/perf/save.participants" value="500"/> -<mapEntry key="org.eclipse.help.base/debug/search" value="false"/> -<mapEntry key="org.eclipse.core.resources/natures" value="false"/> -<mapEntry key="org.eclipse.core.runtime/loader/debug/filter/native" value="*"/> -<mapEntry key="org.eclipse.osgi/defaultprofile/buffersize" value="256"/> -<mapEntry key="org.eclipse.osgi/resolver/cycles" value="false"/> -<mapEntry key="org.eclipse.core.runtime/loader/debug/create" value="false"/> -<mapEntry key="org.eclipse.jdt.core/perf/variableinitializer" value="5000"/> +<mapEntry key="org.eclipse.jdt.core/debug/compiler" value="false"/> +<mapEntry key="org.eclipse.team.cvs.core/syncchangeevents" value="false"/> +<mapEntry key="org.eclipse.ltk.core.refactoring/perf/participants/checkConditions" value="300"/> +<mapEntry key="org.eclipse.jdt.ui/perf/explorer/makeActions" value="1000"/> +<mapEntry key="org.eclipse.ui/perf/workbench.start" value="45000"/> +<mapEntry key="org.eclipse.core.resources/perf/listeners" value="500"/> <mapEntry key="org.eclipse.ui/trace/keyBindings.verbose" value="false"/> -<mapEntry key="org.eclipse.core.runtime/preferences/get" value="false"/> -<mapEntry key="org.eclipse.core.runtime/perf/success" value="false"/> -<mapEntry key="org.eclipse.core.runtime/compatibility/debug" value="false"/> -<mapEntry key="org.eclipse.ui/debug/declaredImages" value="false"/> -<mapEntry key="org.eclipse.pde.build/debug" value="false"/> -<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug/location" value="false"/> -<mapEntry key="org.eclipse.ecf.provider/debug/sharedobjectwrapper" value="false"/> -<mapEntry key="org.eclipse.ui/trace/contexts.verbose" value="false"/> -<mapEntry key="org.eclipse.help.base/debug" value="true"/> -<mapEntry key="org.eclipse.core.runtime/jobs" value="false"/> -<mapEntry key="org.eclipse.ecf.sdo/SharedDataGraph" value="true"/> -<mapEntry key="org.eclipse.ui/listeners/IWorkbenchPage.IPartListener" value="false"/> -<mapEntry key="org.eclipse.ecf.provider.jms/debug" value="true"/> <mapEntry key="org.eclipse.core.runtime/contenttypes/debug" value="false"/> -<mapEntry key="org.eclipse.ui/perf/perspective.create" value="800"/> -<mapEntry key="org.eclipse.core.resources/strings" value="false"/> -<mapEntry key="org.eclipse.ui/listeners/IWorkbenchPartReference" value="false"/> -<mapEntry key="org.eclipse.jdt.ui/debug/checkCoreBindingGetJavaElement" value="false"/> -<mapEntry key="org.eclipse.core.resources/save/metainfo" value="false"/> -<mapEntry key="org.eclipse.core.runtime/timing/startup" value="false"/> -<mapEntry key="org.eclipse.ui/perf/part.activate" value="200"/> -<mapEntry key="org.eclipse.core.runtime/perf" value="false"/> -<mapEntry key="org.eclipse.core.resources/contenttype" value="false"/> -<mapEntry key="org.eclipse.ui/debug/contributions" value="false"/> +<mapEntry key="org.eclipse.osgi/debug/services" value="false"/> +<mapEntry key="org.eclipse.update.core/debug/reconciler" value="false"/> +<mapEntry key="org.eclipse.jdt.core/perf/completion" value="300"/> +<mapEntry key="org.eclipse.ui/perf/part.control" value="800"/> +<mapEntry key="org.eclipse.ecf/debug/flag" value="true"/> <mapEntry key="org.eclipse.ui/debug/job.stale" value="false"/> -<mapEntry key="org.eclipse.jdt.ui/debug/allTypesCache" value="false"/> -<mapEntry key="org.eclipse.ui/perf/workbench.start" value="45000"/> -<mapEntry key="org.eclipse.jdt.core/debug/completion" value="false"/> -<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug" value="false"/> -<mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPartListener" value="false"/> -<mapEntry key="org.eclipse.jdt.core/debug/indexmanager" value="false"/> -<mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPerspectiveListener" value="false"/> -<mapEntry key="org.eclipse.osgi/debug/loader" value="false"/> -<mapEntry key="org.eclipse.ecf.discovery/debug/flag" value="true"/> -<mapEntry key="org.eclipse.osgi/defaultprofile/logsynchronously" value="false"/> -<mapEntry key="org.eclipse.osgi/trace/classLoading" value="false"/> -<mapEntry key="org.eclipse.core.runtime/debug" value="false"/> -<mapEntry key="org.eclipse.ui/trace/handlers.verbose.commandId" value=""/> -<mapEntry key="org.eclipse.osgi/debug/filter" value="false"/> -<mapEntry key="org.eclipse.ecf.datashare/SimpleMulticaster" value="true"/> -<mapEntry key="org.eclipse.jdt.ui/debug/ASTProvider" value="false"/> -<mapEntry key="org.eclipse.ecf.example.collab/debug/filter" value="*"/> -<mapEntry key="org.eclipse.core.runtime/loader/debug/filter/class" value="*"/> -<mapEntry key="org.eclipse.ecf.provider/debug" value="true"/> -<mapEntry key="org.eclipse.core.runtime/jobs/timing" value="false"/> -<mapEntry key="org.eclipse.core.runtime/loader/debug/prefixes/failure" value="false"/> -<mapEntry key="org.eclipse.ecf.example.collab/debug/urlsharedobject" value="false"/> -<mapEntry key="org.eclipse.ecf.provider.xmpp/debug/xmppsharedobject" value="true"/> -<mapEntry key="org.eclipse.help.webapp/debug/workingsets" value="false"/> -<mapEntry key="org.eclipse.osgi/defaultprofile/logfilename" value=""/> -<mapEntry key="org.eclipse.ecf.example.collab/debug" value="true"/> -<mapEntry key="org.eclipse.core.runtime/loader/debug/filter/loader" value="*"/> -<mapEntry key="org.eclipse.core.runtime/loader/debug/actions" value="false"/> -<mapEntry key="org.eclipse.core.runtime/url/debug/connect" value="false"/> -<mapEntry key="org.eclipse.jface.text/debug/ContentAssistSubjectAdapters" value="false"/> -<mapEntry key="org.eclipse.core.resources/restore/markers" value="false"/> -<mapEntry key="org.eclipse.ui/trace/graphics" value="false"/> +<mapEntry key="org.eclipse.ui/perf/uijob" value="200"/> <mapEntry key="org.eclipse.jdt.core/debug/resolution" value="false"/> -<mapEntry key="org.eclipse.team.cvs.ssh/ssh_protocol" value="false"/> -<mapEntry key="org.eclipse.core.resources/perf/snapshot" value="1000"/> +<mapEntry key="org.eclipse.help.base/debug" value="true"/> +<mapEntry key="org.eclipse.ui.intro/debug" value="true"/> +<mapEntry key="org.eclipse.jdt.core/perf/containerinitializer" value="5000"/> +<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug" value="false"/> +<mapEntry key="org.eclipse.core.resources/build/invoking" value="false"/> +<mapEntry key="org.eclipse.core.resources/restore/tree" value="false"/> <mapEntry key="org.eclipse.ecf.provider/debug/filter" value="*"/> -<mapEntry key="org.eclipse.core.runtime/registry/debug" value="false"/> -<mapEntry key="org.eclipse.osgi/debug/packages" value="false"/> -<mapEntry key="org.eclipse.ecf.provider.jms/debug/flag" value="true"/> -<mapEntry key="org.eclipse.core.runtime/loader/debug/prefixes" value="false"/> -<mapEntry key="org.eclipse.ui/perf/part.init" value="800"/> -<mapEntry key="org.eclipse.ui.intro/trace/logPerformance" value="false"/> -<mapEntry key="org.eclipse.osgi/eclipseadaptor/converter/debug" value="false"/> -<mapEntry key="org.eclipse.ui/perf/part.create" value="800"/> -<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug/platformadmin" value="false"/> -<mapEntry key="org.eclipse.help.ui/debug/embeddedBrowser" value="false"/> -<mapEntry key="org.eclipse.core.runtime/preferences/set" value="false"/> -<mapEntry key="org.eclipse.team.core/streams" value="false"/> -<mapEntry key="org.eclipse.core.runtime/jobs/locks" value="false"/> -<mapEntry key="org.eclipse.ui/trace/keyBindings" value="false"/> -<mapEntry key="org.eclipse.core.resources/build/stacktrace" value="false"/> +<mapEntry key="org.eclipse.osgi/monitor/classes" value="false"/> <mapEntry key="org.eclipse.jdt.ui/debug/TypeConstraints" value="false"/> -<mapEntry key="org.eclipse.core.runtime/registry/debug/dump" value=""/> -<mapEntry key="org.eclipse.ecf.ui/debug/flag" value="true"/> -<mapEntry key="org.eclipse.ui/perf/showHeapStatus" value="true"/> -<mapEntry key="org.eclipse.ecf.example.collab/debug/progsharedobject" value="false"/> -<mapEntry key="org.eclipse.ui/perf/contentTypes" value="200"/> -<mapEntry key="org.eclipse.core.resources/build/delta" value="false"/> -<mapEntry key="org.eclipse.jdt.core/debug/search" value="false"/> -<mapEntry key="org.eclipse.ecf/debug/connectionfactory" value="false"/> -<mapEntry key="org.eclipse.jdt.core/perf/completion" value="300"/> -<mapEntry key="org.eclipse.jdt.ui/debug/checkCoreBindingIsEqualTo" value="false"/> -<mapEntry key="org.eclipse.jdt.core/debug/compiler" value="false"/> +<mapEntry key="org.eclipse.ecf.example.collab/debug" value="true"/> +<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug/location" value="false"/> +<mapEntry key="org.eclipse.core.resources/save" value="false"/> +<mapEntry key="org.eclipse.ui.intro/trace/logPerformance" value="false"/> +<mapEntry key="org.eclipse.core.resources/restore/syncinfo" value="false"/> +<mapEntry key="org.eclipse.debug.core/debug" value="true"/> +<mapEntry key="org.eclipse.team.ftp/requests" value="true"/> +<mapEntry key="org.eclipse.osgi/resolver/requires" value="false"/> +<mapEntry key="org.eclipse.ecf.provider/debug/sharedobjectcontext" value="false"/> +<mapEntry key="org.eclipse.ecf.provider/debug/container" value="false"/> +<mapEntry key="org.eclipse.jdt.ui/perf/search/participants" value="300"/> +<mapEntry key="org.eclipse.core.resources/build/needbuild" value="false"/> +<mapEntry key="org.eclipse.core.runtime/jobs/timing" value="false"/> +<mapEntry key="org.eclipse.core.resources/restore/snapshots" value="false"/> +<mapEntry key="org.eclipse.core.runtime/loader/debug/prefixes" value="false"/> +<mapEntry key="org.eclipse.help.ui/debug" value="true"/> +<mapEntry key="org.eclipse.osgi/profile/startup" value="false"/> +<mapEntry key="org.eclipse.ecf.datashare/OrderedMulticaster" value="true"/> +<mapEntry key="org.eclipse.jdt.core/perf/javadeltalistener" value="500"/> <mapEntry key="org.eclipse.ecf.example.collab/debug/filetransfersharedobject" value="true"/> +<mapEntry key="org.eclipse.ecf.sdo/SharedDataGraph" value="true"/> +<mapEntry key="org.eclipse.core.runtime/registry/debug/resolve" value="false"/> +<mapEntry key="org.eclipse.core.runtime/config/debug" value="false"/> +<mapEntry key="org.eclipse.jdt.core/debug/javamodel" value="false"/> +<mapEntry key="org.eclipse.update.core/debug/install" value="false"/> +<mapEntry key="org.eclipse.update.core/debug/warning" value="false"/> +<mapEntry key="org.eclipse.team.ftp/responses" value="true"/> +<mapEntry key="org.eclipse.jdt.ui/perf/explorer/createPartControl" value="1300"/> +<mapEntry key="org.eclipse.core.runtime/registry/debug" value="false"/> +<mapEntry key="org.eclipse.ecf.sdo/debug" value="true"/> +<mapEntry key="org.eclipse.pde.core/debug" value="true"/> +<mapEntry key="org.eclipse.osgi/monitor/activation" value="false"/> +<mapEntry key="org.eclipse.core.resources/perf/builders" value="10000"/> +<mapEntry key="org.eclipse.core.runtime/debug" value="false"/> +<mapEntry key="org.eclipse.core.runtime/loader/debug/filter/native" value="*"/> +<mapEntry key="org.eclipse.ui/perf/part.activate" value="200"/> +<mapEntry key="org.eclipse.help/debug" value="true"/> +<mapEntry key="org.eclipse.jdt.core/debug/builder" value="false"/> +<mapEntry key="org.eclipse.core.runtime/preferences/set" value="false"/> +<mapEntry key="org.eclipse.jdt.ui/debug/allTypesCache" value="false"/> <mapEntry key="org.eclipse.ecf.provider/debug/connection" value="true"/> +<mapEntry key="org.eclipse.core.resources/restore/metainfo" value="false"/> +<mapEntry key="org.eclipse.team.cvs.ssh/ssh_protocol" value="false"/> +<mapEntry key="org.eclipse.jdt.core/perf/reconcile" value="1000"/> +<mapEntry key="org.eclipse.ui/trace/contexts" value="false"/> <mapEntry key="org.eclipse.jdt.ui/debug" value="true"/> +<mapEntry key="org.eclipse.core.runtime/preferences/get" value="false"/> +<mapEntry key="org.eclipse.ecf.example.collab/debug/flag" value="true"/> +<mapEntry key="org.eclipse.ui/perf/part.input" value="200"/> +<mapEntry key="org.eclipse.ecf.provider/debug/sharedobjectwrapper" value="false"/> +<mapEntry key="org.eclipse.ecf.ui/debug/flag" value="true"/> +<mapEntry key="org.eclipse.jdt.core/debug/cpresolution" value="false"/> +<mapEntry key="org.eclipse.ui/debug/showSystemJobs" value="false"/> +<mapEntry key="org.eclipse.team.cvs.core/cvsprotocol" value="true"/> +<mapEntry key="org.eclipse.ecf.provider/debug/containerfactory" value="false"/> +<mapEntry key="org.eclipse.core.runtime/loader/debug/success" value="false"/> +<mapEntry key="org.eclipse.osgi/resolver/cycles" value="false"/> +<mapEntry key="org.eclipse.ecf.provider.xmpp/debug/smackdebug" value="true"/> +<mapEntry key="org.eclipse.osgi/eclipseadaptor/converter/debug" value="false"/> +<mapEntry key="org.eclipse.ui/listeners/IWorkbenchPartReference" value="false"/> +<mapEntry key="org.eclipse.core.runtime/loader/debug/create" value="false"/> +<mapEntry key="org.eclipse.ecf.provider.xmpp/debug/flag" value="true"/> <mapEntry key="org.eclipse.ecf.provider.jmdns/debug/flag" value="true"/> -<mapEntry key="org.eclipse.core.runtime/registry/debug/events/plugin" value="false"/> -<mapEntry key="org.eclipse.update.core/debug/configuration" value="false"/> -<mapEntry key="org.eclipse.osgi/debug/messageBundles" value="false"/> +<mapEntry key="org.eclipse.core.resources/history" value="false"/> <mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPartListener2" value="false"/> -<mapEntry key="org.eclipse.ui/listeners/IWorkbenchPage.IPartListener2" value="false"/> -<mapEntry key="org.eclipse.jdt.core/perf/reconcile" value="1000"/> -<mapEntry key="org.eclipse.help.webapp/debug" value="true"/> -<mapEntry key="org.eclipse.jdt.core/debug/hierarchy" value="false"/> -<mapEntry key="org.eclipse.core.resources/refresh" value="false"/> -<mapEntry key="org.eclipse.team.core/backgroundevents" value="false"/> -<mapEntry key="org.eclipse.ltk.core.refactoring/perf/participants/createChanges" value="300"/> -<mapEntry key="org.eclipse.jdt.core/debug/cpresolution" value="false"/> -<mapEntry key="org.eclipse.ecf/debug/flag" value="true"/> -<mapEntry key="org.eclipse.update.core/debug/warning" value="false"/> -<mapEntry key="org.eclipse.core.resources/save" value="false"/> -<mapEntry key="org.eclipse.ecf.provider/debug/flag" value="true"/> -<mapEntry key="org.eclipse.update.core/debug/parsing" value="false"/> -<mapEntry key="org.eclipse.jdt.ui/perf/explorer/makeActions" value="1000"/> -<mapEntry key="org.eclipse.core.resources/restore/syncinfo" value="false"/> -<mapEntry key="org.eclipse.core.runtime/preferences/general" value="false"/> -<mapEntry key="org.eclipse.team.core/threading" value="false"/> -<mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPageListener" value="false"/> -<mapEntry key="org.eclipse.core.runtime/url/debug/cachelookup" value="false"/> -<mapEntry key="org.eclipse.osgi/debug/packageadmin/timing" value="false"/> -<mapEntry key="org.eclipse.update.core/debug/reconciler" value="false"/> -<mapEntry key="org.eclipse.osgi/debug/security" value="false"/> +<mapEntry key="org.eclipse.help.webapp/debug/workingsets" value="false"/> +<mapEntry key="org.eclipse.ecf.provider.jmdns/debug/jmdns" value="true"/> +<mapEntry key="org.eclipse.osgi/resolver/grouping" value="false"/> +<mapEntry key="org.eclipse.jdt.core/debug/buffermanager" value="false"/> +<mapEntry key="org.eclipse.ecf.provider.xmpp/debug/xmppsharedobject" value="true"/> +<mapEntry key="org.eclipse.core.resources/build/delta" value="false"/> +<mapEntry key="org.eclipse.osgi/resolver/imports" value="false"/> +<mapEntry key="org.eclipse.osgi/defaultprofile/logsynchronously" value="false"/> +<mapEntry key="org.eclipse.ecf/debug" value="true"/> <mapEntry key="org.eclipse.core.resources/save/syncinfo" value="false"/> -<mapEntry key="org.eclipse.osgi/profile/startup" value="false"/> -<mapEntry key="org.eclipse.core.runtime/loader/debug/filter/resource" value="*"/> -<mapEntry key="org.eclipse.ecf.ui/debug/filter" value="*"/> -<mapEntry key="org.eclipse.ecf.provider/debug/basesharedobject" value="false"/> -<mapEntry key="org.eclipse.osgi/debug/services" value="false"/> -<mapEntry key="org.eclipse.core.resources/save/markers" value="false"/> -<mapEntry key="org.eclipse.ecf.provider/debug/gmm" value="false"/> -<mapEntry key="org.eclipse.osgi/monitor/resources" value="false"/> -<mapEntry key="org.eclipse.jdt.core/debug/selection" value="false"/> <mapEntry key="org.eclipse.jdt.ui/debug/ResultCollector" value="false"/> -<mapEntry key="org.eclipse.core.resources/restore/snapshots" value="false"/> -<mapEntry key="org.eclipse.jdt.ui/perf/explorer/createPartControl" value="1300"/> -<mapEntry key="org.eclipse.team.cvs.core/dirtycaching" value="false"/> -<mapEntry key="org.eclipse.pde.core/cache" value="false"/> -<mapEntry key="org.eclipse.jdt.core/debug/zipaccess" value="false"/> +<mapEntry key="org.eclipse.core.expressions/tracePropertyResolving" value="false"/> +<mapEntry key="org.eclipse.ui/perf/showHeapStatus" value="true"/> +<mapEntry key="org.eclipse.ui/perf/part.listeners" value="200"/> +<mapEntry key="org.eclipse.osgi/resolver/wiring" value="false"/> <mapEntry key="org.eclipse.core.runtime/url/debug/cachecopy" value="false"/> -<mapEntry key="org.eclipse.core.runtime/loader/debug/properties" value="false"/> -<mapEntry key="org.eclipse.osgi/debug/bundleTime" value="false"/> -<mapEntry key="org.eclipse.ui/trace/operations.verbose" value="false"/> -<mapEntry key="org.eclipse.ecf.provider.jms/debug/filter" value="*"/> -<mapEntry key="org.eclipse.core.runtime/jobs/beginend" value="false"/> -<mapEntry key="org.eclipse.team.cvs.core/metafiles" value="false"/> -<mapEntry key="org.eclipse.team.core/debug" value="false"/> -<mapEntry key="org.eclipse.ecf.datashare/OrderedMulticaster" value="true"/> -<mapEntry key="org.eclipse.ui/perf/workbench.restore" value="30000"/> -<mapEntry key="org.eclipse.osgi/debug/events" value="false"/> -<mapEntry key="org.eclipse.ecf.provider/debug/sharedobjectcontext" value="false"/> +<mapEntry key="org.eclipse.jdt.ui/perf/explorer/RefactorActionGroup" value="150"/> +<mapEntry key="org.eclipse.pde.core/classpath" value="false"/> +<mapEntry key="org.eclipse.core.resources/restore" value="false"/> +<mapEntry key="org.eclipse.update.core/debug/web" value="false"/> +<mapEntry key="org.eclipse.ecf.discovery/debug" value="true"/> +<mapEntry key="org.eclipse.help.webapp/debug" value="true"/> +<mapEntry key="org.eclipse.jdt.core/debug/search" value="false"/> <mapEntry key="org.eclipse.jdt.ui/debug/useUIBindingGetJavaElement" value="false"/> -<mapEntry key="org.eclipse.ecf.discovery/debug/filter" value="*"/> <mapEntry key="org.eclipse.core.runtime/loader/debug/prefixes/success" value="false"/> -<mapEntry key="org.eclipse.osgi/debug/monitorbundles" value="false"/> -<mapEntry key="org.eclipse.core.runtime/debug/pluginstopper" value="false"/> -<mapEntry key="org.eclipse.ui.ide/debug/internalerror/openDialog" value="false"/> -<mapEntry key="org.eclipse.ecf.provider.xmpp/debug/smackdebug" value="true"/> -<mapEntry key="org.eclipse.ui/perf/uijob" value="200"/> +<mapEntry key="org.eclipse.ecf.example.collab/debug/progsharedobject" value="false"/> +<mapEntry key="org.eclipse.osgi/defaultprofile/logfilename" value=""/> +<mapEntry key="org.eclipse.osgi/debug/startlevel" value="false"/> <mapEntry key="org.eclipse.jdt.core/debug/sourcemapper" value="false"/> -<mapEntry key="org.eclipse.osgi/resolver/wiring" value="false"/> -<mapEntry key="org.eclipse.osgi/profile/debug" value="false"/> -<mapEntry key="org.eclipse.jdt.core/perf/javadeltalistener" value="500"/> -<mapEntry key="org.eclipse.ui/trace/contexts" value="false"/> -<mapEntry key="org.eclipse.core.resources/build/invoking" value="false"/> -<mapEntry key="org.eclipse.ecf.provider.xmpp/debug/xmpppresencesharedobject" value="false"/> -<mapEntry key="org.eclipse.core.runtime/loader/debug/failure" value="false"/> -<mapEntry key="org.eclipse.core.resources/perf/builders" value="10000"/> +<mapEntry key="org.eclipse.osgi/defaultprofile/buffersize" value="256"/> +<mapEntry key="org.eclipse.core.resources/save/markers" value="false"/> +<mapEntry key="org.eclipse.osgi/debug/manifest" value="false"/> +<mapEntry key="org.eclipse.ui.intro/trace/logInfo" value="true"/> +<mapEntry key="org.eclipse.core.runtime/perf" value="false"/> +<mapEntry key="org.eclipse.core.runtime/loader/debug/properties" value="false"/> +<mapEntry key="org.eclipse.ecf.ui/debug/textchatcomposite" value="true"/> +<mapEntry key="org.eclipse.jdt.core/debug/hierarchy" value="false"/> +<mapEntry key="org.eclipse.ecf.discovery/debug/filter" value="*"/> +<mapEntry key="org.eclipse.ecf.provider/debug/gmm" value="false"/> +<mapEntry key="org.eclipse.core.resources/refresh" value="false"/> +<mapEntry key="org.eclipse.core.runtime/jobs/locks" value="false"/> +<mapEntry key="org.eclipse.ecf.example.collab/debug/genericsharedobject" value="true"/> +<mapEntry key="org.eclipse.update.core/debug/installhandler" value="false"/> +<mapEntry key="org.eclipse.core.resources/save/metainfo" value="false"/> +<mapEntry key="org.eclipse.ui/debug/contributions" value="false"/> +<mapEntry key="org.eclipse.ui/trace/operations.verbose" value="false"/> +<mapEntry key="org.eclipse.core.runtime/loader/debug/filter/loader" value="*"/> +<mapEntry key="org.eclipse.core.resources/restore/mastertable" value="false"/> +<mapEntry key="org.eclipse.core.runtime/registry/debug/events/plugin" value="false"/> +<mapEntry key="org.eclipse.osgi/trace/activation" value="false"/> +<mapEntry key="org.eclipse.ui.ide/debug" value="false"/> +<mapEntry key="org.eclipse.ui/trace/keyBindings" value="false"/> <mapEntry key="org.eclipse.update.core/debug/type" value="false"/> -<mapEntry key="org.eclipse.ui/trace/operations" value="false"/> -<mapEntry key="org.eclipse.ui/perf/page.listeners" value="200"/> -<mapEntry key="org.eclipse.jdt.ui/perf/explorer/RefactorActionGroup" value="150"/> -<mapEntry key="org.eclipse.core.resources/history" value="false"/> -<mapEntry key="org.eclipse.team.core/refreshjob" value="false"/> -<mapEntry key="org.eclipse.ui.intro/debug" value="true"/> -<mapEntry key="org.eclipse.ecf.discovery/debug" value="true"/> -<mapEntry key="org.eclipse.debug.core/debug" value="true"/> -<mapEntry key="org.eclipse.help/debug" value="true"/> -<mapEntry key="org.eclipse.ui/debug" value="false"/> +<mapEntry key="org.eclipse.ecf.datashare/debug" value="true"/> +<mapEntry key="org.eclipse.core.runtime/loader/debug/actions" value="false"/> +<mapEntry key="org.eclipse.ui.browser/debug" value="false"/> +<mapEntry key="org.eclipse.jdt.core/perf/variableinitializer" value="5000"/> +<mapEntry key="org.eclipse.help/debug/context" value="false"/> +<mapEntry key="org.eclipse.jdt.ui/debug/checkCoreBindingIsEqualTo" value="false"/> +<mapEntry key="org.eclipse.update.core/debug/configuration" value="false"/> <mapEntry key="org.eclipse.osgi/debug/packageadmin" value="false"/> -<mapEntry key="org.eclipse.ecf.provider/debug/container" value="false"/> +<mapEntry key="org.eclipse.ecf/debug/factoryinit" value="true"/> +<mapEntry key="org.eclipse.ecf.provider/debug/sharedobjectmanager" value="false"/> +<mapEntry key="org.eclipse.jdt.core/debug/completion" value="false"/> +<mapEntry key="org.eclipse.pde.build/debug" value="false"/> +<mapEntry key="org.eclipse.jface.text/debug/ContentAssistSubjectAdapters" value="false"/> +<mapEntry key="org.eclipse.osgi/debug/security" value="false"/> +<mapEntry key="org.eclipse.core.runtime/compatibility/debug" value="false"/> +<mapEntry key="org.eclipse.ui/trace/graphics" value="false"/> +<mapEntry key="org.eclipse.update.core/debug" value="true"/> +<mapEntry key="org.eclipse.team.ftp/list" value="true"/> +<mapEntry key="org.eclipse.team.core/debug" value="false"/> +<mapEntry key="org.eclipse.help.ui/debug/infopop" value="false"/> +<mapEntry key="org.eclipse.osgi/trace/filename" value="runtime.traces"/> +<mapEntry key="org.eclipse.core.runtime/jobs" value="false"/> +<mapEntry key="org.eclipse.ui/trace/handlers.verbose" value="false"/> +<mapEntry key="org.eclipse.core.runtime/timing/startup" value="false"/> +<mapEntry key="org.eclipse.ecf.sdo/DataGraphSharingFactory" value="true"/> +<mapEntry key="org.eclipse.osgi/resolver/debug" value="false"/> +<mapEntry key="org.eclipse.jface.text/debug/AnnotationPainter" value="false"/> +<mapEntry key="org.eclipse.core.runtime/debug/pluginstopper" value="false"/> +<mapEntry key="org.eclipse.ui/trace/handlers.verbose.commandId" value=""/> +<mapEntry key="org.eclipse.ecf/debug/idfactory" value="false"/> +<mapEntry key="org.eclipse.ui.intro/trace/printHTML" value="false"/> +<mapEntry key="org.eclipse.ecf.provider.jms/debug" value="true"/> +<mapEntry key="org.eclipse.ui/listeners/IWorkbenchPage.IPropertyChangeListener" value="false"/> +<mapEntry key="org.eclipse.team.core/threading" value="false"/> +<mapEntry key="org.eclipse.jdt.core/debug/javadelta" value="false"/> +<mapEntry key="org.eclipse.ui/debug" value="false"/> +<mapEntry key="org.eclipse.jdt.core/debug/zipaccess" value="false"/> +<mapEntry key="org.eclipse.team.core/backgroundevents" value="false"/> +<mapEntry key="org.eclipse.ecf.provider.jms/debug/filter" value="*"/> +<mapEntry key="org.eclipse.osgi/trace/filters" value="trace.properties"/> +<mapEntry key="org.eclipse.jdt.core/debug/javadelta/verbose" value="false"/> +<mapEntry key="org.eclipse.core.resources/debug" value="false"/> +<mapEntry key="ort.eclipse.ecf/debug/sharedobjectcontainerfactory" value="true"/> +<mapEntry key="org.eclipse.jdt.ui/debug/checkCoreBindingGetJavaElement" value="false"/> +<mapEntry key="org.eclipse.core.runtime/debug/context" value="false"/> +<mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPerspectiveListener" value="false"/> +<mapEntry key="org.eclipse.core.resources/build/stacktrace" value="false"/> +<mapEntry key="org.eclipse.ecf.sdo/EMFUpdateManager" value="true"/> +<mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPartListener" value="false"/> +<mapEntry key="org.eclipse.osgi/debug/bundleTime" value="false"/> +<mapEntry key="org.eclipse.ecf.provider/debug" value="true"/> <mapEntry key="org.eclipse.core.resources/build/failure" value="false"/> +<mapEntry key="org.eclipse.osgi/profile/impl" value="org.eclipse.osgi.internal.profile.DefaultProfileLogger"/> +<mapEntry key="org.eclipse.ecf.discovery/debug/flag" value="true"/> +<mapEntry key="org.eclipse.ui/perf/workbench.restore" value="30000"/> +<mapEntry key="org.eclipse.core.runtime/loader/debug/filter/resource" value="*"/> +<mapEntry key="org.eclipse.jdt.core/debug" value="true"/> +<mapEntry key="org.eclipse.ecf.provider.xmpp/debug/xmpppresencesharedobject" value="false"/> +<mapEntry key="org.eclipse.osgi/debug/filter" value="false"/> +<mapEntry key="org.eclipse.ecf/debug/filter" value="*"/> +<mapEntry key="org.eclipse.update.configurator/debug" value="false"/> +<mapEntry key="org.eclipse.osgi/debug/monitorbundles" value="false"/> +<mapEntry key="org.eclipse.ecf.provider.jmdns/debug/filter" value="*"/> +<mapEntry key="org.eclipse.team.cvs.core/metafiles" value="false"/> +<mapEntry key="org.eclipse.core.resources/contenttype" value="false"/> +<mapEntry key="org.eclipse.ui/trace/operations" value="false"/> +<mapEntry key="org.eclipse.core.runtime/registry/debug/dump" value=""/> +<mapEntry key="org.eclipse.help/debug/protocols" value="false"/> +<mapEntry key="org.eclipse.ui/listeners/IWorkbenchPage.IPartListener2" value="false"/> +<mapEntry key="org.eclipse.osgi/debug/loader" value="false"/> +<mapEntry key="org.eclipse.jdt.ui/debug/ASTProvider" value="false"/> +<mapEntry key="org.eclipse.core.resources/preferences" value="false"/> +<mapEntry key="org.eclipse.team.ftp/debug" value="false"/> +<mapEntry key="org.eclipse.core.resources/perf/snapshot" value="1000"/> <mapEntry key="org.eclipse.ui/trace/handlers" value="false"/> -<mapEntry key="org.eclipse.ecf.ui/debug" value="true"/> -<mapEntry key="org.eclipse.ui/listeners/IWorkbenchPage.IPropertyChangeListener" value="false"/> +<mapEntry key="org.eclipse.ui/perf/perspective.listeners" value="200"/> +<mapEntry key="org.eclipse.core.runtime/jobs/beginend" value="false"/> +<mapEntry key="org.eclipse.core.runtime/loader/debug/prefixes/failure" value="false"/> +<mapEntry key="org.eclipse.osgi/debug/events" value="false"/> <mapEntry key="org.eclipse.ecf.provider.jmdns/debug" value="true"/> -<mapEntry key="org.eclipse.ui.browser/debug" value="false"/> -<mapEntry key="org.eclipse.core.resources/save/tree" value="false"/> -<mapEntry key="org.eclipse.core.runtime/config/debug" value="false"/> -<mapEntry key="org.eclipse.help.ui/debug" value="true"/> -<mapEntry key="org.eclipse.core.resources/restore/metainfo" value="false"/> -<mapEntry key="org.eclipse.core.resources/save/mastertable" value="false"/> -<mapEntry key="org.eclipse.pde.core/debug" value="true"/> -<mapEntry key="org.eclipse.jdt.core/debug/buffermanager" value="false"/> -<mapEntry key="org.eclipse.ecf.provider.jmdns/debug/jmdns" value="true"/> -<mapEntry key="org.eclipse.osgi/resolver/grouping" value="false"/> -<mapEntry key="org.eclipse.core.runtime/loader/debug/success" value="false"/> -<mapEntry key="org.eclipse.ui.ide/debug" value="false"/> -<mapEntry key="org.eclipse.ui.intro/trace/logInfo" value="true"/> -<mapEntry key="org.eclipse.core.resources/restore/mastertable" value="false"/> -<mapEntry key="org.eclipse.pde.core/classpath" value="false"/> +<mapEntry key="org.eclipse.osgi/trace/classLoading" value="false"/> +<mapEntry key="org.eclipse.ecf.datashare/SimpleMulticaster" value="true"/> +<mapEntry key="org.eclipse.ui/trace/contexts.verbose" value="false"/> +<mapEntry key="org.eclipse.osgi/profile/benchmark" value="false"/> +<mapEntry key="org.eclipse.ecf.provider/debug/flag" value="true"/> +<mapEntry key="org.eclipse.ui/perf/perspective.create" value="800"/> +<mapEntry key="org.eclipse.core.runtime/preferences/general" value="false"/> +<mapEntry key="org.eclipse.ecf/debug/containerfactory" value="true"/> +<mapEntry key="org.eclipse.core.runtime/loader/debug/activateplugin" value="false"/> +<mapEntry key="org.eclipse.core.runtime/url/debug" value="false"/> +<mapEntry key="org.eclipse.team.cvs.ssh/debug" value="false"/> +<mapEntry key="org.eclipse.ui/perf/part.init" value="800"/> +<mapEntry key="org.eclipse.core.runtime/perf/success" value="false"/> +<mapEntry key="org.eclipse.ltk.core.refactoring/perf/participants/createChanges" value="300"/> +<mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPageListener" value="false"/> +<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug/platformadmin" value="false"/> +<mapEntry key="org.eclipse.team.cvs.core/dirtycaching" value="false"/> +<mapEntry key="org.eclipse.core.resources/natures" value="false"/> +<mapEntry key="org.eclipse.team.core/refreshjob" value="false"/> +<mapEntry key="org.eclipse.ecf.provider.xmpp/debug/smackconnection" value="true"/> +<mapEntry key="org.eclipse.ecf.provider/debug/basesharedobject" value="false"/> +<mapEntry key="org.eclipse.core.resources/perf/save.participants" value="500"/> </mapAttribute> -<stringAttribute key="selectedPlugin" value="org.eclipse.ecf.provider"/> +<stringAttribute key="selectedPlugin" value="org.eclipse.ecf"/> <booleanAttribute key="automaticAdd" value="false"/> -<stringAttribute key="checked" value="org.eclipse.ecf.provider"/> +<stringAttribute key="checked" value="org.eclipse.ecf"/> <booleanAttribute key="includeFragments" value="false"/> <stringAttribute key="configLocation" value=""/> <booleanAttribute key="clearws" value="false"/> <stringAttribute key="location1" value="C:\eclipse3.1m4\eclipse\runtime-workspace"/> <stringAttribute key="templateConfig" value=""/> -<stringAttribute key="vmargs" value=""/> <booleanAttribute key="default" value="true"/> +<stringAttribute key="vmargs" value=""/> <booleanAttribute key="clearConfig" value="true"/> <booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/> -<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/> <booleanAttribute key="useDefaultConfigArea" value="true"/> -<booleanAttribute key="useDefaultConfig" value="true"/> +<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/> <stringAttribute key="progargs" value=""/> +<booleanAttribute key="useDefaultConfig" value="true"/> <booleanAttribute key="askclear" value="false"/> <booleanAttribute key="includeOptional" value="true"/> <mapAttribute key="org.eclipse.debug.core.environmentVariables"> diff --git a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/DiscoveryStartup.java b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/DiscoveryStartup.java index 5f97c0079..68128c781 100644 --- a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/DiscoveryStartup.java +++ b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/DiscoveryStartup.java @@ -9,9 +9,10 @@ import java.util.Properties; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; +import org.eclipse.ecf.core.ContainerFactory; +import org.eclipse.ecf.core.ContainerInstantiationException; +import org.eclipse.ecf.core.IContainer; import org.eclipse.ecf.core.ISharedObjectContainer; -import org.eclipse.ecf.core.SharedObjectContainerFactory; -import org.eclipse.ecf.core.SharedObjectContainerInstantiationException; import org.eclipse.ecf.core.identity.ID; import org.eclipse.ecf.core.identity.IDFactory; import org.eclipse.ecf.core.identity.ServiceID; @@ -47,7 +48,7 @@ public class DiscoveryStartup { public static final int SVC_DEF_PRIORITY = 0; static IDiscoveryContainer discovery = null; - static ISharedObjectContainer socontainer = null; + static IContainer socontainer = null; protected DiscoveryView discoveryView = null; @@ -70,8 +71,8 @@ public class DiscoveryStartup { } protected void setupDiscovery() throws Exception { try { - socontainer = SharedObjectContainerFactory - .getDefault().makeSharedObjectContainer(DISCOVERY_CONTAINER); + socontainer = ContainerFactory + .getDefault().makeContainer(DISCOVERY_CONTAINER); discovery = (IDiscoveryContainer) socontainer .getAdapter(IDiscoveryContainer.class); if (discovery != null) { @@ -86,9 +87,10 @@ public class DiscoveryStartup { discovery = null; ClientPlugin.log("No discovery container available"); } - } catch (SharedObjectContainerInstantiationException e1) { + } catch (ContainerInstantiationException e1) { socontainer = null; discovery = null; + ClientPlugin.log("No discovery container available",e1); return; } catch (Exception e) { if (socontainer != null) { @@ -152,7 +154,7 @@ public class DiscoveryStartup { return discovery; } - public ISharedObjectContainer getSharedObjectContainer() { + public IContainer getContainer() { return socontainer; } diff --git a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ui/JoinGroupWizardPage.java b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ui/JoinGroupWizardPage.java index aae1e298b..2c9176d50 100644 --- a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ui/JoinGroupWizardPage.java +++ b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ui/JoinGroupWizardPage.java @@ -15,8 +15,8 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import org.eclipse.ecf.core.SharedObjectContainerDescription; -import org.eclipse.ecf.core.SharedObjectContainerFactory; +import org.eclipse.ecf.core.ContainerDescription; +import org.eclipse.ecf.core.ContainerFactory; import org.eclipse.jface.wizard.WizardPage; import org.eclipse.swt.SWT; import org.eclipse.swt.events.FocusEvent; @@ -115,12 +115,12 @@ public class JoinGroupWizardPage extends WizardPage { } } protected void fillCombo() { - List rawDescriptions = SharedObjectContainerFactory.getDefault().getDescriptions(); + List rawDescriptions = ContainerFactory.getDefault().getDescriptions(); int index = 0; int def = 0; Map defProps = null; for(Iterator i=rawDescriptions.iterator(); i.hasNext(); ) { - final SharedObjectContainerDescription desc = (SharedObjectContainerDescription) i.next(); + final ContainerDescription desc = (ContainerDescription) i.next(); String name = desc.getName(); String description = desc.getDescription(); Map props = desc.getProperties(); @@ -138,7 +138,7 @@ public class JoinGroupWizardPage extends WizardPage { } combo.addSelectionListener(new SelectionListener() { public void widgetSelected(SelectionEvent e) { - SharedObjectContainerDescription desc = (SharedObjectContainerDescription) combo.getData(combo.getSelectionIndex()+""); + ContainerDescription desc = (ContainerDescription) combo.getData(combo.getSelectionIndex()+""); Map props = desc.getProperties(); modifyUI(props); } @@ -252,7 +252,7 @@ public class JoinGroupWizardPage extends WizardPage { int index = combo.getSelectionIndex(); if (index == -1) return null; else { - SharedObjectContainerDescription desc = (SharedObjectContainerDescription) containerDescriptions.get(index); + ContainerDescription desc = (ContainerDescription) containerDescriptions.get(index); return desc.getName(); } } diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/app/ClientApplication.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/app/ClientApplication.java index 7d95ef1f3..ade5786a9 100644 --- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/app/ClientApplication.java +++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/app/ClientApplication.java @@ -1,8 +1,10 @@ package org.eclipse.ecf.provider.app; import java.util.Random; + +import org.eclipse.ecf.core.ContainerDescription; +import org.eclipse.ecf.core.ContainerFactory; import org.eclipse.ecf.core.ISharedObjectContainer; -import org.eclipse.ecf.core.SharedObjectContainerDescription; import org.eclipse.ecf.core.SharedObjectContainerFactory; import org.eclipse.ecf.core.SharedObjectDescription; import org.eclipse.ecf.core.comm.ConnectionDescription; @@ -46,7 +48,7 @@ public class ClientApplication { // IDs of sharedObjects created ID [] sharedObjects = null; - static SharedObjectContainerDescription contd = null; + static ContainerDescription contd = null; static Random aRan = new Random(); public ClientApplication() { super(); @@ -66,8 +68,8 @@ public class ClientApplication { // Setup factory descriptions since Eclipse does not do this for us ConnectionDescription cd = new ConnectionDescription(ClientApplication.class.getClassLoader(),CONNECTION_NAME,CONNECTION_CLASS,null); ConnectionFactory.addDescription(cd); - contd = new SharedObjectContainerDescription(ClientApplication.class.getClassLoader(),CONTAINER_FACTORY_NAME,CONTAINER_FACTORY_CLASS,null); - SharedObjectContainerFactory.getDefault().addDescription(contd); + contd = new ContainerDescription(ClientApplication.class.getClassLoader(),CONTAINER_FACTORY_NAME,CONTAINER_FACTORY_CLASS,null); + ContainerFactory.getDefault().addDescription(contd); for(int i=0; i < clientCount; i++) { sm[i] = makeClient(); } diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/ClientSOContainer.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/ClientSOContainer.java index 2d0984cce..d2333d06f 100644 --- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/ClientSOContainer.java +++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/ClientSOContainer.java @@ -83,10 +83,6 @@ public abstract class ClientSOContainer extends SOContainer { super.dispose(wait); } - public final boolean isGroupServer() { - return false; - } - public final boolean isGroupManager() { return false; } diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/ContainerInstantiator.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/ContainerInstantiator.java index 49369fefd..c97476b87 100644 --- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/ContainerInstantiator.java +++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/ContainerInstantiator.java @@ -8,17 +8,17 @@ ******************************************************************************/ package org.eclipse.ecf.provider.generic; -import org.eclipse.ecf.core.ISharedObjectContainer; -import org.eclipse.ecf.core.SharedObjectContainerDescription; -import org.eclipse.ecf.core.SharedObjectContainerInstantiationException; +import org.eclipse.ecf.core.ContainerDescription; +import org.eclipse.ecf.core.ContainerInstantiationException; +import org.eclipse.ecf.core.IContainer; import org.eclipse.ecf.core.identity.ID; import org.eclipse.ecf.core.identity.IDFactory; import org.eclipse.ecf.core.identity.IDInstantiationException; -import org.eclipse.ecf.core.provider.ISharedObjectContainerInstantiator; +import org.eclipse.ecf.core.provider.IContainerInstantiator; import org.eclipse.ecf.provider.Trace; public class ContainerInstantiator implements - ISharedObjectContainerInstantiator { + IContainerInstantiator { public static final String TCPCLIENT_NAME = "org.eclipse.ecf.provider.generic.Client"; public static final String TCPSERVER_NAME = "org.eclipse.ecf.provider.generic.Server"; @@ -59,9 +59,9 @@ public class ContainerInstantiator implements } else return new Integer(-1); } - public ISharedObjectContainer makeInstance( - SharedObjectContainerDescription description, Class[] argTypes, - Object[] args) throws SharedObjectContainerInstantiationException { + public IContainer makeInstance( + ContainerDescription description, Class[] argTypes, + Object[] args) throws ContainerInstantiationException { boolean isClient = true; if (description.getName().equals(TCPSERVER_NAME)) { debug("creating server"); @@ -86,7 +86,7 @@ public class ContainerInstantiator implements debug("id="+newID+";keepAlive="+ka); // new ID must not be null if (newID == null) - throw new SharedObjectContainerInstantiationException( + throw new ContainerInstantiationException( "id must be provided"); if (isClient) { return new TCPClientSOContainer(new SOContainerConfig(newID), @@ -97,11 +97,11 @@ public class ContainerInstantiator implements } } catch (ClassCastException e) { dumpStack("ClassCastException",e); - throw new SharedObjectContainerInstantiationException( + throw new ContainerInstantiationException( "Parameter type problem creating container", e); } catch (Exception e) { dumpStack("Exception",e); - throw new SharedObjectContainerInstantiationException( + throw new ContainerInstantiationException( "Exception creating generic container", e); } } diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOContainer.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOContainer.java index ccf089dd7..41d49300c 100644 --- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOContainer.java +++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOContainer.java @@ -455,7 +455,8 @@ public abstract class SOContainer implements ISharedObjectContainer { * @see org.eclipse.ecf.core.ISharedObjectContainer#getAdapter(java.lang.Class) */ public Object getAdapter(Class adapter) { - return null; + if (adapter.equals(ISharedObjectContainer.class)) return this; + else return null; } /** diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/ServerSOContainer.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/ServerSOContainer.java index c6c82b43a..08342f38e 100644 --- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/ServerSOContainer.java +++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/ServerSOContainer.java @@ -46,7 +46,7 @@ public class ServerSOContainer extends SOContainer implements ISharedObjectConta public Object getAdapter(Class clazz) { if (clazz.equals(ISharedObjectContainerGroupManager.class)) { return this; - } else return null; + } else return super.getAdapter(clazz); } public boolean isGroupManager() { return true; diff --git a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/views/DiscoveryView.java b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/views/DiscoveryView.java index a5ac038eb..c0b2b318f 100644 --- a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/views/DiscoveryView.java +++ b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/views/DiscoveryView.java @@ -18,7 +18,7 @@ import java.util.Iterator; import java.util.Map; import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.ecf.core.ISharedObjectContainer; +import org.eclipse.ecf.core.IContainer; import org.eclipse.ecf.core.identity.ServiceID; import org.eclipse.ecf.discovery.IDiscoveryContainer; import org.eclipse.ecf.discovery.IServiceInfo; @@ -58,7 +58,7 @@ public class DiscoveryView extends ViewPart { private Action connectContainerAction; IDiscoveryContainer dcontainer = null; - ISharedObjectContainer socontainer = null; + IContainer socontainer = null; IDiscoveryController controller = null; String [] controllerServiceTypes = null; @@ -82,7 +82,7 @@ public class DiscoveryView extends ViewPart { public void run() { DiscoveryView.this.controller = controller; if (controller != null) { - setContainers(controller.getDiscoveryContainer(),controller.getSharedObjectContainer(),controller.getServiceTypes()); + setContainers(controller.getDiscoveryContainer(),controller.getContainer(),controller.getServiceTypes()); } else { setContainers(null,null,null); } @@ -90,7 +90,7 @@ public class DiscoveryView extends ViewPart { }); } - protected void setContainers(IDiscoveryContainer dcontainer, ISharedObjectContainer socont, String [] svcTypes) { + protected void setContainers(IDiscoveryContainer dcontainer, IContainer socont, String [] svcTypes) { this.dcontainer = dcontainer; this.socontainer = socont; this.controllerServiceTypes = svcTypes; diff --git a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/views/IDiscoveryController.java b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/views/IDiscoveryController.java index 2edc2ce6e..fa96d5e20 100644 --- a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/views/IDiscoveryController.java +++ b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/views/IDiscoveryController.java @@ -1,12 +1,12 @@ package org.eclipse.ecf.ui.views; -import org.eclipse.ecf.core.ISharedObjectContainer; +import org.eclipse.ecf.core.IContainer; import org.eclipse.ecf.discovery.IDiscoveryContainer; import org.eclipse.ecf.discovery.IServiceInfo; public interface IDiscoveryController { public IDiscoveryContainer getDiscoveryContainer(); - public ISharedObjectContainer getSharedObjectContainer(); + public IContainer getContainer(); public String [] getServiceTypes(); public void connectToService(IServiceInfo service); public void setupDiscoveryContainer(DiscoveryView view); diff --git a/framework/bundles/org.eclipse.ecf/.options b/framework/bundles/org.eclipse.ecf/.options index 4dfc6d96f..a3d9882d9 100644 --- a/framework/bundles/org.eclipse.ecf/.options +++ b/framework/bundles/org.eclipse.ecf/.options @@ -2,6 +2,7 @@ org.eclipse.ecf/debug = true org.eclipse.ecf/debug/filter = * org.eclipse.ecf/debug/flag = true org.eclipse.ecf/debug/containerfactory = true +ort.eclipse.ecf/debug/sharedobjectcontainerfactory = true org.eclipse.ecf/debug/idfactory = true org.eclipse.ecf/debug/connectionfactory = true org.eclipse.ecf/debug/factoryinit = true
\ No newline at end of file diff --git a/framework/bundles/org.eclipse.ecf/doc/org_eclipse_ecf_containerFactory.html b/framework/bundles/org.eclipse.ecf/doc/org_eclipse_ecf_containerFactory.html deleted file mode 100644 index 3eb3ad1f9..000000000 --- a/framework/bundles/org.eclipse.ecf/doc/org_eclipse_ecf_containerFactory.html +++ /dev/null @@ -1,164 +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>@import url("file:/c:/eclipse3.1m7/eclipse/plugins/org.eclipse.platform_3.1.0/book.css");</style> -<style>@import url("file:/c:/eclipse3.1m7/eclipse/plugins/org.eclipse.platform.doc.isv_3.1.0/schema.css");</style> -</HEAD> -<BODY> -<H1><CENTER>ECF Container Factory</CENTER></H1> -<p></p> -<h6 class=CaptionFigColumn id=header>Identifier: </h6>org.eclipse.ecf.containerFactory<p></p> -<h6 class=CaptionFigColumn id=header>Since: </h6>0.0.1 -<p></p> - -<p> -<h6 class=CaptionFigColumn id=header>Description: </h6>This extension allows plugins to register themselves as 'providers' of ECF shared object containers. Once registered via this extension point, plugins can then provide there own implementations of ISharedObjectContainer in response to client request of the ECF container factory (<b>org.eclipse.ecf.core.SharedObjectContainerFactory</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>ISharedObjectContainer</b>. When client requests are made to ECF SharedObjectContainerFactory to create <b>ISharedObjectContainer</b> instances, those requests will be re-directed to the given ISharedObjectContainer implementer.</p> -<p><h6 class=CaptionFigColumn id=header>Configuration Markup:</h6></p> -<p class=code id=dtd><!ELEMENT <a name="e.extension">extension</a> (<a href="#e.containerFactory">containerFactory</a>+)></p> -<p class=code id=dtd><!ATTLIST extension</p> -<p class=code id=dtdAttlist>point CDATA #REQUIRED<p class=code id=dtdAttlist>id CDATA #IMPLIED<p class=code id=dtdAttlist>name CDATA #IMPLIED></p> -<p></p> -<ul class=ConfigMarkup id=attlistDesc> -</ul> -<br><p class=code id=dtd><!ELEMENT <a name="e.containerFactory">containerFactory</a> (<a href="#e.defaultargument">defaultargument</a>* , <a href="#e.property">property</a>*)></p> -<p class=code id=dtd><!ATTLIST containerFactory</p> -<p class=code id=dtdAttlist>class CDATA #REQUIRED<p class=code id=dtdAttlist>name CDATA #IMPLIED<p class=code id=dtdAttlist>description CDATA #IMPLIED></p> -<p></p> -<p class=ConfigMarkup id=elementDesc> -The container factory extension point. Can optionally contain a list of 'defaultargument' elements that describe the arguments (and provide default values) to be passed to provider implementation</p> -<br> -<ul class=ConfigMarkup id=attlistDesc> -<li><b>class</b> - The class implementing the containerFactory extension point. The given class must implement the <b>org.eclipse.ecf.core.provider.ISharedObjectContainerInstantiator</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 SharedObjectContainerFactory 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> - An optional description of the implementation of this extension point</li> -</ul> -<br><p class=code id=dtd><!ELEMENT <a name="e.defaultargument">defaultargument</a> EMPTY></p> -<p class=code id=dtd><!ATTLIST defaultargument</p> -<p class=code id=dtdAttlist>type CDATA #IMPLIED<p class=code id=dtdAttlist>value CDATA #IMPLIED<p class=code id=dtdAttlist>name CDATA #IMPLIED></p> -<p></p> -<p class=ConfigMarkup id=elementDesc> -Default argument to be passed to <b>org.eclipse.ecf.core.provider.makeInstance()</b> method. Value of this element (if any) is used to indicate a default value for the given argument</p> -<br> -<ul class=ConfigMarkup id=attlistDesc> -<li><b>type</b> - The fully qualified type of the default argument</li> -<li><b>value</b> - The value for the default argument</li> -<li><b>name</b> - An optional name for the defaultargument element</li> -</ul> -<br><p class=code id=dtd><!ELEMENT <a name="e.property">property</a> EMPTY></p> -<p class=code id=dtd><!ATTLIST property</p> -<p class=code id=dtdAttlist>name CDATA #REQUIRED<p class=code id=dtdAttlist>value CDATA #REQUIRED></p> -<p></p> -<p class=ConfigMarkup id=elementDesc> -Property (name,value) associated with SharedObjectContainerDescription</p> -<br> -<ul class=ConfigMarkup id=attlistDesc> -<li><b>name</b> - The name of the property</li> -<li><b>value</b> - The value of the property</li> -</ul> -<br><p class=code id=dtd><!ELEMENT <a name="e.extension">extension</a> (<a href="#e.containerFactory">containerFactory</a>+)></p> -<p class=code id=dtd><!ATTLIST extension</p> -<p class=code id=dtdAttlist>point CDATA #REQUIRED<p class=code id=dtdAttlist>id CDATA #IMPLIED<p class=code id=dtdAttlist>name CDATA #IMPLIED></p> -<p></p> -<ul class=ConfigMarkup id=attlistDesc> -</ul> -<br><p class=code id=dtd><!ELEMENT <a name="e.containerFactory">containerFactory</a> (<a href="#e.defaultargument">defaultargument</a>* , <a href="#e.property">property</a>*)></p> -<p class=code id=dtd><!ATTLIST containerFactory</p> -<p class=code id=dtdAttlist>class CDATA #REQUIRED<p class=code id=dtdAttlist>name CDATA #IMPLIED<p class=code id=dtdAttlist>description CDATA #IMPLIED></p> -<p></p> -<p class=ConfigMarkup id=elementDesc> -The container factory extension point. Can optionally contain a list of 'defaultargument' elements that describe the arguments (and provide default values) to be passed to provider implementation</p> -<br> -<ul class=ConfigMarkup id=attlistDesc> -<li><b>class</b> - The class implementing the containerFactory extension point. The given class must implement the <b>org.eclipse.ecf.core.provider.ISharedObjectContainerInstantiator</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 SharedObjectContainerFactory 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> - An optional description of the implementation of this extension point</li> -</ul> -<br><p class=code id=dtd><!ELEMENT <a name="e.defaultargument">defaultargument</a> EMPTY></p> -<p class=code id=dtd><!ATTLIST defaultargument</p> -<p class=code id=dtdAttlist>type CDATA #IMPLIED<p class=code id=dtdAttlist>value CDATA #IMPLIED<p class=code id=dtdAttlist>name CDATA #IMPLIED></p> -<p></p> -<p class=ConfigMarkup id=elementDesc> -Default argument to be passed to <b>org.eclipse.ecf.core.provider.makeInstance()</b> method. Value of this element (if any) is used to indicate a default value for the given argument</p> -<br> -<ul class=ConfigMarkup id=attlistDesc> -<li><b>type</b> - The fully qualified type of the default argument</li> -<li><b>value</b> - The value for the default argument</li> -<li><b>name</b> - An optional name for the defaultargument element</li> -</ul> -<br><p class=code id=dtd><!ELEMENT <a name="e.property">property</a> EMPTY></p> -<p class=code id=dtd><!ATTLIST property</p> -<p class=code id=dtdAttlist>name CDATA #REQUIRED<p class=code id=dtdAttlist>value CDATA #REQUIRED></p> -<p></p> -<p class=ConfigMarkup id=elementDesc> -Property (name,value) associated with SharedObjectContainerDescription</p> -<br> -<ul class=ConfigMarkup id=attlistDesc> -<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 id=header>Examples: </h6>Here's an extension that associates a class org.eclipse.ecf.test.FooContainerFactory with name 'foo' in the ECF <b>SharedObjectContainerFactory</b>: - -<pre> -<p class=code id=tag><extension point=<p class=code id=cstring>"org.eclipse.ecf.containerFactory"</p><p class=code id=tag>></p> - <p class=code id=tag><containerFactory name=<p class=code id=cstring>"foo"</p><p class=code id=tag> class=<p class=code id=cstring>"org.eclipse.ecf.test.FooContainerFactory"</p><p class=code id=tag> description=<p class=code id=cstring>"My container factory"</p><p class=code id=tag>/></p> - <p class=code id=tag><defaultargument type=<p class=code id=cstring>"java.lang.String"</p><p class=code id=tag> value=<p class=code id=cstring>"defaultvalue"</p><p class=code id=tag> name=<p class=code id=cstring>"variablename"</p><p class=code id=tag>/></p> -<p class=code id=tag></extension></p> -</pre> - -Here is some example code to implement this class: - -<pre> -package org.eclipse.ecf.test; - -import org.eclipse.ecf.core.ISharedObjectContainer; -import org.eclipse.ecf.core.SharedObjectContainerInstantiationException; -import org.eclipse.ecf.core.provider.ISharedObjectContainerInstantiator; - -public class FooContainerFactory implements ISharedObjectContainerInstantiator { - - public FooContainerFactory() { - super(); - } - public ISharedObjectContainer makeInstance(SharedObjectContainterDescription description, Class[] argTypes, Object[] args) - throws SharedObjectContainerInstantiationException { - // Create/return instance of FooSharedObjectContainer - // Note that FooSharedObjectContainer class must - // implement ISharedObjectContainer - return new FooSharedObjectContainer(); - } -} -</pre> - -In this example, the given class implements the <b>ISharedObjectContainerInstantiator</b>.makeInstance method by creating and returning a new instance of FooSharedObjectContainer, a class also defined in the extension plugin. As noted in the code, this class must implement <b>ISharedObjectContainer</b>, so that it can successfully be returned from makeInstance. - -<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>ISharedObjectContainer</b>: - -<pre> -ISharedObjectContainer newContainer = SharedObjectContainerFactory.getDefault().makeSharedObjectContainer('foo'); -// Further use of newContainer instance here - -</pre> -<p></p> - -<h6 class=CaptionFigColumn id=header>API Information: </h6>The API for this extension point is provided by the <b>org.eclipse.ecf.core.SharedObjectContainerFactory</b> static methods. Specifically, the 'makeSharedObjectContainer' static methods are to be used by clients. The functionality provided by the extension point mechanism can be used at runtime via the <b>SharedObjectContainerFactory.addDescription(SharedObjectContainerDescription)</b> method. -<p></p> - -<h6 class=CaptionFigColumn id=header>Supplied Implementation: </h6>The supplied implementations of this extension point are: - -org.eclipse.ecf.provider.generic.ContainerInstantiator -<b>TEST</b>: org.eclipse.ecf.test.TestContainer -<p></p> - -<br> -<p class=note id=copyright> -Copyright (c) 2004 Composent, Inc. and others. -All rights reserved. This program and the accompanying materials are made available under the 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></p> - -</p> -</BODY> -</HTML> diff --git a/framework/bundles/org.eclipse.ecf/plugin.xml b/framework/bundles/org.eclipse.ecf/plugin.xml index 8689f48dd..68c62c982 100644 --- a/framework/bundles/org.eclipse.ecf/plugin.xml +++ b/framework/bundles/org.eclipse.ecf/plugin.xml @@ -4,5 +4,4 @@ <extension-point id="containerFactory" name="ECF Container Factory" schema="schema/containerFactory.exsd"/> <extension-point id="namespace" name="ECF Namespace" schema="schema/namespace.exsd"/> <extension-point id="connectionFactory" name="connectionFactory" schema="schema/connectionFactory.exsd"/> - <extension-point id="simpleContainer" name="ECF Simple Container Factory" schema="schema/simpleContainerFactory.exsd"/> </plugin> diff --git a/framework/bundles/org.eclipse.ecf/schema/containerFactory.exsd b/framework/bundles/org.eclipse.ecf/schema/containerFactory.exsd index 79cceed61..8e526051b 100644 --- a/framework/bundles/org.eclipse.ecf/schema/containerFactory.exsd +++ b/framework/bundles/org.eclipse.ecf/schema/containerFactory.exsd @@ -6,8 +6,8 @@ <meta.schema plugin="org.eclipse.ecf" id="containerFactory" name="ECF Container Factory"/>
</appInfo>
<documentation>
- This extension allows plugins to register themselves as 'providers' of ECF shared object containers. Once registered via this extension point, plugins can then provide there own implementations of ISharedObjectContainer in response to client request of the ECF container factory (<b>org.eclipse.ecf.core.SharedObjectContainerFactory</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>ISharedObjectContainer</b>. When client requests are made to ECF SharedObjectContainerFactory to create <b>ISharedObjectContainer</b> instances, those requests will be re-directed to the given ISharedObjectContainer implementer.
+ 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.
</documentation>
</annotation>
@@ -54,21 +54,21 @@ <attribute name="class" type="string" use="required">
<annotation>
<documentation>
- The class implementing the containerFactory extension point. The given class must implement the <b>org.eclipse.ecf.core.provider.ISharedObjectContainerInstantiator</b> interface
+ The class implementing the containerFactory extension point. The given class must implement the <b>org.eclipse.ecf.core.provider.IContainerInstantiator</b> interface
</documentation>
</annotation>
</attribute>
<attribute name="name" type="string">
<annotation>
<documentation>
- 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 SharedObjectContainerFactory 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
+ 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. 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
</documentation>
</annotation>
</attribute>
<attribute name="description" type="string">
<annotation>
<documentation>
- An optional description of the implementation of this extension point
+
</documentation>
</annotation>
</attribute>
@@ -78,7 +78,7 @@ <element name="defaultargument">
<annotation>
<documentation>
- Default argument to be passed to <b>org.eclipse.ecf.core.provider.makeInstance()</b> method. Value of this element (if any) is used to indicate a default value for the given argument
+ Default argument to be passed to <b>org.eclipse.ecf.core.provider.IContainerInstantiator.makeInstance()</b> method. Value of this element (if any) is used to indicate a default value for the given argument
</documentation>
</annotation>
<complexType>
@@ -109,7 +109,7 @@ <element name="property">
<annotation>
<documentation>
- Property (name,value) associated with SharedObjectContainerDescription
+ Property (name,value) associated with SharedDescription
</documentation>
</annotation>
<complexType>
@@ -144,49 +144,49 @@ <meta.section type="examples"/>
</appInfo>
<documentation>
- Here's an extension that associates a class org.eclipse.ecf.test.FooContainerFactory with name 'foo' in the ECF <b>SharedObjectContainerFactory</b>: - -<pre> -<extension point="org.eclipse.ecf.containerFactory"> - <containerFactory name="foo" class="org.eclipse.ecf.test.FooContainerFactory" description="My container factory"/> - <defaultargument type="java.lang.String" value="defaultvalue" name="variablename"/> -</extension> -</pre> - -Here is some example code to implement this class: - -<pre> -package org.eclipse.ecf.test; - -import org.eclipse.ecf.core.ISharedObjectContainer; -import org.eclipse.ecf.core.SharedObjectContainerInstantiationException; -import org.eclipse.ecf.core.provider.ISharedObjectContainerInstantiator; - -public class FooContainerFactory implements ISharedObjectContainerInstantiator { - - public FooContainerFactory() { - super(); - } - public ISharedObjectContainer makeInstance(SharedObjectContainterDescription description, Class[] argTypes, Object[] args) - throws SharedObjectContainerInstantiationException { - // Create/return instance of FooSharedObjectContainer - // Note that FooSharedObjectContainer class must - // implement ISharedObjectContainer - return new FooSharedObjectContainer(); - } -} -</pre> - -In this example, the given class implements the <b>ISharedObjectContainerInstantiator</b>.makeInstance method by creating and returning a new instance of FooSharedObjectContainer, a class also defined in the extension plugin. As noted in the code, this class must implement <b>ISharedObjectContainer</b>, so that it can successfully be returned from makeInstance. - -<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>ISharedObjectContainer</b>: - -<pre> -ISharedObjectContainer newContainer = SharedObjectContainerFactory.makeSharedObjectContainer('foo'); -// Further use of newContainer instance here - + Here's an extension that associates a class org.eclipse.ecf.test.FooContainerFactory with name 'foo' in the ECF <b>ContainerFactory</b>:
+
+<pre>
+<extension point="org.eclipse.ecf.containerFactory">
+ <containerFactory name="foo" class="org.eclipse.ecf.test.FooInstantiator" description="My container factory"/>
+ <defaultargument type="java.lang.String" value="defaultvalue" name="variablename"/>
+</extension>
+</pre>
+
+Here is some example code to implement this class:
+
+<pre>
+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 makeInstance(ContainerDescription description, Class[] argTypes, Object[] args)
+ throws ContainerInstantiationException {
+ // Create/return instance of FooContainer
+ // Note that FooContainer class must
+ // implement IContainer
+ return new FooContainer();
+ }
+}
+</pre>
+
+In this example, the given class implements the <b>IContainerInstantiator</b>.makeInstance 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 makeInstance.
+
+<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>
+IContainer newContainer = ContainerFactory.getDefault().makeContainer('foo');
+// Further use of newContainer instance here
+
</pre>
</documentation>
</annotation>
@@ -196,7 +196,7 @@ ISharedObjectContainer newContainer = SharedObjectContainerFactory.makeSharedObj <meta.section type="apiInfo"/>
</appInfo>
<documentation>
- The API for this extension point is provided by the <b>org.eclipse.ecf.core.SharedObjectContainerFactory</b> static methods. Specifically, the 'makeSharedObjectContainer' static methods are to be used by clients. The functionality provided by the extension point mechanism can be used at runtime via the <b>SharedObjectContainerFactory.addDescription(SharedObjectContainerDescription)</b> method.
+ The API for this extension point is provided by the <b>org.eclipse.ecf.core.ContainerFactory</b> static methods. Specifically, the 'makeContainer' methods are to be used by clients. The functionality provided by the extension point mechanism can be used at runtime via the <b>ContainerFactory.addDescription(ContainerDescription)</b> method.
</documentation>
</annotation>
@@ -205,9 +205,9 @@ ISharedObjectContainer newContainer = SharedObjectContainerFactory.makeSharedObj <meta.section type="implementation"/>
</appInfo>
<documentation>
- The supplied implementations of this extension point are: - -org.eclipse.ecf.provider.generic.ContainerInstantiator + The supplied implementations of this extension point are:
+
+org.eclipse.ecf.provider.generic.ContainerInstantiator
<b>TEST</b>: org.eclipse.ecf.test.TestContainer
</documentation>
</annotation>
@@ -217,7 +217,7 @@ org.eclipse.ecf.provider.generic.ContainerInstantiator <meta.section type="copyright"/>
</appInfo>
<documentation>
- Copyright (c) 2004 Composent, Inc. and others. + Copyright (c) 2004 Composent, Inc. and others.
All rights reserved. This program and the accompanying materials are made available under the 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
</documentation>
</annotation>
diff --git a/framework/bundles/org.eclipse.ecf/schema/simpleContainerFactory.exsd b/framework/bundles/org.eclipse.ecf/schema/simpleContainerFactory.exsd deleted file mode 100644 index 1e8b34a3c..000000000 --- a/framework/bundles/org.eclipse.ecf/schema/simpleContainerFactory.exsd +++ /dev/null @@ -1,225 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!-- Schema file written by PDE --> -<schema targetNamespace="org.eclipse.ecf"> -<annotation> - <appInfo> - <meta.schema plugin="org.eclipse.ecf" id="simpleContainerFactory" name="ECF Simple Container Factory"/> - </appInfo> - <documentation> - This extension allows plugins to register themselves as 'providers' of ECF shared object containers. Once registered via this extension point, plugins can then provide there own implementations of ISharedObjectContainer in response to client request of the ECF container factory (<b>org.eclipse.ecf.core.SharedObjectContainerFactory</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>ISharedObjectContainer</b>. When client requests are made to ECF SharedObjectContainerFactory to create <b>ISharedObjectContainer</b> instances, those requests will be re-directed to the given ISharedObjectContainer implementer. - </documentation> - </annotation> - - <element name="extension"> - <complexType> - <sequence> - <element ref="simpleContainerFactory" minOccurs="1" maxOccurs="unbounded"/> - </sequence> - <attribute name="point" type="string" use="required"> - <annotation> - <documentation> - - </documentation> - </annotation> - </attribute> - <attribute name="id" type="string"> - <annotation> - <documentation> - - </documentation> - </annotation> - </attribute> - <attribute name="name" type="string"> - <annotation> - <documentation> - - </documentation> - </annotation> - </attribute> - </complexType> - </element> - - <element name="simpleContainerFactory"> - <annotation> - <documentation> - The container factory extension point. Can optionally contain a list of 'defaultargument' elements that describe the arguments (and provide default values) to be passed to provider implementation - </documentation> - </annotation> - <complexType> - <sequence> - <element ref="defaultargument" minOccurs="0" maxOccurs="unbounded"/> - <element ref="property" minOccurs="0" maxOccurs="unbounded"/> - </sequence> - <attribute name="class" type="string" use="required"> - <annotation> - <documentation> - The class implementing the containerFactory extension point. The given class must implement the <b>org.eclipse.ecf.core.provider.IContainerInstantiator</b> interface - </documentation> - </annotation> - </attribute> - <attribute name="name" type="string"> - <annotation> - <documentation> - 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. 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 - </documentation> - </annotation> - </attribute> - <attribute name="description" type="string"> - <annotation> - <documentation> - An optional description of the implementation of this extension point - </documentation> - </annotation> - </attribute> - </complexType> - </element> - - <element name="defaultargument"> - <annotation> - <documentation> - Default argument to be passed to <b>org.eclipse.ecf.core.provider.makeInstance()</b> method. Value of this element (if any) is used to indicate a default value for the given argument - </documentation> - </annotation> - <complexType> - <attribute name="type" type="string"> - <annotation> - <documentation> - The fully qualified type of the default argument - </documentation> - </annotation> - </attribute> - <attribute name="value" type="string"> - <annotation> - <documentation> - The value for the default argument - </documentation> - </annotation> - </attribute> - <attribute name="name" type="string"> - <annotation> - <documentation> - An optional name for the defaultargument element - </documentation> - </annotation> - </attribute> - </complexType> - </element> - - <element name="property"> - <annotation> - <documentation> - Property (name,value) associated with SharedDescription - </documentation> - </annotation> - <complexType> - <attribute name="name" type="string" use="required"> - <annotation> - <documentation> - The name of the property - </documentation> - </annotation> - </attribute> - <attribute name="value" type="string" use="required"> - <annotation> - <documentation> - The value of the property - </documentation> - </annotation> - </attribute> - </complexType> - </element> - - <annotation> - <appInfo> - <meta.section type="since"/> - </appInfo> - <documentation> - 0.0.1 - </documentation> - </annotation> - - <annotation> - <appInfo> - <meta.section type="examples"/> - </appInfo> - <documentation> - Here's an extension that associates a class org.eclipse.ecf.test.FooContainerFactory with name 'foo' in the ECF <b>SharedObjectContainerFactory</b>: - -<pre> -<extension point="org.eclipse.ecf.simpleContainerFactory"> - <simpleContainerFactory name="foo" class="org.eclipse.ecf.test.FooContainerFactory" description="My container factory"/> - <defaultargument type="java.lang.String" value="defaultvalue" name="variablename"/> -</extension> -</pre> - -Here is some example code to implement this class: - -<pre> -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 FooContainerFactory implements IContainerInstantiator { - - public FooContainerFactory() { - super(); - } - public IContainer makeInstance(ContainterDescription description, Class[] argTypes, Object[] args) - throws ContainerInstantiationException { - // Create/return instance of FooContainer - // Note that FooContainer class must - // implement IContainer - return new FooContainer(); - } -} -</pre> - -In this example, the given class implements the <b>IContainerInstantiator</b>.makeInstance method by creating and returning a new instance of FooSharedObjectContainer, a class also defined in the extension plugin. As noted in the code, this class must implement <b>ISharedObjectContainer</b>, so that it can successfully be returned from makeInstance. - -<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> -IContainer newContainer = ContainerFactory.makeContainer('foo'); -// Further use of newContainer instance here - -</pre> - </documentation> - </annotation> - - <annotation> - <appInfo> - <meta.section type="apiInfo"/> - </appInfo> - <documentation> - The API for this extension point is provided by the <b>org.eclipse.ecf.core.ContainerFactory</b> static methods. Specifically, the 'makeSharedObjectContainer' static methods are to be used by clients. The functionality provided by the extension point mechanism can be used at runtime via the <b>SharedObjectContainerFactory.addDescription(SharedObjectContainerDescription)</b> method. - </documentation> - </annotation> - - <annotation> - <appInfo> - <meta.section type="implementation"/> - </appInfo> - <documentation> - The supplied implementations of this extension point are: - -org.eclipse.ecf.provider.generic.ContainerInstantiator -<b>TEST</b>: org.eclipse.ecf.test.TestContainer - </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 - </documentation> - </annotation> - -</schema> diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ContainerFactory.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ContainerFactory.java index 9607757b9..1c4e10e3c 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ContainerFactory.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ContainerFactory.java @@ -36,7 +36,7 @@ import org.eclipse.ecf.internal.core.Trace; */ public class ContainerFactory implements IContainerFactory { - private static Trace debug = Trace.create("simplecontainerfactory"); + private static Trace debug = Trace.create("containerfactory"); private static Hashtable containerdescriptions = new Hashtable(); protected static IContainerFactory instance = null; diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ISharedObjectContainerFactory.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ISharedObjectContainerFactory.java index 673da3469..24bb0c5c8 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ISharedObjectContainerFactory.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ISharedObjectContainerFactory.java @@ -1,162 +1,68 @@ package org.eclipse.ecf.core; -import java.util.List; public interface ISharedObjectContainerFactory { - /* - * Add a SharedObjectContainerDescription to the set of known - * SharedObjectContainerDescriptions. - * - * @param scd the SharedObjectContainerDescription to add to this factory - * @return SharedObjectContainerDescription the old description of the same - * name, null if none found - */ - public SharedObjectContainerDescription addDescription( - SharedObjectContainerDescription scd); - - /** - * Get a collection of the SharedObjectContainerDescriptions currently known to - * this factory. This allows clients to query the factory to determine what if - * any other SharedObjectContainerDescriptions are currently registered with - * the factory, and if so, what they are. - * - * @return List of SharedObjectContainerDescription instances - */ - public List getDescriptions(); - - /** - * Check to see if a given named description is already contained by this - * factory - * - * @param scd - * the SharedObjectContainerDescription to look for - * @return true if description is already known to factory, false otherwise - */ - public boolean containsDescription(SharedObjectContainerDescription scd); - - /** - * Get the known SharedObjectContainerDescription given it's name. - * - * @param name - * @return SharedObjectContainerDescription found - * @throws SharedObjectContainerInstantiationException - */ - public SharedObjectContainerDescription getDescriptionByName(String name) - throws SharedObjectContainerInstantiationException; - /** - * Make ISharedObjectContainer instance. Given a - * SharedObjectContainerDescription object, a String [] of argument types, - * and an Object [] of parameters, this method will - * <p> - * <ul> - * <li>lookup the known SharedObjectContainerDescriptions to find one of - * matching name</li> - * <li>if found, will retrieve or create an - * ISharedObjectContainerInstantiator for that description</li> - * <li>Call the ISharedObjectContainerInstantiator.makeInstance method to - * return an instance of ISharedObjectContainer</li> - * </ul> + * Make ISharedObjectContainer instance. * * @param desc - * the SharedObjectContainerDescription to use to create the + * the ContainerDescription to use to create the * instance * @param argTypes * a String [] defining the types of the args parameter * @param args * an Object [] of arguments passed to the makeInstance method of - * the ISharedObjectContainerInstantiator + * the IContainerInstantiator * @return a valid instance of ISharedObjectContainer - * @throws SharedObjectContainerInstantiationException + * @throws ContainerInstantiationException */ public ISharedObjectContainer makeSharedObjectContainer( - SharedObjectContainerDescription desc, String[] argTypes, - Object[] args) throws SharedObjectContainerInstantiationException; + ContainerDescription desc, String[] argTypes, + Object[] args) throws ContainerInstantiationException; /** - * Make ISharedObjectContainer instance. Given a - * SharedObjectContainerDescription name, this method will - * <p> - * <ul> - * <li>lookup the known SharedObjectContainerDescriptions to find one of - * matching name</li> - * <li>if found, will retrieve or create an - * ISharedObjectContainerInstantiator for that description</li> - * <li>Call the ISharedObjectContainerInstantiator.makeInstance method to - * return an instance of ISharedObjectContainer</li> - * </ul> + * Make ISharedObjectContainer instance. * * @param descriptionName - * the SharedObjectContainerDescription name to lookup + * the ContainerDescription name to lookup * @return a valid instance of ISharedObjectContainer - * @throws SharedObjectContainerInstantiationException + * @throws ContainerInstantiationException */ public ISharedObjectContainer makeSharedObjectContainer( String descriptionName) - throws SharedObjectContainerInstantiationException; + throws ContainerInstantiationException; /** - * Make ISharedObjectContainer instance. Given a - * SharedObjectContainerDescription name, this method will - * <p> - * <ul> - * <li>lookup the known SharedObjectContainerDescriptions to find one of - * matching name</li> - * <li>if found, will retrieve or create an - * ISharedObjectContainerInstantiator for that description</li> - * <li>Call the ISharedObjectContainerInstantiator.makeInstance method to - * return an instance of ISharedObjectContainer</li> - * </ul> + * Make ISharedObjectContainer instance. * * @param descriptionName - * the SharedObjectContainerDescription name to lookup + * the ContainerDescription name to lookup * @param args * the Object [] of arguments passed to the - * ISharedObjectContainerInstantiator.makeInstance method + * IContainerInstantiator.makeInstance method * @return a valid instance of ISharedObjectContainer - * @throws SharedObjectContainerInstantiationException + * @throws ContainerInstantiationException */ public ISharedObjectContainer makeSharedObjectContainer( String descriptionName, Object[] args) - throws SharedObjectContainerInstantiationException; + throws ContainerInstantiationException; /** - * Make ISharedObjectContainer instance. Given a - * SharedObjectContainerDescription name, this method will - * <p> - * <ul> - * <li>lookup the known SharedObjectContainerDescriptions to find one of - * matching name</li> - * <li>if found, will retrieve or create an - * ISharedObjectContainerInstantiator for that description</li> - * <li>Call the ISharedObjectContainerInstantiator.makeInstance method to - * return an instance of ISharedObjectContainer</li> - * </ul> - * + * Make ISharedObjectContainer instance. + * * * @param descriptionName - * the SharedObjectContainerDescription name to lookup + * the ContainerDescription name to lookup * @param argsTypes * the String [] of argument types of the following args * @param args * the Object [] of arguments passed to the - * ISharedObjectContainerInstantiator.makeInstance method + * IContainerInstantiator.makeInstance method * @return a valid instance of ISharedObjectContainer - * @throws SharedObjectContainerInstantiationException + * @throws ContainerInstantiationException */ public ISharedObjectContainer makeSharedObjectContainer( String descriptionName, String[] argsTypes, Object[] args) - throws SharedObjectContainerInstantiationException; - - /** - * Remove given description from set known to this factory. - * - * @param scd - * the SharedObjectContainerDescription to remove - * @return the removed SharedObjectContainerDescription, null if nothing - * removed - */ - public SharedObjectContainerDescription removeDescription( - SharedObjectContainerDescription scd); + throws ContainerInstantiationException; }
\ No newline at end of file diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/SharedObjectContainerDescription.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/SharedObjectContainerDescription.java deleted file mode 100644 index e02ed168d..000000000 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/SharedObjectContainerDescription.java +++ /dev/null @@ -1,182 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. All rights reserved. This - * program and the accompanying materials are made available under the 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 - ******************************************************************************/ -package org.eclipse.ecf.core; - -import java.util.Arrays; -import java.util.Map; -import java.util.Properties; -import org.eclipse.ecf.core.provider.ISharedObjectContainerInstantiator; - -/** - * Description of an ISharedObjectContainer factory implementation. - * - * @see SharedObjectContainerFactory#addDescription(SharedObjectContainerDescription) - * - */ -public class SharedObjectContainerDescription { - protected String name; - protected String instantiatorClass; - protected ClassLoader classLoader; - protected ISharedObjectContainerInstantiator instantiator; - protected String description; - protected String[] argTypes; - protected String[] argDefaults; - protected String[] argNames; - protected int hashCode = 0; - protected static final String[] EMPTY = new String[0]; - protected Map properties; - - public SharedObjectContainerDescription(ClassLoader loader, String name, - String instantiatorClass, String desc) { - this(loader, name, instantiatorClass, desc, EMPTY, - EMPTY, EMPTY); - } - - public SharedObjectContainerDescription(String name, - String instantiatorClass, String desc) { - this(null, name, instantiatorClass, desc); - } - - public SharedObjectContainerDescription(ClassLoader loader, String name, - String instantiatorClass, String desc, String[] argTypes, - String[] argDefaults, String[] argNames) { - this(loader,name,instantiatorClass,desc,argTypes,argDefaults,argNames,new Properties()); - } - - public SharedObjectContainerDescription(ClassLoader loader, String name, - String instantiatorClass, String desc, String[] argTypes, - String[] argDefaults, String[] argNames, Map props) { - this.classLoader = loader; - if (name == null) - throw new RuntimeException( - new InstantiationException( - "SharedObjectContainerDescription<init> name cannot be null")); - this.name = name; - if (instantiatorClass == null) - throw new RuntimeException( - new InstantiationException( - "SharedObjectContainerDescription<init> instantiatorClass cannot be null")); - this.instantiatorClass = instantiatorClass; - this.hashCode = name.hashCode(); - this.description = desc; - this.argTypes = argTypes; - this.argDefaults = argDefaults; - this.argNames = argNames; - this.properties = props; - } - - public SharedObjectContainerDescription(String name, - ISharedObjectContainerInstantiator inst, String desc, - String[] argTypes, String[] argDefaults, String[] argNames) { - this(name,inst,desc,argTypes,argDefaults,argNames,new Properties()); - } - - public SharedObjectContainerDescription(String name, - ISharedObjectContainerInstantiator inst, String desc, - String[] argTypes, String[] argDefaults, String[] argNames, Map props) { - if (name == null) - throw new RuntimeException( - new InstantiationException( - "SharedObjectContainerDescription<init> name cannot be null")); - if (inst == null) - throw new RuntimeException( - new InstantiationException( - "SharedObjectContainerDescription<init> instantiator instance cannot be null")); - this.instantiator = inst; - this.name = name; - this.classLoader = this.instantiator.getClass().getClassLoader(); - this.description = desc; - this.argTypes = argTypes; - this.argDefaults = argDefaults; - this.argNames = argNames; - this.properties = props; - } - - public SharedObjectContainerDescription(String name, - ISharedObjectContainerInstantiator inst, String desc) { - this(name, inst, desc, EMPTY, EMPTY, EMPTY); - } - - public String getName() { - return name; - } - - public ClassLoader getClassLoader() { - return classLoader; - } - - public boolean equals(Object other) { - if (!(other instanceof SharedObjectContainerDescription)) - return false; - SharedObjectContainerDescription scd = (SharedObjectContainerDescription) other; - return scd.name.equals(name); - } - - public int hashCode() { - return hashCode; - } - - public String toString() { - StringBuffer b = new StringBuffer("SharedObjectContainerDescription["); - b.append("name:").append(name).append(";"); - if (instantiator == null) - b.append("class:").append(instantiatorClass).append(";"); - else - b.append("instantiator:").append(instantiator).append(";"); - b.append("desc:").append(description).append(";"); - b.append("argtypes:").append(Arrays.asList(argTypes)).append(";"); - b.append("argdefaults:").append(Arrays.asList(argDefaults)).append(";"); - b.append("argnames:").append(Arrays.asList(argNames)).append("]"); - return b.toString(); - } - - protected ISharedObjectContainerInstantiator getInstantiator() - throws ClassNotFoundException, InstantiationException, - IllegalAccessException { - synchronized (this) { - if (instantiator == null) - initializeInstantiator(classLoader); - return instantiator; - } - } - - private void initializeInstantiator(ClassLoader cl) - throws ClassNotFoundException, InstantiationException, - IllegalAccessException { - if (cl == null) - cl = this.getClass().getClassLoader(); - // Load instantiator class - Class clazz = Class.forName(instantiatorClass, true, cl); - // Make new instance - instantiator = (ISharedObjectContainerInstantiator) clazz.newInstance(); - } - - /** - * @return Returns the description. - */ - public String getDescription() { - return description; - } - - public String[] getArgDefaults() { - return argDefaults; - } - - public String[] getArgTypes() { - return argTypes; - } - - public String[] getArgNames() { - return argNames; - } - - public Map getProperties() { - return properties; - } -}
\ No newline at end of file diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/SharedObjectContainerFactory.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/SharedObjectContainerFactory.java index 98ebeacfa..4ac00d311 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/SharedObjectContainerFactory.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/SharedObjectContainerFactory.java @@ -9,12 +9,6 @@ package org.eclipse.ecf.core; -import java.util.ArrayList; -import java.util.Hashtable; -import java.util.List; - -import org.eclipse.ecf.core.provider.ISharedObjectContainerInstantiator; -import org.eclipse.ecf.core.util.AbstractFactory; import org.eclipse.ecf.internal.core.Trace; /** @@ -36,9 +30,8 @@ import org.eclipse.ecf.internal.core.Trace; */ public class SharedObjectContainerFactory implements ISharedObjectContainerFactory { - private static Trace debug = Trace.create("containerfactory"); + private static Trace debug = Trace.create("sharedobjectcontainerfactory"); - private static Hashtable containerdescriptions = new Hashtable(); protected static ISharedObjectContainerFactory instance = null; static { @@ -55,160 +48,50 @@ public class SharedObjectContainerFactory implements ISharedObjectContainerFacto } } - private static void dumpStack(String msg, Throwable e) { - if (Trace.ON && debug != null) { - debug.dumpStack(e, msg); - } - } - /* - * Add a SharedObjectContainerDescription to the set of known - * SharedObjectContainerDescriptions. - * - * @param scd the SharedObjectContainerDescription to add to this factory - * @return SharedObjectContainerDescription the old description of the same - * name, null if none found - */ - /* (non-Javadoc) - * @see org.eclipse.ecf.core.ISharedObjectContainerFactory#addDescription(org.eclipse.ecf.core.SharedObjectContainerDescription) - */ - public SharedObjectContainerDescription addDescription( - SharedObjectContainerDescription scd) { - trace("addDescription("+scd+")"); - return addDescription0(scd); - } - /* (non-Javadoc) - * @see org.eclipse.ecf.core.ISharedObjectContainerFactory#getDescriptions() - */ - public List getDescriptions() { - return getDescriptions0(); - } - protected List getDescriptions0() { - return new ArrayList(containerdescriptions.values()); - } - protected SharedObjectContainerDescription addDescription0( - SharedObjectContainerDescription n) { - if (n == null) - return null; - return (SharedObjectContainerDescription) containerdescriptions.put(n - .getName(), n); - } - /* (non-Javadoc) - * @see org.eclipse.ecf.core.ISharedObjectContainerFactory#containsDescription(org.eclipse.ecf.core.SharedObjectContainerDescription) - */ - public boolean containsDescription( - SharedObjectContainerDescription scd) { - return containsDescription0(scd); - } - protected boolean containsDescription0( - SharedObjectContainerDescription scd) { - if (scd == null) - return false; - return containerdescriptions.containsKey(scd.getName()); - } - protected SharedObjectContainerDescription getDescription0( - SharedObjectContainerDescription scd) { - if (scd == null) - return null; - return (SharedObjectContainerDescription) containerdescriptions.get(scd - .getName()); - } - protected SharedObjectContainerDescription getDescription0( - String name) { - if (name == null) - return null; - return (SharedObjectContainerDescription) containerdescriptions.get(name); - } - /* (non-Javadoc) - * @see org.eclipse.ecf.core.ISharedObjectContainerFactory#getDescriptionByName(java.lang.String) - */ - public SharedObjectContainerDescription getDescriptionByName( - String name) throws SharedObjectContainerInstantiationException { - trace("getDescriptionByName("+name+")"); - SharedObjectContainerDescription res = getDescription0(name); - if (res == null) { - throw new SharedObjectContainerInstantiationException( - "SharedObjectContainerDescription named '" + name - + "' not found"); - } - return res; - } /* (non-Javadoc) * @see org.eclipse.ecf.core.ISharedObjectContainerFactory#makeSharedObjectContainer(org.eclipse.ecf.core.SharedObjectContainerDescription, java.lang.String[], java.lang.Object[]) */ public ISharedObjectContainer makeSharedObjectContainer( - SharedObjectContainerDescription desc, String[] argTypes, - Object[] args) throws SharedObjectContainerInstantiationException { + ContainerDescription desc, String[] argTypes, + Object[] args) throws ContainerInstantiationException { trace("makeSharedObjectContainer("+desc+","+Trace.convertStringAToString(argTypes)+","+Trace.convertObjectAToString(args)+")"); if (desc == null) - throw new SharedObjectContainerInstantiationException( - "SharedObjectContainerDescription cannot be null"); - SharedObjectContainerDescription cd = getDescription0(desc); - if (cd == null) - throw new SharedObjectContainerInstantiationException( - "SharedObjectContainerDescription named '" + desc.getName() - + "' not found"); - Class clazzes[] = null; - ISharedObjectContainerInstantiator instantiator = null; - try { - instantiator = (ISharedObjectContainerInstantiator) cd - .getInstantiator(); - clazzes = AbstractFactory.getClassesForTypes(argTypes, args, cd.getClassLoader()); - } catch (Exception e) { - SharedObjectContainerInstantiationException newexcept = new SharedObjectContainerInstantiationException( - "makeSharedObjectContainer exception with description: "+desc+": "+e.getClass().getName()+": "+e.getMessage()); - newexcept.setStackTrace(e.getStackTrace()); - dumpStack("Exception in makeSharedObjectContainer",newexcept); - throw newexcept; + throw new ContainerInstantiationException( + "ContainerDescription cannot be null"); + IContainer newContainer = ContainerFactory.getDefault().makeContainer(desc,argTypes,args); + ISharedObjectContainer soContainer = (ISharedObjectContainer) newContainer.getAdapter(ISharedObjectContainer.class); + if (soContainer == null) { + newContainer.dispose(-1L); + throw new ContainerInstantiationException("new container is not a shared object container"); } - if (instantiator == null) - throw new SharedObjectContainerInstantiationException( - "Instantiator for SharedObjectContainerDescription " - + cd.getName() + " is null"); - // Ask instantiator to actually create instance - return (ISharedObjectContainer) instantiator - .makeInstance(desc,clazzes, args); + return soContainer; } /* (non-Javadoc) * @see org.eclipse.ecf.core.ISharedObjectContainerFactory#makeSharedObjectContainer(java.lang.String) */ public ISharedObjectContainer makeSharedObjectContainer( String descriptionName) - throws SharedObjectContainerInstantiationException { + throws ContainerInstantiationException { + return makeSharedObjectContainer( - getDescriptionByName(descriptionName), null, null); + ContainerFactory.getDefault().getDescriptionByName(descriptionName), null, null); } /* (non-Javadoc) * @see org.eclipse.ecf.core.ISharedObjectContainerFactory#makeSharedObjectContainer(java.lang.String, java.lang.Object[]) */ public ISharedObjectContainer makeSharedObjectContainer( String descriptionName, Object[] args) - throws SharedObjectContainerInstantiationException { + throws ContainerInstantiationException { return makeSharedObjectContainer( - getDescriptionByName(descriptionName), null, args); + ContainerFactory.getDefault().getDescriptionByName(descriptionName), null, args); } /* (non-Javadoc) * @see org.eclipse.ecf.core.ISharedObjectContainerFactory#makeSharedObjectContainer(java.lang.String, java.lang.String[], java.lang.Object[]) */ public ISharedObjectContainer makeSharedObjectContainer( String descriptionName, String[] argsTypes, Object[] args) - throws SharedObjectContainerInstantiationException { + throws ContainerInstantiationException { return makeSharedObjectContainer( - getDescriptionByName(descriptionName), argsTypes, args); - } - /* (non-Javadoc) - * @see org.eclipse.ecf.core.ISharedObjectContainerFactory#removeDescription(org.eclipse.ecf.core.SharedObjectContainerDescription) - */ - public SharedObjectContainerDescription removeDescription( - SharedObjectContainerDescription scd) { - trace("removeDescription("+scd+")"); - return removeDescription0(scd); - } - protected SharedObjectContainerDescription removeDescription0( - SharedObjectContainerDescription n) { - if (n == null) - return null; - return (SharedObjectContainerDescription) containerdescriptions.remove(n - .getName()); + ContainerFactory.getDefault().getDescriptionByName(descriptionName), argsTypes, args); } - }
\ No newline at end of file diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/SharedObjectContainerInstantiationException.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/SharedObjectContainerInstantiationException.java deleted file mode 100644 index e4518bf67..000000000 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/SharedObjectContainerInstantiationException.java +++ /dev/null @@ -1,33 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. All rights reserved. This - * program and the accompanying materials are made available under the 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 - ******************************************************************************/ - -package org.eclipse.ecf.core; - -public class SharedObjectContainerInstantiationException extends ContainerInstantiationException { - - private static final long serialVersionUID = 3257283617356265781L; - - public SharedObjectContainerInstantiationException() { - super(); - } - - public SharedObjectContainerInstantiationException(String message) { - super(message); - } - - public SharedObjectContainerInstantiationException(Throwable cause) { - super(cause); - } - - public SharedObjectContainerInstantiationException(String message, - Throwable cause) { - super(message, cause); - } - -}
\ No newline at end of file diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/provider/ISharedObjectContainerInstantiator.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/provider/ISharedObjectContainerInstantiator.java deleted file mode 100644 index b679bb8b3..000000000 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/provider/ISharedObjectContainerInstantiator.java +++ /dev/null @@ -1,20 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004 Composent, Inc. and others. All rights reserved. This - * program and the accompanying materials are made available under the 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 - ******************************************************************************/ - -package org.eclipse.ecf.core.provider; - -import org.eclipse.ecf.core.ISharedObjectContainer; -import org.eclipse.ecf.core.SharedObjectContainerDescription; -import org.eclipse.ecf.core.SharedObjectContainerInstantiationException; - -public interface ISharedObjectContainerInstantiator { - - public ISharedObjectContainer makeInstance(SharedObjectContainerDescription description, Class[] argTypes, Object[] args) - throws SharedObjectContainerInstantiationException; -}
\ No newline at end of file diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/internal/core/ECFPlugin.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/internal/core/ECFPlugin.java index f62301fbc..bffeb7ab5 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/internal/core/ECFPlugin.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/internal/core/ECFPlugin.java @@ -13,6 +13,7 @@ import java.util.Map; import java.util.MissingResourceException; import java.util.Properties; import java.util.ResourceBundle; + import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.core.runtime.IExtension; @@ -26,9 +27,6 @@ import org.eclipse.core.runtime.Status; import org.eclipse.ecf.core.ContainerDescription; import org.eclipse.ecf.core.ContainerFactory; import org.eclipse.ecf.core.IContainerFactory; -import org.eclipse.ecf.core.ISharedObjectContainerFactory; -import org.eclipse.ecf.core.SharedObjectContainerDescription; -import org.eclipse.ecf.core.SharedObjectContainerFactory; import org.eclipse.ecf.core.comm.ConnectionDescription; import org.eclipse.ecf.core.comm.ConnectionFactory; import org.eclipse.ecf.core.comm.provider.ISynchAsynchConnectionInstantiator; @@ -36,7 +34,6 @@ import org.eclipse.ecf.core.identity.IDFactory; import org.eclipse.ecf.core.identity.Namespace; import org.eclipse.ecf.core.identity.provider.IDInstantiator; import org.eclipse.ecf.core.provider.IContainerInstantiator; -import org.eclipse.ecf.core.provider.ISharedObjectContainerInstantiator; import org.osgi.framework.BundleContext; public class ECFPlugin extends Plugin { @@ -217,71 +214,6 @@ public class ECFPlugin extends Plugin { Map properties = getProperties(member .getChildren(PROPERTY_ELEMENT_NAME)); // Now make description instance - SharedObjectContainerDescription scd = new SharedObjectContainerDescription( - name, (ISharedObjectContainerInstantiator) exten, - description, defaults.getTypes(), defaults - .getDefaults(), defaults.getNames(), properties); - debug("setupContainerExtensionPoint:created description:" + scd); - ISharedObjectContainerFactory factory = SharedObjectContainerFactory.getDefault(); - if (factory.containsDescription(scd)) { - throw new CoreException(getStatusForContException( - extension, bundleName, name)); - } - // Now add the description and we're ready to go. - factory.addDescription(scd); - debug("setupContainerExtensionPoint:added description to factory:" - + scd); - } catch (CoreException e) { - log(e.getStatus()); - dumpStack("CoreException in setupContainerExtensionPoint", e); - } catch (Exception e) { - log(getStatusForContException(extension, bundleName, name)); - dumpStack("Exception in setupContainerExtensionPoint", e); - } - } - } - - protected void setupSimpleContainerExtensionPoint(BundleContext bc) { - String bundleName = getDefault().getBundle().getSymbolicName(); - IExtensionRegistry reg = Platform.getExtensionRegistry(); - IExtensionPoint extensionPoint = reg - .getExtensionPoint(SIMPLE_CONTAINER_FACTORY_EPOINT); - if (extensionPoint == null) { - return; - } - IConfigurationElement[] members = extensionPoint - .getConfigurationElements(); - // For each configuration element - for (int m = 0; m < members.length; m++) { - IConfigurationElement member = members[m]; - // Get the label of the extender plugin and the ID of the extension. - IExtension extension = member.getDeclaringExtension(); - Object exten = null; - String name = null; - try { - // The only required attribute is "class" - exten = member - .createExecutableExtension(CONTAINER_FACTORY_EPOINT_CLASS_ATTRIBUTE); - String clazz = exten.getClass().getName(); - // Get name and get version, if available - name = member - .getAttribute(CONTAINER_FACTORY_EPOINT_NAME_ATTRIBUTE); - if (name == null) { - name = clazz; - } - // Get description, if present - String description = member - .getAttribute(CONTAINER_FACTORY_EPOINT_DESC_ATTRIBUTE); - if (description == null) { - description = ""; - } - // Get any arguments - DefaultArgs defaults = getDefaultArgs(member - .getChildren(ARG_ELEMENT_NAME)); - // Get any property elements - Map properties = getProperties(member - .getChildren(PROPERTY_ELEMENT_NAME)); - // Now make description instance ContainerDescription scd = new ContainerDescription( name, (IContainerInstantiator) exten, description, defaults.getTypes(), defaults diff --git a/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/container/ContainerInstantiator.java b/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/container/ContainerInstantiator.java index 30a1d5b53..6367b83ba 100644 --- a/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/container/ContainerInstantiator.java +++ b/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/container/ContainerInstantiator.java @@ -8,16 +8,16 @@ ******************************************************************************/ package org.eclipse.ecf.provider.xmpp.container; -import org.eclipse.ecf.core.ISharedObjectContainer; -import org.eclipse.ecf.core.SharedObjectContainerDescription; -import org.eclipse.ecf.core.SharedObjectContainerInstantiationException; +import org.eclipse.ecf.core.ContainerDescription; +import org.eclipse.ecf.core.ContainerInstantiationException; +import org.eclipse.ecf.core.IContainer; import org.eclipse.ecf.core.identity.ID; import org.eclipse.ecf.core.identity.IDFactory; import org.eclipse.ecf.core.identity.IDInstantiationException; -import org.eclipse.ecf.core.provider.ISharedObjectContainerInstantiator; +import org.eclipse.ecf.core.provider.IContainerInstantiator; -public class ContainerInstantiator implements ISharedObjectContainerInstantiator { +public class ContainerInstantiator implements IContainerInstantiator { public ContainerInstantiator() { } @@ -50,13 +50,13 @@ public class ContainerInstantiator implements ISharedObjectContainerInstantiator /* * (non-Javadoc) * - * @see org.eclipse.ecf.core.provider.ISharedObjectContainerInstantiator#makeInstance(org.eclipse.ecf.core.SharedObjectContainerDescription, + * @see org.eclipse.ecf.core.provider.IContainerInstantiator#makeInstance(.ContainerDescription, * java.lang.Class[], java.lang.Object[]) */ - public ISharedObjectContainer makeInstance( - SharedObjectContainerDescription description, Class[] argTypes, + public IContainer makeInstance( + ContainerDescription description, Class[] argTypes, Object[] args) - throws SharedObjectContainerInstantiationException { + throws ContainerInstantiationException { try { Integer ka = new Integer(XMPPClientSOContainer.DEFAULT_KEEPALIVE); String name = null; @@ -81,7 +81,7 @@ public class ContainerInstantiator implements ISharedObjectContainerInstantiator return new XMPPClientSOContainer(name,ka.intValue()); } } catch (Exception e) { - throw new SharedObjectContainerInstantiationException( + throw new ContainerInstantiationException( "Exception creating generic container", e); } } diff --git a/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/container/XMPPClientSOContainer.java b/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/container/XMPPClientSOContainer.java index 52fbd0c97..3bf3239de 100644 --- a/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/container/XMPPClientSOContainer.java +++ b/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/container/XMPPClientSOContainer.java @@ -15,6 +15,7 @@ import java.util.Map; import javax.security.auth.callback.Callback; import org.eclipse.ecf.core.ContainerJoinException; +import org.eclipse.ecf.core.ISharedObjectContainer; import org.eclipse.ecf.core.SharedObjectAddException; import org.eclipse.ecf.core.comm.AsynchConnectionEvent; import org.eclipse.ecf.core.comm.ConnectionInstantiationException; @@ -322,6 +323,7 @@ public class XMPPClientSOContainer extends ClientSOContainer { } public Object getAdapter(Class clazz) { + if (clazz.equals(ISharedObjectContainer.class)) return this; if (clazz.equals(IPresenceContainer.class)) { return new IPresenceContainer() { |