diff options
135 files changed, 416 insertions, 585 deletions
diff --git a/doc/bundles/org.eclipse.ecf.tutorial/src/org/eclipse/ecf/tutorial/datashare/DsClient2.java b/doc/bundles/org.eclipse.ecf.tutorial/src/org/eclipse/ecf/tutorial/datashare/DsClient2.java index 965bbc6c0..b1188b62d 100644 --- a/doc/bundles/org.eclipse.ecf.tutorial/src/org/eclipse/ecf/tutorial/datashare/DsClient2.java +++ b/doc/bundles/org.eclipse.ecf.tutorial/src/org/eclipse/ecf/tutorial/datashare/DsClient2.java @@ -11,9 +11,9 @@ package org.eclipse.ecf.tutorial.datashare; import java.util.HashMap; import org.eclipse.ecf.core.ContainerFactory; import org.eclipse.ecf.core.IContainer; -import org.eclipse.ecf.core.SharedObjectDescription; import org.eclipse.ecf.core.identity.ID; import org.eclipse.ecf.core.identity.IDFactory; +import org.eclipse.ecf.core.sharedobject.SharedObjectDescription; import org.eclipse.ecf.core.util.ECFException; import org.eclipse.ecf.datashare.BasicChannelConfig; import org.eclipse.ecf.datashare.IChannel; diff --git a/doc/bundles/org.eclipse.ecf.tutorial/src/org/eclipse/ecf/tutorial/datashare/MyChannel.java b/doc/bundles/org.eclipse.ecf.tutorial/src/org/eclipse/ecf/tutorial/datashare/MyChannel.java index b23a63168..c23f573c6 100644 --- a/doc/bundles/org.eclipse.ecf.tutorial/src/org/eclipse/ecf/tutorial/datashare/MyChannel.java +++ b/doc/bundles/org.eclipse.ecf.tutorial/src/org/eclipse/ecf/tutorial/datashare/MyChannel.java @@ -1,10 +1,10 @@ package org.eclipse.ecf.tutorial.datashare; -import org.eclipse.ecf.core.ISharedObjectTransactionConfig; -import org.eclipse.ecf.core.ReplicaSharedObjectDescription; -import org.eclipse.ecf.core.SharedObjectInitException; import org.eclipse.ecf.core.events.IContainerConnectedEvent; import org.eclipse.ecf.core.identity.ID; +import org.eclipse.ecf.core.sharedobject.ISharedObjectTransactionConfig; +import org.eclipse.ecf.core.sharedobject.ReplicaSharedObjectDescription; +import org.eclipse.ecf.core.sharedobject.SharedObjectInitException; import org.eclipse.ecf.core.util.ECFException; import org.eclipse.ecf.core.util.Event; import org.eclipse.ecf.core.util.IEventProcessor; diff --git a/examples/bundles/org.eclipse.ecf.example.clients/src/org/eclipse/ecf/example/clients/TrivialSharedObject.java b/examples/bundles/org.eclipse.ecf.example.clients/src/org/eclipse/ecf/example/clients/TrivialSharedObject.java index b6ebb1074..f62f97ae6 100644 --- a/examples/bundles/org.eclipse.ecf.example.clients/src/org/eclipse/ecf/example/clients/TrivialSharedObject.java +++ b/examples/bundles/org.eclipse.ecf.example.clients/src/org/eclipse/ecf/example/clients/TrivialSharedObject.java @@ -2,9 +2,9 @@ package org.eclipse.ecf.example.clients; import java.io.IOException; -import org.eclipse.ecf.core.SharedObjectInitException; import org.eclipse.ecf.core.identity.ID; import org.eclipse.ecf.core.sharedobject.AbstractSharedObject; +import org.eclipse.ecf.core.sharedobject.SharedObjectInitException; import org.eclipse.ecf.core.sharedobject.SharedObjectMsg; public class TrivialSharedObject extends AbstractSharedObject { diff --git a/examples/bundles/org.eclipse.ecf.example.clients/src/org/eclipse/ecf/example/clients/XMPPSORobotApplication.java b/examples/bundles/org.eclipse.ecf.example.clients/src/org/eclipse/ecf/example/clients/XMPPSORobotApplication.java index 8b286454b..494bafa4b 100644 --- a/examples/bundles/org.eclipse.ecf.example.clients/src/org/eclipse/ecf/example/clients/XMPPSORobotApplication.java +++ b/examples/bundles/org.eclipse.ecf.example.clients/src/org/eclipse/ecf/example/clients/XMPPSORobotApplication.java @@ -1,9 +1,9 @@ package org.eclipse.ecf.example.clients; import org.eclipse.core.runtime.IPlatformRunnable; -import org.eclipse.ecf.core.ISharedObjectContainer; import org.eclipse.ecf.core.identity.ID; import org.eclipse.ecf.core.identity.IDFactory; +import org.eclipse.ecf.core.sharedobject.ISharedObjectContainer; import org.eclipse.ecf.core.util.ECFException; public class XMPPSORobotApplication implements IPlatformRunnable, IMessageReceiver { 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 feed0b281..e290ea883 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 @@ -6,7 +6,7 @@ <booleanAttribute key="useProduct" value="false"/> <booleanAttribute key="tracing" value="true"/> <stringAttribute key="location2" value="C:\eclipse3.1m4\eclipse\second-runtime-workspace"/> -<stringAttribute key="selected_target_plugins" value="com.ibm.etools.emf.event,com.ibm.icu,com.ibm.icu.source,com.jcraft.jsch,org.apache.ant,org.apache.batik,org.apache.lucene,org.apache.xerces,org.eclipse.ant.core,org.eclipse.ant.ui,org.eclipse.compare,org.eclipse.compare.examples,org.eclipse.compare.examples.xml,org.eclipse.core.boot,org.eclipse.core.commands,org.eclipse.core.contenttype,org.eclipse.core.expressions,org.eclipse.core.filebuffers,org.eclipse.core.filesystem,org.eclipse.core.filesystem.win32.x86,org.eclipse.core.jobs,org.eclipse.core.resources,org.eclipse.core.resources.compatibility,org.eclipse.core.resources.win32,org.eclipse.core.runtime,org.eclipse.core.runtime.compatibility,org.eclipse.core.runtime.compatibility.auth,org.eclipse.core.runtime.compatibility.registry,org.eclipse.core.variables,org.eclipse.debug.core,org.eclipse.debug.ui,org.eclipse.draw2d,org.eclipse.draw2d.doc.isv,org.eclipse.emf,org.eclipse.emf.ant,org.eclipse.emf.cheatsheets,org.eclipse.emf.codegen,org.eclipse.emf.codegen.ecore,org.eclipse.emf.codegen.ecore.ui,org.eclipse.emf.codegen.ui,org.eclipse.emf.common,org.eclipse.emf.common.ui,org.eclipse.emf.commonj.sdo,org.eclipse.emf.converter,org.eclipse.emf.doc,org.eclipse.emf.ecore,org.eclipse.emf.ecore.change,org.eclipse.emf.ecore.change.edit,org.eclipse.emf.ecore.edit,org.eclipse.emf.ecore.editor,org.eclipse.emf.ecore.sdo,org.eclipse.emf.ecore.sdo.doc,org.eclipse.emf.ecore.sdo.edit,org.eclipse.emf.ecore.sdo.editor,org.eclipse.emf.ecore.sdo.source,org.eclipse.emf.ecore.xmi,org.eclipse.emf.edit,org.eclipse.emf.edit.ui,org.eclipse.emf.exporter,org.eclipse.emf.importer,org.eclipse.emf.importer.ecore,org.eclipse.emf.importer.java,org.eclipse.emf.importer.rose,org.eclipse.emf.mapping,org.eclipse.emf.mapping.ecore2ecore,org.eclipse.emf.mapping.ecore2ecore.editor,org.eclipse.emf.mapping.ecore2xml,org.eclipse.emf.mapping.ecore2xml.ui,org.eclipse.emf.mapping.ui,org.eclipse.emf.mapping.xsd2ecore,org.eclipse.emf.mapping.xsd2ecore.editor,org.eclipse.emf.ocl,org.eclipse.emf.query,org.eclipse.emf.query.ocl,org.eclipse.emf.source,org.eclipse.emf.transaction,org.eclipse.emf.transaction.ui,org.eclipse.emf.validation,org.eclipse.emf.validation.ocl,org.eclipse.emf.validation.ui,org.eclipse.emf.validation.ui.ide,org.eclipse.emf.workspace,org.eclipse.emf.workspace.ui,org.eclipse.equinox.common,org.eclipse.equinox.preferences,org.eclipse.equinox.registry,org.eclipse.ftp,org.eclipse.gef,org.eclipse.gef.doc.isv,org.eclipse.gef.examples.flow,org.eclipse.gef.examples.logic,org.eclipse.gef.examples.shapes,org.eclipse.gef.examples.source,org.eclipse.gef.examples.text,org.eclipse.gef.source,org.eclipse.gmf,org.eclipse.gmf.bridge,org.eclipse.gmf.bridge.ui,org.eclipse.gmf.bridge.ui.dashboard,org.eclipse.gmf.codegen,org.eclipse.gmf.codegen.edit,org.eclipse.gmf.codegen.ui,org.eclipse.gmf.common,org.eclipse.gmf.doc,org.eclipse.gmf.doc.ui,org.eclipse.gmf.ecore.editor,org.eclipse.gmf.graphdef,org.eclipse.gmf.graphdef.codegen,org.eclipse.gmf.graphdef.codegen.ui,org.eclipse.gmf.graphdef.edit,org.eclipse.gmf.map,org.eclipse.gmf.map.edit,org.eclipse.gmf.runtime.common.core,org.eclipse.gmf.runtime.common.ui,org.eclipse.gmf.runtime.common.ui.action,org.eclipse.gmf.runtime.common.ui.action.ide,org.eclipse.gmf.runtime.common.ui.printing,org.eclipse.gmf.runtime.common.ui.printing.win32,org.eclipse.gmf.runtime.common.ui.services,org.eclipse.gmf.runtime.common.ui.services.action,org.eclipse.gmf.runtime.common.ui.services.dnd,org.eclipse.gmf.runtime.common.ui.services.dnd.ide,org.eclipse.gmf.runtime.common.ui.services.properties,org.eclipse.gmf.runtime.diagram.core,org.eclipse.gmf.runtime.diagram.ui,org.eclipse.gmf.runtime.diagram.ui.actions,org.eclipse.gmf.runtime.diagram.ui.dnd,org.eclipse.gmf.runtime.diagram.ui.geoshapes,org.eclipse.gmf.runtime.diagram.ui.printing,org.eclipse.gmf.runtime.diagram.ui.printing.render,org.eclipse.gmf.runtime.diagram.ui.properties,org.eclipse.gmf.runtime.diagram.ui.providers,org.eclipse.gmf.runtime.diagram.ui.providers.ide,org.eclipse.gmf.runtime.diagram.ui.render,org.eclipse.gmf.runtime.diagram.ui.resources.editor,org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide,org.eclipse.gmf.runtime.draw2d.ui,org.eclipse.gmf.runtime.draw2d.ui.render,org.eclipse.gmf.runtime.draw2d.ui.render.awt,org.eclipse.gmf.runtime.emf.clipboard.core,org.eclipse.gmf.runtime.emf.commands.core,org.eclipse.gmf.runtime.emf.core,org.eclipse.gmf.runtime.emf.type.core,org.eclipse.gmf.runtime.emf.type.ui,org.eclipse.gmf.runtime.emf.ui,org.eclipse.gmf.runtime.emf.ui.properties,org.eclipse.gmf.runtime.gef.ui,org.eclipse.gmf.runtime.notation,org.eclipse.gmf.runtime.notation.edit,org.eclipse.gmf.runtime.notation.providers,org.eclipse.gmf.sdk,org.eclipse.gmf.sdk.source,org.eclipse.gmf.source,org.eclipse.gmf.tooldef,org.eclipse.gmf.tooldef.edit,org.eclipse.gmf.validate,org.eclipse.help,org.eclipse.help.appserver,org.eclipse.help.base,org.eclipse.help.examples.ex1,org.eclipse.help.ui,org.eclipse.help.webapp,org.eclipse.jdt,org.eclipse.jdt.apt.core,org.eclipse.jdt.apt.ui,org.eclipse.jdt.core,org.eclipse.jdt.core.manipulation,org.eclipse.jdt.debug,org.eclipse.jdt.debug.ui,org.eclipse.jdt.doc.isv,org.eclipse.jdt.doc.user,org.eclipse.jdt.junit,org.eclipse.jdt.junit.runtime,org.eclipse.jdt.junit4.runtime,org.eclipse.jdt.launching,org.eclipse.jdt.source,org.eclipse.jdt.ui,org.eclipse.jdt.ui.examples.projects,org.eclipse.jem,org.eclipse.jem.beaninfo,org.eclipse.jem.proxy,org.eclipse.jem.ui,org.eclipse.jem.util,org.eclipse.jem.workbench,org.eclipse.jface,org.eclipse.jface.databinding,org.eclipse.jface.examples.databinding,org.eclipse.jface.text,org.eclipse.ltk.core.refactoring,org.eclipse.ltk.ui.refactoring,org.eclipse.osgi,org.eclipse.osgi.services,org.eclipse.osgi.util,org.eclipse.pde,org.eclipse.pde.build,org.eclipse.pde.core,org.eclipse.pde.doc.user,org.eclipse.pde.junit.runtime,org.eclipse.pde.runtime,org.eclipse.pde.source,org.eclipse.pde.ui,org.eclipse.platform,org.eclipse.platform.doc.isv,org.eclipse.platform.doc.user,org.eclipse.platform.source,org.eclipse.platform.source.win32.win32.x86,org.eclipse.rcp,org.eclipse.rcp.source,org.eclipse.rcp.source.win32.win32.x86,org.eclipse.sdk,org.eclipse.sdk.examples,org.eclipse.sdk.examples.source,org.eclipse.sdk.examples.source.win32.win32.x86,org.eclipse.search,org.eclipse.swt,org.eclipse.swt.examples,org.eclipse.swt.examples.browser,org.eclipse.swt.examples.browser.demos,org.eclipse.swt.examples.controls,org.eclipse.swt.examples.launcher,org.eclipse.swt.examples.layouts,org.eclipse.swt.examples.ole.win32,org.eclipse.swt.examples.paint,org.eclipse.swt.win32.win32.x86,org.eclipse.target,org.eclipse.target.ftp,org.eclipse.target.ide,org.eclipse.target.iofile,org.eclipse.target.webdav,org.eclipse.team.core,org.eclipse.team.cvs.core,org.eclipse.team.cvs.ssh,org.eclipse.team.cvs.ssh2,org.eclipse.team.cvs.ui,org.eclipse.team.examples.filesystem,org.eclipse.team.extras,org.eclipse.team.extras.source,org.eclipse.team.ftp,org.eclipse.team.target,org.eclipse.team.ui,org.eclipse.team.webdav,org.eclipse.text,org.eclipse.tomcat,org.eclipse.ui,org.eclipse.ui.browser,org.eclipse.ui.cheatsheets,org.eclipse.ui.console,org.eclipse.ui.editors,org.eclipse.ui.examples.fieldassist,org.eclipse.ui.examples.javaeditor,org.eclipse.ui.examples.multipageeditor,org.eclipse.ui.examples.propertysheet,org.eclipse.ui.examples.readmetool,org.eclipse.ui.examples.undo,org.eclipse.ui.examples.views.properties.tabbed.article,org.eclipse.ui.externaltools,org.eclipse.ui.forms,org.eclipse.ui.ide,org.eclipse.ui.intro,org.eclipse.ui.intro.universal,org.eclipse.ui.navigator,org.eclipse.ui.navigator.resources,org.eclipse.ui.presentations.r21,org.eclipse.ui.views,org.eclipse.ui.views.properties.tabbed,org.eclipse.ui.win32,org.eclipse.ui.workbench,org.eclipse.ui.workbench.compatibility,org.eclipse.ui.workbench.texteditor,org.eclipse.update.configurator,org.eclipse.update.core,org.eclipse.update.core.win32,org.eclipse.update.scheduler,org.eclipse.update.ui,org.eclipse.webdav,org.eclipse.xsd,org.eclipse.xsd.cheatsheets,org.eclipse.xsd.doc,org.eclipse.xsd.ecore.exporter,org.eclipse.xsd.ecore.importer,org.eclipse.xsd.edit,org.eclipse.xsd.editor,org.eclipse.xsd.source,org.junit,org.junit4"/> +<stringAttribute key="selected_target_plugins" value="com.ibm.icu,com.ibm.icu.source,com.jcraft.jsch,org.apache.ant,org.apache.batik,org.apache.lucene,org.apache.xerces,org.eclipse.ant.core,org.eclipse.ant.ui,org.eclipse.compare,org.eclipse.core.boot,org.eclipse.core.commands,org.eclipse.core.contenttype,org.eclipse.core.expressions,org.eclipse.core.filebuffers,org.eclipse.core.filesystem,org.eclipse.core.filesystem.win32.x86,org.eclipse.core.jobs,org.eclipse.core.resources,org.eclipse.core.resources.compatibility,org.eclipse.core.resources.win32,org.eclipse.core.runtime,org.eclipse.core.runtime.compatibility,org.eclipse.core.runtime.compatibility.auth,org.eclipse.core.runtime.compatibility.registry,org.eclipse.core.variables,org.eclipse.debug.core,org.eclipse.debug.ui,org.eclipse.draw2d,org.eclipse.draw2d.doc.isv,org.eclipse.emf,org.eclipse.emf.ant,org.eclipse.emf.cheatsheets,org.eclipse.emf.codegen,org.eclipse.emf.codegen.ecore,org.eclipse.emf.codegen.ecore.ui,org.eclipse.emf.codegen.ui,org.eclipse.emf.common,org.eclipse.emf.common.ui,org.eclipse.emf.commonj.sdo,org.eclipse.emf.converter,org.eclipse.emf.doc,org.eclipse.emf.ecore,org.eclipse.emf.ecore.change,org.eclipse.emf.ecore.change.edit,org.eclipse.emf.ecore.edit,org.eclipse.emf.ecore.editor,org.eclipse.emf.ecore.sdo,org.eclipse.emf.ecore.sdo.doc,org.eclipse.emf.ecore.sdo.edit,org.eclipse.emf.ecore.sdo.editor,org.eclipse.emf.ecore.sdo.source,org.eclipse.emf.ecore.xmi,org.eclipse.emf.edit,org.eclipse.emf.edit.ui,org.eclipse.emf.exporter,org.eclipse.emf.importer,org.eclipse.emf.importer.ecore,org.eclipse.emf.importer.java,org.eclipse.emf.importer.rose,org.eclipse.emf.mapping,org.eclipse.emf.mapping.ecore2ecore,org.eclipse.emf.mapping.ecore2ecore.editor,org.eclipse.emf.mapping.ecore2xml,org.eclipse.emf.mapping.ecore2xml.ui,org.eclipse.emf.mapping.ui,org.eclipse.emf.mapping.xsd2ecore,org.eclipse.emf.mapping.xsd2ecore.editor,org.eclipse.emf.ocl,org.eclipse.emf.query,org.eclipse.emf.query.ocl,org.eclipse.emf.source,org.eclipse.emf.transaction,org.eclipse.emf.transaction.ui,org.eclipse.emf.validation,org.eclipse.emf.validation.ocl,org.eclipse.emf.validation.ui,org.eclipse.emf.validation.ui.ide,org.eclipse.emf.workspace,org.eclipse.emf.workspace.ui,org.eclipse.equinox.common,org.eclipse.equinox.preferences,org.eclipse.equinox.registry,org.eclipse.gef,org.eclipse.gef.doc.isv,org.eclipse.gef.examples.flow,org.eclipse.gef.examples.logic,org.eclipse.gef.examples.shapes,org.eclipse.gef.examples.source,org.eclipse.gef.examples.text,org.eclipse.gef.source,org.eclipse.gmf,org.eclipse.gmf.bridge,org.eclipse.gmf.bridge.ui,org.eclipse.gmf.bridge.ui.dashboard,org.eclipse.gmf.codegen,org.eclipse.gmf.codegen.edit,org.eclipse.gmf.codegen.ui,org.eclipse.gmf.common,org.eclipse.gmf.doc,org.eclipse.gmf.doc.ui,org.eclipse.gmf.ecore.editor,org.eclipse.gmf.graphdef,org.eclipse.gmf.graphdef.codegen,org.eclipse.gmf.graphdef.codegen.ui,org.eclipse.gmf.graphdef.edit,org.eclipse.gmf.map,org.eclipse.gmf.map.edit,org.eclipse.gmf.runtime.common.core,org.eclipse.gmf.runtime.common.ui,org.eclipse.gmf.runtime.common.ui.action,org.eclipse.gmf.runtime.common.ui.action.ide,org.eclipse.gmf.runtime.common.ui.printing,org.eclipse.gmf.runtime.common.ui.printing.win32,org.eclipse.gmf.runtime.common.ui.services,org.eclipse.gmf.runtime.common.ui.services.action,org.eclipse.gmf.runtime.common.ui.services.dnd,org.eclipse.gmf.runtime.common.ui.services.dnd.ide,org.eclipse.gmf.runtime.common.ui.services.properties,org.eclipse.gmf.runtime.diagram.core,org.eclipse.gmf.runtime.diagram.ui,org.eclipse.gmf.runtime.diagram.ui.actions,org.eclipse.gmf.runtime.diagram.ui.dnd,org.eclipse.gmf.runtime.diagram.ui.geoshapes,org.eclipse.gmf.runtime.diagram.ui.printing,org.eclipse.gmf.runtime.diagram.ui.printing.render,org.eclipse.gmf.runtime.diagram.ui.properties,org.eclipse.gmf.runtime.diagram.ui.providers,org.eclipse.gmf.runtime.diagram.ui.providers.ide,org.eclipse.gmf.runtime.diagram.ui.render,org.eclipse.gmf.runtime.diagram.ui.resources.editor,org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide,org.eclipse.gmf.runtime.draw2d.ui,org.eclipse.gmf.runtime.draw2d.ui.render,org.eclipse.gmf.runtime.draw2d.ui.render.awt,org.eclipse.gmf.runtime.emf.clipboard.core,org.eclipse.gmf.runtime.emf.commands.core,org.eclipse.gmf.runtime.emf.core,org.eclipse.gmf.runtime.emf.type.core,org.eclipse.gmf.runtime.emf.type.ui,org.eclipse.gmf.runtime.emf.ui,org.eclipse.gmf.runtime.emf.ui.properties,org.eclipse.gmf.runtime.gef.ui,org.eclipse.gmf.runtime.notation,org.eclipse.gmf.runtime.notation.edit,org.eclipse.gmf.runtime.notation.providers,org.eclipse.gmf.sdk,org.eclipse.gmf.sdk.source,org.eclipse.gmf.source,org.eclipse.gmf.tooldef,org.eclipse.gmf.tooldef.edit,org.eclipse.gmf.validate,org.eclipse.help,org.eclipse.help.appserver,org.eclipse.help.base,org.eclipse.help.ui,org.eclipse.help.webapp,org.eclipse.jdt,org.eclipse.jdt.apt.core,org.eclipse.jdt.apt.ui,org.eclipse.jdt.core,org.eclipse.jdt.core.manipulation,org.eclipse.jdt.debug,org.eclipse.jdt.debug.ui,org.eclipse.jdt.doc.isv,org.eclipse.jdt.doc.user,org.eclipse.jdt.junit,org.eclipse.jdt.junit.runtime,org.eclipse.jdt.junit4.runtime,org.eclipse.jdt.launching,org.eclipse.jdt.source,org.eclipse.jdt.ui,org.eclipse.jface,org.eclipse.jface.databinding,org.eclipse.jface.text,org.eclipse.ltk.core.refactoring,org.eclipse.ltk.ui.refactoring,org.eclipse.osgi,org.eclipse.osgi.services,org.eclipse.osgi.util,org.eclipse.pde,org.eclipse.pde.build,org.eclipse.pde.core,org.eclipse.pde.doc.user,org.eclipse.pde.junit.runtime,org.eclipse.pde.runtime,org.eclipse.pde.source,org.eclipse.pde.ui,org.eclipse.platform,org.eclipse.platform.doc.isv,org.eclipse.platform.doc.user,org.eclipse.platform.source,org.eclipse.platform.source.win32.win32.x86,org.eclipse.rcp,org.eclipse.rcp.source,org.eclipse.rcp.source.win32.win32.x86,org.eclipse.sdk,org.eclipse.search,org.eclipse.swt,org.eclipse.swt.win32.win32.x86,org.eclipse.team.core,org.eclipse.team.cvs.core,org.eclipse.team.cvs.ssh,org.eclipse.team.cvs.ssh2,org.eclipse.team.cvs.ui,org.eclipse.team.ui,org.eclipse.text,org.eclipse.tomcat,org.eclipse.ui,org.eclipse.ui.browser,org.eclipse.ui.cheatsheets,org.eclipse.ui.console,org.eclipse.ui.editors,org.eclipse.ui.externaltools,org.eclipse.ui.forms,org.eclipse.ui.ide,org.eclipse.ui.intro,org.eclipse.ui.intro.universal,org.eclipse.ui.navigator,org.eclipse.ui.navigator.resources,org.eclipse.ui.presentations.r21,org.eclipse.ui.views,org.eclipse.ui.views.properties.tabbed,org.eclipse.ui.win32,org.eclipse.ui.workbench,org.eclipse.ui.workbench.compatibility,org.eclipse.ui.workbench.texteditor,org.eclipse.update.configurator,org.eclipse.update.core,org.eclipse.update.core.win32,org.eclipse.update.scheduler,org.eclipse.update.ui,org.eclipse.xsd,org.eclipse.xsd.cheatsheets,org.eclipse.xsd.doc,org.eclipse.xsd.ecore.exporter,org.eclipse.xsd.ecore.importer,org.eclipse.xsd.edit,org.eclipse.xsd.editor,org.eclipse.xsd.source,org.junit,org.junit4"/> <booleanAttribute key="automaticValidate" value="false"/> <mapAttribute key="tracingOptions"> <mapEntry key="org.eclipse.ecf.provider.xmpp/debug/filter" value="*"/> @@ -24,7 +24,6 @@ <mapEntry key="org.eclipse.gmf.runtime.common.ui.services.action/debug/services/config" value="false"/> <mapEntry key="org.eclipse.emf.validation/debug/constraints/evaluation" value="false"/> <mapEntry key="org.eclipse.ui.ide/debug/internalerror/openDialog" value="false"/> -<mapEntry key="org.eclipse.jem.ui/debug/logtracefile" value="default"/> <mapEntry key="org.eclipse.gmf.runtime.common.core/debug/commands/undo" value="false"/> <mapEntry key="org.eclipse.emf.query/debug/methods/exiting" value="false"/> <mapEntry key="org.eclipse.gmf.runtime.common.ui.services/debug/exceptions/throwing" value="false"/> @@ -38,8 +37,8 @@ <mapEntry key="org.eclipse.gmf.runtime.emf.commands.core/debug" value="true"/> <mapEntry key="org.eclipse.ecf.example.collab/debug/urlsharedobject" value="false"/> <mapEntry key="org.eclipse.gmf.runtime.common.ui.printing/debug/actions/admin" value="false"/> +<mapEntry key="org.eclipse.ecf.identity/debug" value="true"/> <mapEntry key="org.eclipse.jdt.ui/perf/content_assist_sorters/extensions" value=""/> -<mapEntry key="org.eclipse.jem.proxy/debug/traceexpressions" value="false"/> <mapEntry key="org.eclipse.core.runtime/url/debug/cachelookup" value="false"/> <mapEntry key="org.eclipse.gmf.runtime.diagram.ui/debug/filter/canonical" value="false"/> <mapEntry key="org.eclipse.team.cvs.core/debug" value="false"/> @@ -53,10 +52,12 @@ <mapEntry key="org.eclipse.core.resources/restore/markers" value="false"/> <mapEntry key="org.eclipse.gmf.runtime.gef.ui/debug/methods/entering" value="false"/> <mapEntry key="org.eclipse.ui.intro.universal/trace/logInfo" value="true"/> +<mapEntry key="org.eclipse.ecf.provider.remoteservice/debug/filter" value="*"/> <mapEntry key="org.eclipse.ecf.ui/debug" value="true"/> <mapEntry key="org.eclipse.osgi/debug/messageBundles" value="false"/> <mapEntry key="org.eclipse.gmf.runtime.emf.ui.properties/debug/exceptions/throwing" value="false"/> <mapEntry key="org.eclipse.ecf.ui/debug/filter" value="*"/> +<mapEntry key="org.eclipse.ecf/debug/exceptions/throwing" value="true"/> <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.help.base/debug/search" value="false"/> @@ -68,11 +69,12 @@ <mapEntry key="org.eclipse.gmf.runtime.common.core/debug/exceptions/throwing" 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.core.resources/monitor/listeners" value="true"/> <mapEntry key="org.eclipse.ecf.provider/debug/transactioneventprocessor" value="false"/> <mapEntry key="org.eclipse.gmf.runtime.common.core/debug/commands/execute" value="false"/> <mapEntry key="org.eclipse.gmf.runtime.emf.commands.core/debug/methods/exiting" value="false"/> +<mapEntry key="org.eclipse.ecf.identity/debug/methods/exiting" value="true"/> <mapEntry key="org.eclipse.ui/perf/perspective.switch" value="800"/> -<mapEntry key="org.eclipse.jem.proxy/debug/logtracefile" value="default"/> <mapEntry key="org.eclipse.gmf.runtime.emf.ui/debug/model/operations" value="false"/> <mapEntry key="org.eclipse.ui/debug/declaredImages" value="false"/> <mapEntry key="org.eclipse.ui/perf/contentTypes" value="200"/> @@ -125,6 +127,7 @@ <mapEntry key="org.eclipse.gmf.runtime.emf.ui/debug/exceptions/throwing" value="false"/> <mapEntry key="org.eclipse.gmf.runtime.draw2d.ui.figures/debug/methods/exiting" value="false"/> <mapEntry key="org.eclipse.ui/perf/uijob" value="200"/> +<mapEntry key="org.maven.ide.eclipse/launcher" value="false"/> <mapEntry key="org.eclipse.osgi/resolver/generics" value="false"/> <mapEntry key="org.eclipse.gmf.runtime.common.core/debug/services/execute" value="false"/> <mapEntry key="org.eclipse.ecf.provider.irc/debug/irccontainer" value="true"/> @@ -136,7 +139,6 @@ <mapEntry key="org.eclipse.emf.validation/debug/methods/entering" value="false"/> <mapEntry key="org.eclipse.jdt.core/perf/containerinitializer" value="5000"/> <mapEntry key="org.eclipse.osgi/eclipseadaptor/debug" value="false"/> -<mapEntry key="org.eclipse.jem.proxy/remote/debug/notimeouts" value="false"/> <mapEntry key="org.eclipse.gmf.runtime.diagram.ui.actions/debug/exceptions/catching" value="false"/> <mapEntry key="org.eclipse.core.resources/build/invoking" value="false"/> <mapEntry key="org.eclipse.gmf.runtime.common.ui.services.action/debug/methods/exiting" value="false"/> @@ -156,11 +158,11 @@ <mapEntry key="org.eclipse.gmf.runtime.common.ui.printing/debug/exceptions/catching" 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.ui/debug/showAllJobs" value="false"/> <mapEntry key="org.eclipse.osgi/resolver/requires" value="false"/> -<mapEntry key="org.eclipse.jem/debug/logtrace" value="default"/> <mapEntry key="org.eclipse.ecf.provider/debug/sharedobjectcontext" value="false"/> <mapEntry key="org.eclipse.ui/trace/sources" value="false"/> +<mapEntry key="org.eclipse.ecf/debug/methods/exiting" value="true"/> <mapEntry key="org.eclipse.ecf.provider/debug/container" value="true"/> <mapEntry key="org.eclipse.gmf.runtime.common.core/debug/methods/exiting" value="false"/> <mapEntry key="org.eclipse.jdt.ui/perf/search/participants" value="300"/> @@ -186,7 +188,6 @@ <mapEntry key="org.eclipse.core.jobs/jobs/errorondeadlock" value="false"/> <mapEntry key="org.eclipse.gmf.runtime.common.ui.action/debug/exceptions/throwing" 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.gmf.runtime.emf.ui/debug/exceptions/catching" value="false"/> <mapEntry key="org.eclipse.jdt.ui/perf/explorer/createPartControl" value="1300"/> <mapEntry key="org.eclipse.emf.validation/debug/constraints/disabled" value="false"/> @@ -196,7 +197,6 @@ <mapEntry key="org.eclipse.gmf.runtime.common.ui.action/debug/methods/entering" value="false"/> <mapEntry key="org.eclipse.core.jobs/jobs" value="false"/> <mapEntry key="org.eclipse.ecf.sdo/debug" value="true"/> -<mapEntry key="org.eclipse.jem/debug/loglevel" value="default"/> <mapEntry key="org.eclipse.core.jobs/jobs/beginend" value="false"/> <mapEntry key="org.eclipse.pde.core/debug" value="true"/> <mapEntry key="org.eclipse.osgi/monitor/activation" value="false"/> @@ -225,20 +225,17 @@ <mapEntry key="org.eclipse.ecf.ui/debug/flag" value="true"/> <mapEntry key="org.eclipse.jdt.core/debug/cpresolution" value="false"/> <mapEntry key="org.eclipse.gmf.runtime.emf.commands.core/debug/exceptions/catching" value="false"/> -<mapEntry key="org.eclipse.jem.util/debug/logtrace" value="false"/> <mapEntry key="org.eclipse.gmf.runtime.emf.core/debug/exceptions/throwing" value="false"/> <mapEntry key="org.eclipse.gmf.runtime.diagram.ui/debug/exceptions/throwing" value="false"/> -<mapEntry key="org.eclipse.ui/debug/showSystemJobs" value="false"/> <mapEntry key="org.eclipse.gmf.runtime.common.ui.services.action/debug/exceptions/catching" 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.ecf.identity/debug/methods/entering" value="true"/> <mapEntry key="org.eclipse.gmf.runtime.draw2d.ui.render/debug/methods/exiting" value="false"/> -<mapEntry key="org.eclipse.jem.beaninfo/debug/logtracefile" value="default"/> <mapEntry key="org.eclipse.osgi/resolver/cycles" value="false"/> <mapEntry key="org.eclipse.ecf.provider.xmpp/debug/smackdebug" value="true"/> <mapEntry key="org.eclipse.gmf.runtime.draw2d.ui.render/debug" value="true"/> <mapEntry key="org.eclipse.osgi/eclipseadaptor/converter/debug" value="false"/> -<mapEntry key="org.eclipse.jem.proxy/remote/debug/ioconsole" value="false"/> <mapEntry key="org.eclipse.ui/listeners/IWorkbenchPartReference" value="false"/> <mapEntry key="org.eclipse.gmf.runtime.emf.ui.properties/debug/methods/entering" value="false"/> <mapEntry key="org.eclipse.ecf.provider.xmpp/debug/flag" value="true"/> @@ -246,6 +243,7 @@ <mapEntry key="org.eclipse.ecf.provider.jmdns/debug/flag" value="true"/> <mapEntry key="org.eclipse.ecf.provider.irc/debug/ircrootcontainer" value="true"/> <mapEntry key="org.eclipse.gmf.runtime.draw2d.ui.render.awt/debug/exceptions/catching" value="false"/> +<mapEntry key="org.eclipse.ecf/debug/methods/entering" value="true"/> <mapEntry key="org.eclipse.core.resources/history" value="false"/> <mapEntry key="org.eclipse.gmf.runtime.common.ui.services.dnd/debug/exceptions/throwing" value="false"/> <mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPartListener2" value="false"/> @@ -256,6 +254,7 @@ <mapEntry key="org.eclipse.jdt.core/debug/buffermanager" value="false"/> <mapEntry key="org.eclipse.emf.validation/debug/xml" value="false"/> <mapEntry key="org.eclipse.gmf.runtime.common.ui.services/debug" value="true"/> +<mapEntry key="org.eclipse.ecf.identity/debug/exceptions/catching" 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"/> @@ -263,7 +262,6 @@ <mapEntry key="org.eclipse.gmf.runtime.common.ui.action/debug/exceptions/catching" value="false"/> <mapEntry key="org.eclipse.emf.query.ocl/debug/methods/exiting" value="false"/> <mapEntry key="org.eclipse.ecf.provider.datashare/debug" value="true"/> -<mapEntry key="org.eclipse.jem.proxy/debug/traceexpressionstimethreshold" value="100"/> <mapEntry key="org.eclipse.gmf.runtime.diagram.core/debug/methods/exiting" value="false"/> <mapEntry key="org.eclipse.core.resources/save/syncinfo" value="false"/> <mapEntry key="org.eclipse.jdt.ui/debug/ResultCollector" value="false"/> @@ -273,11 +271,11 @@ <mapEntry key="org.eclipse.ui/perf/part.listeners" value="200"/> <mapEntry key="org.eclipse.emf.transaction/debug/locking" value="false"/> <mapEntry key="org.eclipse.osgi/resolver/wiring" value="false"/> +<mapEntry key="org.maven.ide.eclipse/plugin" value="false"/> <mapEntry key="org.eclipse.emf.transaction/debug/transactions" value="false"/> <mapEntry key="org.eclipse.gmf.runtime.common.ui/debug/actions/repeat" value="false"/> <mapEntry key="org.eclipse.gmf.runtime.emf.type.core/debug" value="true"/> <mapEntry key="org.eclipse.core.runtime/url/debug/cachecopy" value="false"/> -<mapEntry key="org.eclipse.jem.util/debug/loglevel" value="WARNING"/> <mapEntry key="org.eclipse.ecf.provider.irc/debug" value="true"/> <mapEntry key="org.eclipse.jdt.ui/perf/explorer/RefactorActionGroup" value="150"/> <mapEntry key="org.eclipse.jdt.ui/perf/content_assist/extensions" value="1000"/> @@ -291,10 +289,10 @@ <mapEntry key="org.eclipse.ecf.discovery/debug" value="true"/> <mapEntry key="org.eclipse.gmf.runtime.diagram.core/debug/exceptions/throwing" value="false"/> <mapEntry key="org.eclipse.help.webapp/debug" value="true"/> +<mapEntry key="org.eclipse.ecf.provider.remoteservice/debug/registrysharedobject" value="true"/> <mapEntry key="org.eclipse.gmf.runtime.diagram.core/debug" value="true"/> <mapEntry key="org.eclipse.jdt.core/debug/search" value="false"/> <mapEntry key="org.eclipse.gmf.runtime.notation.providers/debug/methods/entering" value="false"/> -<mapEntry key="org.eclipse.jem.proxy/debug/logtrace" value="default"/> <mapEntry key="org.eclipse.ecf.example.collab/debug/progsharedobject" value="false"/> <mapEntry key="org.eclipse.osgi/defaultprofile/logfilename" value=""/> <mapEntry key="org.eclipse.jdt.core/debug/sourcemapper" value="false"/> @@ -306,8 +304,8 @@ <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.gmf.runtime.emf.core/debug/exceptions/catching" value="false"/> <mapEntry key="org.eclipse.gmf.runtime.draw2d.ui.render.awt/debug/dnd/tracing" value="false"/> +<mapEntry key="org.eclipse.gmf.runtime.emf.core/debug/exceptions/catching" value="false"/> <mapEntry key="org.eclipse.gmf.runtime.diagram.ui/debug/exceptions/catching" value="false"/> <mapEntry key="org.eclipse.gmf.runtime.diagram.ui.actions/debug" value="true"/> <mapEntry key="org.eclipse.ecf.ui/debug/textchatcomposite" value="true"/> @@ -315,7 +313,6 @@ <mapEntry key="org.eclipse.ecf.provider/debug/gmm" value="false"/> <mapEntry key="org.eclipse.ecf.discovery/debug/filter" value="*"/> <mapEntry key="org.eclipse.core.resources/refresh" value="false"/> -<mapEntry key="org.eclipse.jem.util/debug/logtracefile" value="false"/> <mapEntry key="org.eclipse.ecf.example.collab/debug/genericsharedobject" value="true"/> <mapEntry key="org.eclipse.gmf.runtime.draw2d.ui.render/debug/exceptions/throwing" value="false"/> <mapEntry key="org.eclipse.debug.ui/debug" value="false"/> @@ -329,10 +326,10 @@ <mapEntry key="org.eclipse.equinox.registry/debug/events" value="false"/> <mapEntry key="org.eclipse.emf.workspace/debug/exceptions/throwing" value="false"/> <mapEntry key="org.eclipse.gmf.runtime.diagram.ui/debug/filter/persistencemgr" value="false"/> +<mapEntry key="org.maven.ide.eclipse/console" value="false"/> <mapEntry key="org.eclipse.gmf.runtime.diagram.ui/debug/methods/exiting" value="false"/> <mapEntry key="org.eclipse.core.resources/restore/mastertable" value="false"/> <mapEntry key="org.eclipse.emf.query.ocl/debug/exceptions/throwing" value="false"/> -<mapEntry key="org.eclipse.jem.proxy/debug/loglevel" value="default"/> <mapEntry key="org.eclipse.ecf/debug/sharedobjectcontainerfactory" value="true"/> <mapEntry key="org.eclipse.gmf.runtime.draw2d.ui.render.awt/debug/exceptions/throwing" value="false"/> <mapEntry key="org.eclipse.osgi/trace/activation" value="false"/> @@ -340,13 +337,13 @@ <mapEntry key="org.eclipse.ui/trace/keyBindings" value="false"/> <mapEntry key="org.eclipse.update.core/debug/type" value="false"/> <mapEntry key="org.eclipse.gmf.runtime.common.ui.printing/debug/methods/entering" value="false"/> -<mapEntry key="org.eclipse.jem.proxy/remote/debug/vmtraceout" value="false"/> <mapEntry key="org.eclipse.core.runtime/preferences/plugin" value="false"/> <mapEntry key="org.eclipse.ecf.datashare/debug" value="true"/> <mapEntry key="org.eclipse.gmf.runtime.emf.clipboard.core/debug/exceptions/catching" value="false"/> <mapEntry key="org.eclipse.core.jobs/jobs/timing" value="false"/> <mapEntry key="org.eclipse.emf.validation/debug/listeners" value="false"/> <mapEntry key="org.eclipse.ui.browser/debug" value="false"/> +<mapEntry key="org.eclipse.ecf.identity/debug/exceptions/throwing" value="true"/> <mapEntry key="org.eclipse.core.resources/build/interrupt" value="false"/> <mapEntry key="org.eclipse.emf.query/debug/exceptions/catching" value="false"/> <mapEntry key="org.eclipse.gmf.runtime.emf.clipboard.core/debug/methods/exiting" value="false"/> @@ -363,6 +360,7 @@ <mapEntry key="org.eclipse.osgi/debug/packageadmin" value="false"/> <mapEntry key="org.eclipse.emf.query.ocl/debug/methods/entering" value="false"/> <mapEntry key="org.eclipse.ecf.provider/debug/sharedobjectmanager" value="false"/> +<mapEntry key="org.eclipse.ecf.provider.remoteservice/debug" value="true"/> <mapEntry key="org.eclipse.ui.intro.universal/trace/logPerformance" value="false"/> <mapEntry key="org.eclipse.jdt.core/debug/completion" value="false"/> <mapEntry key="org.eclipse.gmf.runtime.common.ui/debug" value="true"/> @@ -376,7 +374,6 @@ <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.team.ftp/list" value="true"/> <mapEntry key="org.eclipse.update.core/debug" value="true"/> <mapEntry key="org.eclipse.gmf.runtime.common.core/debug/services/config" value="false"/> <mapEntry key="org.eclipse.team.core/debug" value="false"/> @@ -384,10 +381,11 @@ <mapEntry key="org.eclipse.help.ui/debug/infopop" value="false"/> <mapEntry key="org.eclipse.ecf.provider.jms/debug/servercontainer" value="true"/> <mapEntry key="org.eclipse.osgi/trace/filename" value="runtime.traces"/> -<mapEntry key="org.eclipse.jem/debug/logtracefile" value="default"/> <mapEntry key="org.eclipse.equinox.preferences/get" value="false"/> <mapEntry key="org.eclipse.gmf.runtime.common.ui.printing/debug/methods/exiting" value="false"/> +<mapEntry key="org.eclipse.ecf.provider.remoteservice/debug/flag" value="true"/> <mapEntry key="org.eclipse.ui/trace/handlers.verbose" value="false"/> +<mapEntry key="org.maven.ide.eclipse/actions" value="false"/> <mapEntry key="org.eclipse.emf.ocl/debug/methods/exiting" value="false"/> <mapEntry key="org.eclipse.ecf.sdo/DataGraphSharingFactory" value="true"/> <mapEntry key="org.eclipse.gmf.runtime.notation.providers/debug/exceptions/catching" value="false"/> @@ -413,8 +411,8 @@ <mapEntry key="org.eclipse.team.core/backgroundevents" value="false"/> <mapEntry key="org.eclipse.core.jobs/jobs/shutdown" value="false"/> <mapEntry key="org.eclipse.ecf.provider.jms/debug/filter" value="*"/> -<mapEntry key="org.eclipse.emf.transaction/debug/methods/exiting" value="false"/> <mapEntry key="org.eclipse.osgi/trace/filters" value="trace.properties"/> +<mapEntry key="org.eclipse.emf.transaction/debug/methods/exiting" value="false"/> <mapEntry key="org.eclipse.jdt.core/debug/javadelta/verbose" value="false"/> <mapEntry key="org.eclipse.core.resources/debug" value="false"/> <mapEntry key="org.eclipse.emf.validation/debug/constraints" value="false"/> @@ -448,10 +446,7 @@ <mapEntry key="org.eclipse.emf.validation/debug" value="true"/> <mapEntry key="org.eclipse.core.resources/contenttype" value="false"/> <mapEntry key="org.eclipse.emf.workspace/debug" value="true"/> -<mapEntry key="org.eclipse.jem.proxy/remote/debug/debugvm" value="false"/> -<mapEntry key="org.eclipse.jem.ui/debug/logtrace" value="default"/> <mapEntry key="org.eclipse.ui/trace/operations" value="false"/> -<mapEntry key="org.eclipse.jem.beaninfo/debug/logtrace" value="default"/> <mapEntry key="org.eclipse.ecf.provider.jms/debug/channel" value="true"/> <mapEntry key="org.eclipse.help/debug/protocols" value="false"/> <mapEntry key="org.eclipse.ui/listeners/IWorkbenchPage.IPartListener2" value="false"/> @@ -463,7 +458,6 @@ <mapEntry key="org.eclipse.ecf/debug/twophasecommiteventprocessor" value="true"/> <mapEntry key="org.eclipse.core.resources/perf/snapshot" value="1000"/> <mapEntry key="org.eclipse.gmf.runtime.gef.ui/debug/dnd/tracing" value="false"/> -<mapEntry key="org.eclipse.team.ftp/debug" value="false"/> <mapEntry key="org.eclipse.ui/trace/handlers" value="false"/> <mapEntry key="org.eclipse.ui/perf/perspective.listeners" value="200"/> <mapEntry key="org.eclipse.emf.ocl/debug/methods/entering" value="false"/> @@ -484,6 +478,7 @@ <mapEntry key="org.eclipse.gmf.runtime.common.ui/debug/actions/run" 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.ecf/debug/exceptions/catching" value="true"/> <mapEntry key="org.eclipse.gmf.runtime.common.ui.services.action/debug" value="true"/> <mapEntry key="org.eclipse.gmf.runtime.emf.clipboard.core/debug" value="true"/> <mapEntry key="org.eclipse.ui/trace/contexts.performance" value="false"/> @@ -493,15 +488,14 @@ <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.jem.ui/debug/loglevel" value="default"/> <mapEntry key="org.eclipse.core.runtime/perf/success" value="false"/> <mapEntry key="org.eclipse.gmf.runtime.common.ui.services.dnd/debug/dnd/tracing" value="false"/> <mapEntry key="org.eclipse.ecf.provider.datashare/debug/basechannel" value="true"/> <mapEntry key="org.eclipse.gmf.runtime.gef.ui/debug/exceptions/catching" value="false"/> -<mapEntry key="org.eclipse.jem.beaninfo/debug/loglevel" value="default"/> <mapEntry key="org.eclipse.gmf.runtime.diagram.core/debug/methods/entering" 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.core.resources/monitor/builders" value="true"/> <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"/> @@ -514,12 +508,12 @@ <mapEntry key="org.eclipse.core.resources/perf/save.participants" value="500"/> <mapEntry key="org.eclipse.gmf.runtime.common.ui.services.action/debug/methods/entering" value="false"/> </mapAttribute> -<stringAttribute key="selectedPlugin" value="org.eclipse.ecf.provider.xmpp"/> +<stringAttribute key="selectedPlugin" value="org.eclipse.ecf"/> <booleanAttribute key="automaticAdd" value="false"/> -<stringAttribute key="checked" value="org.eclipse.ecf,org.eclipse.ecf.provider,org.eclipse.ecf.provider.xmpp"/> +<stringAttribute key="checked" value="org.eclipse.ecf,org.eclipse.ecf.identity"/> <booleanAttribute key="includeFragments" value="false"/> <stringAttribute key="location" value="C:\eclipse3.1m4\eclipse\runtime-workspace"/> -<stringAttribute key="selected_workspace_plugins" value="org.eclipse.ecf.test.harness,org.eclipse.ecf.example.sdo.gefeditor,org.eclipse.ecf.provider,org.eclipse.ecf.example.rcpchat,org.eclipse.ecf.provider.datashare,org.eclipse.ecf.provider.yahoo,org.eclipse.ecf.test.jms,org.eclipse.ecf.test.discovery,org.eclipse.ecf.example.provider,org.eclipse.ecf.test.remoteservice,org.eclipse.ecf.test.provider,org.eclipse.ecf.call,org.eclipse.ecf.tutorial,org.eclipse.ecf.presence,org.eclipse.sudoku.application,org.eclipse.bittorrent.example,org.eclipse.ecf.example.clients,org.eclipse.ecf.test.fileshare,org.eclipse.ecf.provider.jxta.example,org.eclipse.ecf.sdo,org.eclipse.ecf.example.library,org.eclipse.sudoku.factory.generator,net.jxta,org.eclipse.ecf.example.collab,org.eclipse.bittorrent,org.eclipse.sudoku.ecf,org.eclipse.ecf.discovery,org.eclipse.ecf.test,org.eclipse.ecf.provider.fileshare,org.jdom,org.eclipse.ecf.remoteservice,org.eclipse.ecf.example.hello,org.eclipse.sudoku.ui,org.eclipse.ecf.example.sdo.editor,org.mortbay.jetty,org.eclipse.ecf.example.sharededitor.cola,javax.servlet,org.eclipse.ecf.provider.aim,org.eclipse.sudoku.solver.backtracking,org.eclipse.ecf.provider.bittorrent,org.eclipse.sudoku.core,org.eclipse.ecf.provider.remoteservice,org.eclipse.ecf.example.sharecode,org.eclipse.ecf.provider.jms,org.eclipse.ecf.datashare,org.apache.log4j,org.jivesoftware.smack,org.eclipse.ecf,org.eclipse.ecf.server,org.apache.commons,org.eclipse.ecf.provider.jmdns,org.eclipse.ecf.fileshare,org.eclipse.sudoku.factory.samples,org.eclipse.ecf.test.datashare,org.eclipse.ecf.ui,org.eclipse.ecf.provider.jxta,org.eclipse.ecf.provider.xmpp,org.eclipse.ecf.test.ui,JXTAPeerView,org.eclipse.ecf.doc,org.eclipse.ecf.provider.irc,org.eclipse.ecf.example.pubsub,org.eclipse.bittorrent.test"/> +<stringAttribute key="selected_workspace_plugins" value="org.eclipse.ecf.test.harness,org.eclipse.ecf.example.collab.editor,org.eclipse.ecf.example.sdo.gefeditor,org.eclipse.ecf.provider,org.eclipse.ecf.example.rcpchat,org.eclipse.ecf.provider.yahoo,org.eclipse.ecf.provider.datashare,org.eclipse.ecf.test.jms,org.eclipse.ecf.test.discovery,org.eclipse.ecf.example.provider,org.eclipse.ecf.test.remoteservice,org.eclipse.ecf.test.provider,org.eclipse.ecf.call,org.eclipse.ecf.tutorial,org.eclipse.sudoku.application,org.eclipse.ecf.presence,org.eclipse.bittorrent.example,org.eclipse.ecf.example.clients,org.eclipse.ecf.provider.jxta.example,org.eclipse.ecf.test.fileshare,org.eclipse.ecf.sdo,org.eclipse.ecf.example.library,org.eclipse.sudoku.factory.generator,net.jxta,org.eclipse.ecf.example.collab,org.eclipse.bittorrent,org.eclipse.ecf.discovery,org.eclipse.sudoku.ecf,org.eclipse.ecf.test,org.eclipse.ecf.provider.fileshare,org.jdom,org.eclipse.ecf.remoteservice,org.eclipse.ecf.example.hello,org.eclipse.sudoku.ui,org.eclipse.ecf.example.sdo.editor,org.mortbay.jetty,org.eclipse.ecf.example.sharededitor.cola,javax.servlet,org.eclipse.ecf.provider.aim,org.eclipse.sudoku.solver.backtracking,org.eclipse.sudoku.core,org.eclipse.ecf.provider.bittorrent,org.eclipse.ecf.provider.remoteservice,org.eclipse.ecf.example.sharecode,org.eclipse.ecf.datashare,org.eclipse.ecf.provider.jms,org.jivesoftware.smack,org.apache.log4j,org.eclipse.ecf,org.eclipse.ecf.server,org.apache.commons,org.eclipse.ecf.provider.jmdns,org.eclipse.ecf.test.datashare,org.eclipse.sudoku.factory.samples,org.eclipse.ecf.provider.jxta,org.eclipse.ecf.ui,org.eclipse.ecf.provider.xmpp,org.eclipse.ecf.test.ui,JXTAPeerView,org.eclipse.ecf.identity,org.eclipse.ecf.doc,org.eclipse.ecf.filetransfer,org.eclipse.ecf.provider.irc,org.eclipse.ecf.example.pubsub,org.eclipse.bittorrent.test"/> <stringAttribute key="configLocation" value=""/> <booleanAttribute key="clearws" value="false"/> <stringAttribute key="location1" value="C:\eclipse3.1m4\eclipse\runtime-workspace"/> diff --git a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/CollabClient.java b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/CollabClient.java index bc707b1f7..ca95c6682 100644 --- a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/CollabClient.java +++ b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/CollabClient.java @@ -21,11 +21,11 @@ import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.ecf.core.ContainerConnectException; import org.eclipse.ecf.core.ContainerFactory; import org.eclipse.ecf.core.IContainer; -import org.eclipse.ecf.core.ISharedObjectContainer; import org.eclipse.ecf.core.identity.ID; import org.eclipse.ecf.core.identity.IDFactory; import org.eclipse.ecf.core.identity.Namespace; import org.eclipse.ecf.core.security.ConnectContextFactory; +import org.eclipse.ecf.core.sharedobject.ISharedObjectContainer; import org.eclipse.ecf.example.collab.share.EclipseCollabSharedObject; import org.eclipse.ecf.presence.IPresenceContainerAdapter; import org.eclipse.ecf.presence.chat.IChatRoomManager; 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 68dcbee37..9647b6cd5 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 @@ -18,7 +18,7 @@ import org.eclipse.core.resources.IResource; import org.eclipse.ecf.core.ContainerFactory; import org.eclipse.ecf.core.ContainerCreateException; import org.eclipse.ecf.core.IContainer; -import org.eclipse.ecf.core.ISharedObjectContainer; +import org.eclipse.ecf.core.sharedobject.ISharedObjectContainer; import org.eclipse.ecf.discovery.IDiscoveryContainerAdapter; import org.eclipse.ecf.discovery.IServiceInfo; import org.eclipse.ecf.discovery.IServiceProperties; diff --git a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/PresenceContainerUI.java b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/PresenceContainerUI.java index f28492877..cef5439d3 100644 --- a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/PresenceContainerUI.java +++ b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/PresenceContainerUI.java @@ -13,8 +13,8 @@ package org.eclipse.ecf.example.collab; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.ecf.core.IContainer; -import org.eclipse.ecf.core.ISharedObjectContainer; import org.eclipse.ecf.core.identity.ID; +import org.eclipse.ecf.core.sharedobject.ISharedObjectContainer; import org.eclipse.ecf.presence.IAccountManager; import org.eclipse.ecf.presence.IMessageListener; import org.eclipse.ecf.presence.IMessageSender; diff --git a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ServerStartup.java b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ServerStartup.java index 2e28cea3a..4c9c98df4 100644 --- a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ServerStartup.java +++ b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ServerStartup.java @@ -15,10 +15,10 @@ import java.net.URISyntaxException; import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import org.eclipse.ecf.core.ISharedObjectContainer; import org.eclipse.ecf.core.identity.ID; import org.eclipse.ecf.core.identity.IDFactory; import org.eclipse.ecf.core.identity.IDCreateException; +import org.eclipse.ecf.core.sharedobject.ISharedObjectContainer; import org.eclipse.ecf.provider.app.Connector; import org.eclipse.ecf.provider.app.NamedGroup; import org.eclipse.ecf.provider.app.ServerConfigParser; diff --git a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/SharedObjectContainerUI.java b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/SharedObjectContainerUI.java index fa8a75c49..12c91d024 100644 --- a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/SharedObjectContainerUI.java +++ b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/SharedObjectContainerUI.java @@ -16,13 +16,13 @@ import java.util.HashMap; import java.util.Vector; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.Platform; -import org.eclipse.ecf.core.ISharedObjectContainer; import org.eclipse.ecf.core.IContainerListener; import org.eclipse.ecf.core.events.IContainerEjectedEvent; import org.eclipse.ecf.core.events.IContainerEvent; import org.eclipse.ecf.core.events.IContainerDisconnectedEvent; import org.eclipse.ecf.core.identity.ID; import org.eclipse.ecf.core.identity.IDFactory; +import org.eclipse.ecf.core.sharedobject.ISharedObjectContainer; import org.eclipse.ecf.example.collab.share.EclipseCollabSharedObject; import org.eclipse.ecf.example.collab.share.SharedObjectEventListener; import org.eclipse.ecf.example.collab.share.TreeItem; diff --git a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/EclipseCollabSharedObject.java b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/EclipseCollabSharedObject.java index 9aa202dc6..810b720d4 100644 --- a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/EclipseCollabSharedObject.java +++ b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/EclipseCollabSharedObject.java @@ -26,11 +26,11 @@ import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.Platform; import org.eclipse.ecf.core.ContainerConnectException; -import org.eclipse.ecf.core.ISharedObjectContext; -import org.eclipse.ecf.core.ReplicaSharedObjectDescription; import org.eclipse.ecf.core.identity.ID; import org.eclipse.ecf.core.identity.IDFactory; import org.eclipse.ecf.core.security.IConnectContext; +import org.eclipse.ecf.core.sharedobject.ISharedObjectContext; +import org.eclipse.ecf.core.sharedobject.ReplicaSharedObjectDescription; import org.eclipse.ecf.example.collab.ClientPlugin; import org.eclipse.ecf.example.collab.share.io.EclipseFileTransfer; import org.eclipse.ecf.example.collab.share.io.FileTransferParams; diff --git a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/EclipseMessage.java b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/EclipseMessage.java index 6ae1540f9..57c0b831f 100644 --- a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/EclipseMessage.java +++ b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/EclipseMessage.java @@ -12,10 +12,10 @@ package org.eclipse.ecf.example.collab.share; import java.util.HashMap; import java.util.Map; -import org.eclipse.ecf.core.ISharedObjectConfig; -import org.eclipse.ecf.core.ReplicaSharedObjectDescription; -import org.eclipse.ecf.core.SharedObjectInitException; import org.eclipse.ecf.core.identity.ID; +import org.eclipse.ecf.core.sharedobject.ISharedObjectConfig; +import org.eclipse.ecf.core.sharedobject.ReplicaSharedObjectDescription; +import org.eclipse.ecf.core.sharedobject.SharedObjectInitException; import org.eclipse.ecf.example.collab.Trace; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.swt.widgets.Display; diff --git a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/EclipseProject.java b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/EclipseProject.java index a29d1527b..343f41866 100644 --- a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/EclipseProject.java +++ b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/EclipseProject.java @@ -12,8 +12,8 @@ package org.eclipse.ecf.example.collab.share; import org.eclipse.core.resources.IResource; -import org.eclipse.ecf.core.ISharedObjectContext; import org.eclipse.ecf.core.identity.ID; +import org.eclipse.ecf.core.sharedobject.ISharedObjectContext; import org.eclipse.swt.widgets.Control; import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.part.ViewPart; diff --git a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/GenericSharedObject.java b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/GenericSharedObject.java index 997d47a04..ea81e0864 100644 --- a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/GenericSharedObject.java +++ b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/GenericSharedObject.java @@ -16,22 +16,22 @@ import java.io.Serializable; import java.util.Arrays; import java.util.Hashtable; import java.util.Random; -import org.eclipse.ecf.core.ISharedObject; -import org.eclipse.ecf.core.ISharedObjectConfig; -import org.eclipse.ecf.core.ISharedObjectContainerTransaction; -import org.eclipse.ecf.core.ISharedObjectContext; -import org.eclipse.ecf.core.ISharedObjectManager; -import org.eclipse.ecf.core.ReplicaSharedObjectDescription; -import org.eclipse.ecf.core.SharedObjectInitException; import org.eclipse.ecf.core.events.IContainerConnectedEvent; import org.eclipse.ecf.core.events.IContainerDisconnectedEvent; -import org.eclipse.ecf.core.events.ISharedObjectActivatedEvent; -import org.eclipse.ecf.core.events.ISharedObjectCreateResponseEvent; -import org.eclipse.ecf.core.events.ISharedObjectDeactivatedEvent; -import org.eclipse.ecf.core.events.ISharedObjectMessageEvent; -import org.eclipse.ecf.core.events.RemoteSharedObjectEvent; import org.eclipse.ecf.core.identity.ID; import org.eclipse.ecf.core.identity.IDFactory; +import org.eclipse.ecf.core.sharedobject.ISharedObject; +import org.eclipse.ecf.core.sharedobject.ISharedObjectConfig; +import org.eclipse.ecf.core.sharedobject.ISharedObjectContainerTransaction; +import org.eclipse.ecf.core.sharedobject.ISharedObjectContext; +import org.eclipse.ecf.core.sharedobject.ISharedObjectManager; +import org.eclipse.ecf.core.sharedobject.ReplicaSharedObjectDescription; +import org.eclipse.ecf.core.sharedobject.SharedObjectInitException; +import org.eclipse.ecf.core.sharedobject.events.ISharedObjectActivatedEvent; +import org.eclipse.ecf.core.sharedobject.events.ISharedObjectCreateResponseEvent; +import org.eclipse.ecf.core.sharedobject.events.ISharedObjectDeactivatedEvent; +import org.eclipse.ecf.core.sharedobject.events.ISharedObjectMessageEvent; +import org.eclipse.ecf.core.sharedobject.events.RemoteSharedObjectEvent; import org.eclipse.ecf.core.util.Event; import org.eclipse.ecf.core.util.IQueueEnqueue; import org.eclipse.ecf.core.util.QueueException; diff --git a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/RemoteSharedObjectMsgEvent.java b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/RemoteSharedObjectMsgEvent.java index 888a0e53b..40fcc3bfd 100644 --- a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/RemoteSharedObjectMsgEvent.java +++ b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/RemoteSharedObjectMsgEvent.java @@ -11,8 +11,8 @@ package org.eclipse.ecf.example.collab.share; -import org.eclipse.ecf.core.events.RemoteSharedObjectEvent; import org.eclipse.ecf.core.identity.ID; +import org.eclipse.ecf.core.sharedobject.events.RemoteSharedObjectEvent; public class RemoteSharedObjectMsgEvent extends RemoteSharedObjectEvent { private static final long serialVersionUID = -7198080945310388254L; diff --git a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/TransactionSharedObject.java b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/TransactionSharedObject.java index 6f2c57a97..801423b13 100644 --- a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/TransactionSharedObject.java +++ b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/TransactionSharedObject.java @@ -14,9 +14,9 @@ package org.eclipse.ecf.example.collab.share; import java.util.Hashtable; import java.util.Vector; -import org.eclipse.ecf.core.ISharedObjectContainerTransaction; -import org.eclipse.ecf.core.SharedObjectAddAbortException; import org.eclipse.ecf.core.identity.ID; +import org.eclipse.ecf.core.sharedobject.ISharedObjectContainerTransaction; +import org.eclipse.ecf.core.sharedobject.SharedObjectAddAbortException; import org.eclipse.ecf.example.collab.Trace; public class TransactionSharedObject extends GenericSharedObject implements ISharedObjectContainerTransaction { diff --git a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/io/EclipseFileTransfer.java b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/io/EclipseFileTransfer.java index acca2fc03..76a685998 100644 --- a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/io/EclipseFileTransfer.java +++ b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/io/EclipseFileTransfer.java @@ -15,12 +15,12 @@ import java.io.File; import java.io.InputStream; import java.util.HashMap; import java.util.Map; -import org.eclipse.ecf.core.ISharedObjectConfig; -import org.eclipse.ecf.core.ISharedObjectContainerTransaction; -import org.eclipse.ecf.core.ReplicaSharedObjectDescription; -import org.eclipse.ecf.core.SharedObjectAddAbortException; -import org.eclipse.ecf.core.SharedObjectInitException; import org.eclipse.ecf.core.identity.ID; +import org.eclipse.ecf.core.sharedobject.ISharedObjectConfig; +import org.eclipse.ecf.core.sharedobject.ISharedObjectContainerTransaction; +import org.eclipse.ecf.core.sharedobject.ReplicaSharedObjectDescription; +import org.eclipse.ecf.core.sharedobject.SharedObjectAddAbortException; +import org.eclipse.ecf.core.sharedobject.SharedObjectInitException; import org.eclipse.ecf.example.collab.ClientPlugin; import org.eclipse.ecf.example.collab.share.EclipseCollabSharedObject; import org.eclipse.ecf.example.collab.ui.FileReceiverUI; diff --git a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/io/FileTransferSharedObject.java b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/io/FileTransferSharedObject.java index ed1417e46..bbec2c959 100644 --- a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/io/FileTransferSharedObject.java +++ b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/io/FileTransferSharedObject.java @@ -20,10 +20,10 @@ import java.io.OutputStream; import java.util.Date; import java.util.HashMap; import java.util.Map; -import org.eclipse.ecf.core.ISharedObjectConfig; -import org.eclipse.ecf.core.ReplicaSharedObjectDescription; -import org.eclipse.ecf.core.SharedObjectInitException; import org.eclipse.ecf.core.identity.ID; +import org.eclipse.ecf.core.sharedobject.ISharedObjectConfig; +import org.eclipse.ecf.core.sharedobject.ReplicaSharedObjectDescription; +import org.eclipse.ecf.core.sharedobject.SharedObjectInitException; import org.eclipse.ecf.example.collab.Trace; import org.eclipse.ecf.example.collab.share.SharedObjectMsg; import org.eclipse.ecf.example.collab.share.TransactionSharedObject; diff --git a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/url/ExecProg.java b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/url/ExecProg.java index c03571524..1edf2644e 100644 --- a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/url/ExecProg.java +++ b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/url/ExecProg.java @@ -14,10 +14,10 @@ package org.eclipse.ecf.example.collab.share.url; import java.io.IOException; import java.util.HashMap; import java.util.Map; -import org.eclipse.ecf.core.ISharedObjectConfig; -import org.eclipse.ecf.core.ReplicaSharedObjectDescription; -import org.eclipse.ecf.core.SharedObjectInitException; import org.eclipse.ecf.core.identity.ID; +import org.eclipse.ecf.core.sharedobject.ISharedObjectConfig; +import org.eclipse.ecf.core.sharedobject.ReplicaSharedObjectDescription; +import org.eclipse.ecf.core.sharedobject.SharedObjectInitException; import org.eclipse.ecf.example.collab.Trace; import org.eclipse.ecf.example.collab.share.GenericSharedObject; diff --git a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/url/ExecURL.java b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/url/ExecURL.java index 89e575591..7fe2efdaf 100644 --- a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/url/ExecURL.java +++ b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/url/ExecURL.java @@ -15,10 +15,10 @@ import java.io.IOException; import java.net.URL; import java.util.HashMap; import java.util.Map; -import org.eclipse.ecf.core.ISharedObjectConfig; -import org.eclipse.ecf.core.ReplicaSharedObjectDescription; -import org.eclipse.ecf.core.SharedObjectInitException; import org.eclipse.ecf.core.identity.ID; +import org.eclipse.ecf.core.sharedobject.ISharedObjectConfig; +import org.eclipse.ecf.core.sharedobject.ReplicaSharedObjectDescription; +import org.eclipse.ecf.core.sharedobject.SharedObjectInitException; import org.eclipse.ecf.example.collab.Trace; import org.eclipse.ecf.example.collab.share.GenericSharedObject; diff --git a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ui/CollabRosterView.java b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ui/CollabRosterView.java index e2c0b1e5f..94804a3c9 100644 --- a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ui/CollabRosterView.java +++ b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ui/CollabRosterView.java @@ -16,10 +16,10 @@ import java.util.Iterator; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; -import org.eclipse.ecf.core.ISharedObject; -import org.eclipse.ecf.core.ISharedObjectContainer; import org.eclipse.ecf.core.identity.ID; import org.eclipse.ecf.core.identity.IDFactory; +import org.eclipse.ecf.core.sharedobject.ISharedObject; +import org.eclipse.ecf.core.sharedobject.ISharedObjectContainer; import org.eclipse.ecf.example.collab.ClientPlugin; import org.eclipse.ecf.example.collab.share.RosterSharedObject; import org.eclipse.ecf.ui.views.RosterView; diff --git a/examples/bundles/org.eclipse.ecf.example.pubsub/plugin.xml b/examples/bundles/org.eclipse.ecf.example.pubsub/plugin.xml index 6bf3c82b8..f6f9f05b6 100644 --- a/examples/bundles/org.eclipse.ecf.example.pubsub/plugin.xml +++ b/examples/bundles/org.eclipse.ecf.example.pubsub/plugin.xml @@ -5,7 +5,7 @@ <extension point="org.eclipse.core.runtime.adapters"> <factory - adaptableType="org.eclipse.ecf.core.ISharedObjectContainer" + adaptableType="org.eclipse.ecf.core.sharedobject.ISharedObjectContainer" class="org.eclipse.ecf.pubsub.impl.PubSubAdapterFactory"> <adapter type="org.eclipse.ecf.pubsub.IPublishedServiceDirectory"/> <adapter type="org.eclipse.ecf.pubsub.IPublishedServiceRequestor"/> diff --git a/examples/bundles/org.eclipse.ecf.example.pubsub/src/org/eclipse/ecf/example/pubsub/PubSubView.java b/examples/bundles/org.eclipse.ecf.example.pubsub/src/org/eclipse/ecf/example/pubsub/PubSubView.java index f88bf9b9c..233c1baf2 100644 --- a/examples/bundles/org.eclipse.ecf.example.pubsub/src/org/eclipse/ecf/example/pubsub/PubSubView.java +++ b/examples/bundles/org.eclipse.ecf.example.pubsub/src/org/eclipse/ecf/example/pubsub/PubSubView.java @@ -14,10 +14,10 @@ import java.io.IOException; import java.util.Vector; import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.ecf.core.ISharedObjectContainer; -import org.eclipse.ecf.core.SharedObjectCreateException; import org.eclipse.ecf.core.identity.IDFactory; import org.eclipse.ecf.core.identity.IDCreateException; +import org.eclipse.ecf.core.sharedobject.ISharedObjectContainer; +import org.eclipse.ecf.core.sharedobject.SharedObjectCreateException; import org.eclipse.ecf.example.collab.CollabClient; import org.eclipse.ecf.pubsub.IPublishedServiceDirectory; import org.eclipse.ecf.pubsub.IPublishedServiceDirectoryListener; diff --git a/examples/bundles/org.eclipse.ecf.example.pubsub/src/org/eclipse/ecf/pubsub/impl/DiscoveryAgent.java b/examples/bundles/org.eclipse.ecf.example.pubsub/src/org/eclipse/ecf/pubsub/impl/DiscoveryAgent.java index b9a48c9d9..94ff90a32 100644 --- a/examples/bundles/org.eclipse.ecf.example.pubsub/src/org/eclipse/ecf/pubsub/impl/DiscoveryAgent.java +++ b/examples/bundles/org.eclipse.ecf.example.pubsub/src/org/eclipse/ecf/pubsub/impl/DiscoveryAgent.java @@ -15,18 +15,18 @@ import java.util.ArrayList; import java.util.Map; import org.eclipse.core.runtime.PlatformObject; -import org.eclipse.ecf.core.ISharedObject; -import org.eclipse.ecf.core.ISharedObjectConfig; -import org.eclipse.ecf.core.ISharedObjectContext; -import org.eclipse.ecf.core.ISharedObjectManager; -import org.eclipse.ecf.core.ReplicaSharedObjectDescription; -import org.eclipse.ecf.core.SharedObjectInitException; import org.eclipse.ecf.core.events.IContainerConnectedEvent; import org.eclipse.ecf.core.events.IContainerDisconnectedEvent; -import org.eclipse.ecf.core.events.ISharedObjectActivatedEvent; -import org.eclipse.ecf.core.events.ISharedObjectDeactivatedEvent; -import org.eclipse.ecf.core.events.ISharedObjectMessageEvent; import org.eclipse.ecf.core.identity.ID; +import org.eclipse.ecf.core.sharedobject.ISharedObject; +import org.eclipse.ecf.core.sharedobject.ISharedObjectConfig; +import org.eclipse.ecf.core.sharedobject.ISharedObjectContext; +import org.eclipse.ecf.core.sharedobject.ISharedObjectManager; +import org.eclipse.ecf.core.sharedobject.ReplicaSharedObjectDescription; +import org.eclipse.ecf.core.sharedobject.SharedObjectInitException; +import org.eclipse.ecf.core.sharedobject.events.ISharedObjectActivatedEvent; +import org.eclipse.ecf.core.sharedobject.events.ISharedObjectDeactivatedEvent; +import org.eclipse.ecf.core.sharedobject.events.ISharedObjectMessageEvent; import org.eclipse.ecf.core.util.Event; import org.eclipse.ecf.example.pubsub.SerializationUtil; import org.eclipse.ecf.pubsub.IPublishedService; diff --git a/examples/bundles/org.eclipse.ecf.example.pubsub/src/org/eclipse/ecf/pubsub/impl/PubSubAdapterFactory.java b/examples/bundles/org.eclipse.ecf.example.pubsub/src/org/eclipse/ecf/pubsub/impl/PubSubAdapterFactory.java index a47228edd..dc0827278 100644 --- a/examples/bundles/org.eclipse.ecf.example.pubsub/src/org/eclipse/ecf/pubsub/impl/PubSubAdapterFactory.java +++ b/examples/bundles/org.eclipse.ecf.example.pubsub/src/org/eclipse/ecf/pubsub/impl/PubSubAdapterFactory.java @@ -11,13 +11,13 @@ package org.eclipse.ecf.pubsub.impl; import org.eclipse.core.runtime.IAdapterFactory; -import org.eclipse.ecf.core.ISharedObjectContainer; -import org.eclipse.ecf.core.ISharedObjectManager; -import org.eclipse.ecf.core.SharedObjectCreateException; -import org.eclipse.ecf.core.SharedObjectDescription; import org.eclipse.ecf.core.identity.ID; import org.eclipse.ecf.core.identity.IDFactory; import org.eclipse.ecf.core.identity.IDCreateException; +import org.eclipse.ecf.core.sharedobject.ISharedObjectContainer; +import org.eclipse.ecf.core.sharedobject.ISharedObjectManager; +import org.eclipse.ecf.core.sharedobject.SharedObjectCreateException; +import org.eclipse.ecf.core.sharedobject.SharedObjectDescription; import org.eclipse.ecf.pubsub.IPublishedServiceDirectory; import org.eclipse.ecf.pubsub.IPublishedServiceRequestor; diff --git a/examples/bundles/org.eclipse.ecf.example.pubsub/src/org/eclipse/ecf/pubsub/impl/PublishedServiceDirectory.java b/examples/bundles/org.eclipse.ecf.example.pubsub/src/org/eclipse/ecf/pubsub/impl/PublishedServiceDirectory.java index 7838a46e9..006fb53cc 100644 --- a/examples/bundles/org.eclipse.ecf.example.pubsub/src/org/eclipse/ecf/pubsub/impl/PublishedServiceDirectory.java +++ b/examples/bundles/org.eclipse.ecf.example.pubsub/src/org/eclipse/ecf/pubsub/impl/PublishedServiceDirectory.java @@ -20,16 +20,16 @@ import org.eclipse.core.runtime.ISafeRunnable; import org.eclipse.core.runtime.ListenerList; import org.eclipse.core.runtime.PlatformObject; import org.eclipse.core.runtime.SafeRunner; -import org.eclipse.ecf.core.ISharedObject; -import org.eclipse.ecf.core.ISharedObjectConfig; -import org.eclipse.ecf.core.ISharedObjectManager; -import org.eclipse.ecf.core.SharedObjectDescription; -import org.eclipse.ecf.core.SharedObjectInitException; import org.eclipse.ecf.core.events.IContainerDisconnectedEvent; -import org.eclipse.ecf.core.events.ISharedObjectActivatedEvent; -import org.eclipse.ecf.core.events.ISharedObjectDeactivatedEvent; import org.eclipse.ecf.core.identity.ID; import org.eclipse.ecf.core.identity.IDFactory; +import org.eclipse.ecf.core.sharedobject.ISharedObject; +import org.eclipse.ecf.core.sharedobject.ISharedObjectConfig; +import org.eclipse.ecf.core.sharedobject.ISharedObjectManager; +import org.eclipse.ecf.core.sharedobject.SharedObjectDescription; +import org.eclipse.ecf.core.sharedobject.SharedObjectInitException; +import org.eclipse.ecf.core.sharedobject.events.ISharedObjectActivatedEvent; +import org.eclipse.ecf.core.sharedobject.events.ISharedObjectDeactivatedEvent; import org.eclipse.ecf.core.util.ECFException; import org.eclipse.ecf.core.util.Event; import org.eclipse.ecf.pubsub.IPublishedServiceDirectory; diff --git a/examples/bundles/org.eclipse.ecf.example.pubsub/src/org/eclipse/ecf/pubsub/impl/ServiceRequestor.java b/examples/bundles/org.eclipse.ecf.example.pubsub/src/org/eclipse/ecf/pubsub/impl/ServiceRequestor.java index 3716da60e..7d310d692 100644 --- a/examples/bundles/org.eclipse.ecf.example.pubsub/src/org/eclipse/ecf/pubsub/impl/ServiceRequestor.java +++ b/examples/bundles/org.eclipse.ecf.example.pubsub/src/org/eclipse/ecf/pubsub/impl/ServiceRequestor.java @@ -13,12 +13,12 @@ package org.eclipse.ecf.pubsub.impl; import java.util.HashMap; import java.util.Map; -import org.eclipse.ecf.core.ISharedObjectManager; -import org.eclipse.ecf.core.SharedObjectCreateException; -import org.eclipse.ecf.core.SharedObjectDescription; import org.eclipse.ecf.core.identity.ID; import org.eclipse.ecf.core.identity.IDFactory; import org.eclipse.ecf.core.identity.IDCreateException; +import org.eclipse.ecf.core.sharedobject.ISharedObjectManager; +import org.eclipse.ecf.core.sharedobject.SharedObjectCreateException; +import org.eclipse.ecf.core.sharedobject.SharedObjectDescription; import org.eclipse.ecf.pubsub.IPublishedServiceRequestor; import org.eclipse.ecf.pubsub.ISubscriptionCallback; diff --git a/examples/bundles/org.eclipse.ecf.example.pubsub/src/org/eclipse/ecf/pubsub/impl/SubscriptionAgent.java b/examples/bundles/org.eclipse.ecf.example.pubsub/src/org/eclipse/ecf/pubsub/impl/SubscriptionAgent.java index 384d3e830..3c453a681 100644 --- a/examples/bundles/org.eclipse.ecf.example.pubsub/src/org/eclipse/ecf/pubsub/impl/SubscriptionAgent.java +++ b/examples/bundles/org.eclipse.ecf.example.pubsub/src/org/eclipse/ecf/pubsub/impl/SubscriptionAgent.java @@ -15,16 +15,16 @@ import java.util.HashMap; import java.util.Map; import org.eclipse.core.runtime.PlatformObject; -import org.eclipse.ecf.core.ISharedObject; -import org.eclipse.ecf.core.ISharedObjectConfig; -import org.eclipse.ecf.core.ISharedObjectContext; -import org.eclipse.ecf.core.ISharedObjectManager; -import org.eclipse.ecf.core.ReplicaSharedObjectDescription; -import org.eclipse.ecf.core.SharedObjectInitException; -import org.eclipse.ecf.core.events.ISharedObjectActivatedEvent; -import org.eclipse.ecf.core.events.ISharedObjectCreateResponseEvent; -import org.eclipse.ecf.core.events.ISharedObjectDeactivatedEvent; import org.eclipse.ecf.core.identity.ID; +import org.eclipse.ecf.core.sharedobject.ISharedObject; +import org.eclipse.ecf.core.sharedobject.ISharedObjectConfig; +import org.eclipse.ecf.core.sharedobject.ISharedObjectContext; +import org.eclipse.ecf.core.sharedobject.ISharedObjectManager; +import org.eclipse.ecf.core.sharedobject.ReplicaSharedObjectDescription; +import org.eclipse.ecf.core.sharedobject.SharedObjectInitException; +import org.eclipse.ecf.core.sharedobject.events.ISharedObjectActivatedEvent; +import org.eclipse.ecf.core.sharedobject.events.ISharedObjectCreateResponseEvent; +import org.eclipse.ecf.core.sharedobject.events.ISharedObjectDeactivatedEvent; import org.eclipse.ecf.core.util.Event; import org.eclipse.ecf.pubsub.IPublishedService; import org.eclipse.ecf.pubsub.ISubscribedService; diff --git a/examples/bundles/org.eclipse.ecf.example.pubsub/src/org/eclipse/ecf/pubsub/model/SharedModelFactory.java b/examples/bundles/org.eclipse.ecf.example.pubsub/src/org/eclipse/ecf/pubsub/model/SharedModelFactory.java index 4f3c3a528..5a50392ff 100644 --- a/examples/bundles/org.eclipse.ecf.example.pubsub/src/org/eclipse/ecf/pubsub/model/SharedModelFactory.java +++ b/examples/bundles/org.eclipse.ecf.example.pubsub/src/org/eclipse/ecf/pubsub/model/SharedModelFactory.java @@ -13,15 +13,15 @@ package org.eclipse.ecf.pubsub.model; import java.util.HashMap; import org.eclipse.ecf.core.IContainerListener; -import org.eclipse.ecf.core.ISharedObjectContainer; -import org.eclipse.ecf.core.ISharedObjectManager; -import org.eclipse.ecf.core.ReplicaSharedObjectDescription; -import org.eclipse.ecf.core.SharedObjectAddException; -import org.eclipse.ecf.core.SharedObjectCreateException; -import org.eclipse.ecf.core.SharedObjectDescription; import org.eclipse.ecf.core.events.IContainerEvent; -import org.eclipse.ecf.core.events.ISharedObjectActivatedEvent; import org.eclipse.ecf.core.identity.ID; +import org.eclipse.ecf.core.sharedobject.ISharedObjectContainer; +import org.eclipse.ecf.core.sharedobject.ISharedObjectManager; +import org.eclipse.ecf.core.sharedobject.ReplicaSharedObjectDescription; +import org.eclipse.ecf.core.sharedobject.SharedObjectAddException; +import org.eclipse.ecf.core.sharedobject.SharedObjectCreateException; +import org.eclipse.ecf.core.sharedobject.SharedObjectDescription; +import org.eclipse.ecf.core.sharedobject.events.ISharedObjectActivatedEvent; import org.eclipse.ecf.pubsub.model.impl.AgentBase; import org.eclipse.ecf.pubsub.model.impl.LocalAgent; diff --git a/examples/bundles/org.eclipse.ecf.example.pubsub/src/org/eclipse/ecf/pubsub/model/impl/AgentBase.java b/examples/bundles/org.eclipse.ecf.example.pubsub/src/org/eclipse/ecf/pubsub/model/impl/AgentBase.java index 34c0a8957..020049b8b 100644 --- a/examples/bundles/org.eclipse.ecf.example.pubsub/src/org/eclipse/ecf/pubsub/model/impl/AgentBase.java +++ b/examples/bundles/org.eclipse.ecf.example.pubsub/src/org/eclipse/ecf/pubsub/model/impl/AgentBase.java @@ -14,15 +14,15 @@ import java.util.Map; import org.eclipse.core.runtime.PlatformObject; import org.eclipse.ecf.core.IIdentifiable; -import org.eclipse.ecf.core.ISharedObject; -import org.eclipse.ecf.core.ISharedObjectConfig; -import org.eclipse.ecf.core.SharedObjectInitException; import org.eclipse.ecf.core.events.IContainerConnectedEvent; import org.eclipse.ecf.core.events.IContainerDisconnectedEvent; -import org.eclipse.ecf.core.events.ISharedObjectActivatedEvent; -import org.eclipse.ecf.core.events.ISharedObjectDeactivatedEvent; -import org.eclipse.ecf.core.events.ISharedObjectMessageEvent; import org.eclipse.ecf.core.identity.ID; +import org.eclipse.ecf.core.sharedobject.ISharedObject; +import org.eclipse.ecf.core.sharedobject.ISharedObjectConfig; +import org.eclipse.ecf.core.sharedobject.SharedObjectInitException; +import org.eclipse.ecf.core.sharedobject.events.ISharedObjectActivatedEvent; +import org.eclipse.ecf.core.sharedobject.events.ISharedObjectDeactivatedEvent; +import org.eclipse.ecf.core.sharedobject.events.ISharedObjectMessageEvent; import org.eclipse.ecf.core.util.Event; import org.eclipse.ecf.pubsub.model.IModelUpdater; diff --git a/examples/bundles/org.eclipse.ecf.example.pubsub/src/org/eclipse/ecf/pubsub/model/impl/LocalAgent.java b/examples/bundles/org.eclipse.ecf.example.pubsub/src/org/eclipse/ecf/pubsub/model/impl/LocalAgent.java index 7e187c4c1..93d9bedac 100644 --- a/examples/bundles/org.eclipse.ecf.example.pubsub/src/org/eclipse/ecf/pubsub/model/impl/LocalAgent.java +++ b/examples/bundles/org.eclipse.ecf.example.pubsub/src/org/eclipse/ecf/pubsub/model/impl/LocalAgent.java @@ -17,10 +17,10 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Map; -import org.eclipse.ecf.core.ISharedObjectContext; -import org.eclipse.ecf.core.ReplicaSharedObjectDescription; -import org.eclipse.ecf.core.SharedObjectInitException; import org.eclipse.ecf.core.identity.ID; +import org.eclipse.ecf.core.sharedobject.ISharedObjectContext; +import org.eclipse.ecf.core.sharedobject.ReplicaSharedObjectDescription; +import org.eclipse.ecf.core.sharedobject.SharedObjectInitException; import org.eclipse.ecf.example.pubsub.SerializationUtil; import org.eclipse.ecf.pubsub.IPublishedService; import org.eclipse.ecf.pubsub.impl.SubscribeMessage; diff --git a/examples/bundles/org.eclipse.ecf.example.pubsub/src/org/eclipse/ecf/pubsub/model/impl/RemoteAgent.java b/examples/bundles/org.eclipse.ecf.example.pubsub/src/org/eclipse/ecf/pubsub/model/impl/RemoteAgent.java index 16b99b924..fea912be6 100644 --- a/examples/bundles/org.eclipse.ecf.example.pubsub/src/org/eclipse/ecf/pubsub/model/impl/RemoteAgent.java +++ b/examples/bundles/org.eclipse.ecf.example.pubsub/src/org/eclipse/ecf/pubsub/model/impl/RemoteAgent.java @@ -18,10 +18,10 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.core.runtime.IExtensionRegistry; import org.eclipse.core.runtime.Platform; -import org.eclipse.ecf.core.ISharedObjectConfig; -import org.eclipse.ecf.core.ISharedObjectContext; -import org.eclipse.ecf.core.SharedObjectInitException; import org.eclipse.ecf.core.identity.ID; +import org.eclipse.ecf.core.sharedobject.ISharedObjectConfig; +import org.eclipse.ecf.core.sharedobject.ISharedObjectContext; +import org.eclipse.ecf.core.sharedobject.SharedObjectInitException; import org.eclipse.ecf.example.pubsub.SerializationUtil; import org.eclipse.ecf.pubsub.ISubscribedService; import org.eclipse.ecf.pubsub.ISubscriber; diff --git a/examples/bundles/org.eclipse.ecf.example.sdo.editor/src/org/eclipse/ecf/example/sdo/editor/EditorPlugin.java b/examples/bundles/org.eclipse.ecf.example.sdo.editor/src/org/eclipse/ecf/example/sdo/editor/EditorPlugin.java index 85f0e9dc8..2bfee1b39 100644 --- a/examples/bundles/org.eclipse.ecf.example.sdo.editor/src/org/eclipse/ecf/example/sdo/editor/EditorPlugin.java +++ b/examples/bundles/org.eclipse.ecf.example.sdo.editor/src/org/eclipse/ecf/example/sdo/editor/EditorPlugin.java @@ -17,9 +17,9 @@ import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.Status; -import org.eclipse.ecf.core.ISharedObjectContainer; import org.eclipse.ecf.core.identity.ID; import org.eclipse.ecf.core.identity.IDFactory; +import org.eclipse.ecf.core.sharedobject.ISharedObjectContainer; import org.eclipse.ecf.core.util.ECFException; import org.eclipse.ecf.example.collab.CollabClient; import org.eclipse.ecf.sdo.DataGraphSharingFactory; diff --git a/examples/bundles/org.eclipse.ecf.example.sdo.editor/src/org/eclipse/ecf/example/sdo/editor/PublishedGraphTracker.java b/examples/bundles/org.eclipse.ecf.example.sdo.editor/src/org/eclipse/ecf/example/sdo/editor/PublishedGraphTracker.java index 8c3e33f31..2569510d9 100644 --- a/examples/bundles/org.eclipse.ecf.example.sdo.editor/src/org/eclipse/ecf/example/sdo/editor/PublishedGraphTracker.java +++ b/examples/bundles/org.eclipse.ecf.example.sdo.editor/src/org/eclipse/ecf/example/sdo/editor/PublishedGraphTracker.java @@ -16,18 +16,18 @@ import java.util.HashSet; import java.util.Hashtable; import java.util.Iterator; import java.util.Map; -import org.eclipse.ecf.core.ISharedObject; -import org.eclipse.ecf.core.ISharedObjectConfig; -import org.eclipse.ecf.core.ISharedObjectContext; -import org.eclipse.ecf.core.ReplicaSharedObjectDescription; -import org.eclipse.ecf.core.SharedObjectInitException; import org.eclipse.ecf.core.events.IContainerConnectedEvent; import org.eclipse.ecf.core.events.IContainerDisconnectedEvent; -import org.eclipse.ecf.core.events.ISharedObjectActivatedEvent; -import org.eclipse.ecf.core.events.ISharedObjectCreateResponseEvent; -import org.eclipse.ecf.core.events.ISharedObjectDeactivatedEvent; -import org.eclipse.ecf.core.events.ISharedObjectMessageEvent; import org.eclipse.ecf.core.identity.ID; +import org.eclipse.ecf.core.sharedobject.ISharedObject; +import org.eclipse.ecf.core.sharedobject.ISharedObjectConfig; +import org.eclipse.ecf.core.sharedobject.ISharedObjectContext; +import org.eclipse.ecf.core.sharedobject.ReplicaSharedObjectDescription; +import org.eclipse.ecf.core.sharedobject.SharedObjectInitException; +import org.eclipse.ecf.core.sharedobject.events.ISharedObjectActivatedEvent; +import org.eclipse.ecf.core.sharedobject.events.ISharedObjectCreateResponseEvent; +import org.eclipse.ecf.core.sharedobject.events.ISharedObjectDeactivatedEvent; +import org.eclipse.ecf.core.sharedobject.events.ISharedObjectMessageEvent; import org.eclipse.ecf.core.util.ECFException; import org.eclipse.ecf.core.util.Event; diff --git a/examples/bundles/org.eclipse.ecf.sdo/src/org/eclipse/ecf/internal/sdo/DataGraphSharing.java b/examples/bundles/org.eclipse.ecf.sdo/src/org/eclipse/ecf/internal/sdo/DataGraphSharing.java index f16097d87..0794f8a57 100644 --- a/examples/bundles/org.eclipse.ecf.sdo/src/org/eclipse/ecf/internal/sdo/DataGraphSharing.java +++ b/examples/bundles/org.eclipse.ecf.sdo/src/org/eclipse/ecf/internal/sdo/DataGraphSharing.java @@ -10,12 +10,12 @@ *******************************************************************************/ package org.eclipse.ecf.internal.sdo; -import org.eclipse.ecf.core.ISharedObject; -import org.eclipse.ecf.core.ISharedObjectConfig; -import org.eclipse.ecf.core.ISharedObjectContext; -import org.eclipse.ecf.core.ISharedObjectManager; -import org.eclipse.ecf.core.SharedObjectInitException; import org.eclipse.ecf.core.identity.ID; +import org.eclipse.ecf.core.sharedobject.ISharedObject; +import org.eclipse.ecf.core.sharedobject.ISharedObjectConfig; +import org.eclipse.ecf.core.sharedobject.ISharedObjectContext; +import org.eclipse.ecf.core.sharedobject.ISharedObjectManager; +import org.eclipse.ecf.core.sharedobject.SharedObjectInitException; import org.eclipse.ecf.core.util.ECFException; import org.eclipse.ecf.core.util.Event; import org.eclipse.ecf.sdo.IDataGraphSharing; diff --git a/examples/bundles/org.eclipse.ecf.sdo/src/org/eclipse/ecf/internal/sdo/DataGraphSharingManager.java b/examples/bundles/org.eclipse.ecf.sdo/src/org/eclipse/ecf/internal/sdo/DataGraphSharingManager.java index 73634f125..72d36b475 100644 --- a/examples/bundles/org.eclipse.ecf.sdo/src/org/eclipse/ecf/internal/sdo/DataGraphSharingManager.java +++ b/examples/bundles/org.eclipse.ecf.sdo/src/org/eclipse/ecf/internal/sdo/DataGraphSharingManager.java @@ -10,10 +10,10 @@ *******************************************************************************/ package org.eclipse.ecf.internal.sdo; -import org.eclipse.ecf.core.ISharedObjectContainer; -import org.eclipse.ecf.core.ISharedObjectManager; import org.eclipse.ecf.core.identity.ID; import org.eclipse.ecf.core.identity.IDFactory; +import org.eclipse.ecf.core.sharedobject.ISharedObjectContainer; +import org.eclipse.ecf.core.sharedobject.ISharedObjectManager; import org.eclipse.ecf.core.util.ECFException; import org.eclipse.ecf.sdo.IDataGraphSharing; import org.eclipse.ecf.sdo.IDataGraphSharingManager; diff --git a/examples/bundles/org.eclipse.ecf.sdo/src/org/eclipse/ecf/internal/sdo/SharedDataGraph.java b/examples/bundles/org.eclipse.ecf.sdo/src/org/eclipse/ecf/internal/sdo/SharedDataGraph.java index f3e11f729..2a40a33de 100644 --- a/examples/bundles/org.eclipse.ecf.sdo/src/org/eclipse/ecf/internal/sdo/SharedDataGraph.java +++ b/examples/bundles/org.eclipse.ecf.sdo/src/org/eclipse/ecf/internal/sdo/SharedDataGraph.java @@ -12,14 +12,14 @@ package org.eclipse.ecf.internal.sdo; import java.io.IOException; -import org.eclipse.ecf.core.ISharedObject; -import org.eclipse.ecf.core.ISharedObjectConfig; -import org.eclipse.ecf.core.ISharedObjectContext; -import org.eclipse.ecf.core.SharedObjectInitException; -import org.eclipse.ecf.core.events.ISharedObjectActivatedEvent; -import org.eclipse.ecf.core.events.ISharedObjectDeactivatedEvent; -import org.eclipse.ecf.core.events.ISharedObjectMessageEvent; import org.eclipse.ecf.core.identity.ID; +import org.eclipse.ecf.core.sharedobject.ISharedObject; +import org.eclipse.ecf.core.sharedobject.ISharedObjectConfig; +import org.eclipse.ecf.core.sharedobject.ISharedObjectContext; +import org.eclipse.ecf.core.sharedobject.SharedObjectInitException; +import org.eclipse.ecf.core.sharedobject.events.ISharedObjectActivatedEvent; +import org.eclipse.ecf.core.sharedobject.events.ISharedObjectDeactivatedEvent; +import org.eclipse.ecf.core.sharedobject.events.ISharedObjectMessageEvent; import org.eclipse.ecf.core.util.ECFException; import org.eclipse.ecf.core.util.Event; import org.eclipse.ecf.sdo.IPublicationCallback; diff --git a/examples/bundles/org.eclipse.ecf.sdo/src/org/eclipse/ecf/sdo/DataGraphSharingFactory.java b/examples/bundles/org.eclipse.ecf.sdo/src/org/eclipse/ecf/sdo/DataGraphSharingFactory.java index 2f04edcaa..cede20d8b 100644 --- a/examples/bundles/org.eclipse.ecf.sdo/src/org/eclipse/ecf/sdo/DataGraphSharingFactory.java +++ b/examples/bundles/org.eclipse.ecf.sdo/src/org/eclipse/ecf/sdo/DataGraphSharingFactory.java @@ -12,7 +12,7 @@ package org.eclipse.ecf.sdo; import java.util.Hashtable; -import org.eclipse.ecf.core.ISharedObjectContainer; +import org.eclipse.ecf.core.sharedobject.ISharedObjectContainer; import org.eclipse.ecf.core.util.ECFException; /** diff --git a/examples/bundles/org.eclipse.ecf.sdo/src/org/eclipse/ecf/sdo/IDataGraphSharingManager.java b/examples/bundles/org.eclipse.ecf.sdo/src/org/eclipse/ecf/sdo/IDataGraphSharingManager.java index d25add664..9a1aae05f 100644 --- a/examples/bundles/org.eclipse.ecf.sdo/src/org/eclipse/ecf/sdo/IDataGraphSharingManager.java +++ b/examples/bundles/org.eclipse.ecf.sdo/src/org/eclipse/ecf/sdo/IDataGraphSharingManager.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.ecf.sdo; -import org.eclipse.ecf.core.ISharedObjectContainer; +import org.eclipse.ecf.core.sharedobject.ISharedObjectContainer; import org.eclipse.ecf.core.util.ECFException; /** diff --git a/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/BasicChannelConfig.java b/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/BasicChannelConfig.java index 62e549ecc..d7772ff6d 100644 --- a/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/BasicChannelConfig.java +++ b/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/BasicChannelConfig.java @@ -8,8 +8,8 @@ ******************************************************************************/ package org.eclipse.ecf.datashare; -import org.eclipse.ecf.core.ISharedObjectTransactionConfig; -import org.eclipse.ecf.core.SharedObjectDescription; +import org.eclipse.ecf.core.sharedobject.ISharedObjectTransactionConfig; +import org.eclipse.ecf.core.sharedobject.SharedObjectDescription; /** * Channel configuration diff --git a/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/IChannelConfig.java b/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/IChannelConfig.java index c37863c37..f1cec6d21 100644 --- a/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/IChannelConfig.java +++ b/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/IChannelConfig.java @@ -9,8 +9,8 @@ package org.eclipse.ecf.datashare; import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.ecf.core.ISharedObjectTransactionConfig; -import org.eclipse.ecf.core.SharedObjectDescription; +import org.eclipse.ecf.core.sharedobject.ISharedObjectTransactionConfig; +import org.eclipse.ecf.core.sharedobject.SharedObjectDescription; /** * Channel configuration to be used during createChannel to diff --git a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/ISharedObjectMessageListener.java b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/ISharedObjectMessageListener.java index df3987e37..e2528fab5 100644 --- a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/ISharedObjectMessageListener.java +++ b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/ISharedObjectMessageListener.java @@ -10,7 +10,7 @@ *****************************************************************************/ package org.eclipse.ecf.presence; -import org.eclipse.ecf.core.events.ISharedObjectMessageEvent; +import org.eclipse.ecf.core.sharedobject.events.ISharedObjectMessageEvent; /** * Listener for receiving shared object messages 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 4ea2530d9..b4906b5e2 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 @@ -12,13 +12,13 @@ import java.util.HashMap; import java.util.Random; import org.eclipse.ecf.core.ContainerTypeDescription; import org.eclipse.ecf.core.ContainerFactory; -import org.eclipse.ecf.core.ISharedObject; -import org.eclipse.ecf.core.ISharedObjectContainer; -import org.eclipse.ecf.core.SharedObjectContainerFactory; import org.eclipse.ecf.core.comm.ConnectionTypeDescription; import org.eclipse.ecf.core.comm.ConnectionFactory; import org.eclipse.ecf.core.identity.ID; import org.eclipse.ecf.core.identity.IDFactory; +import org.eclipse.ecf.core.sharedobject.ISharedObject; +import org.eclipse.ecf.core.sharedobject.ISharedObjectContainer; +import org.eclipse.ecf.core.sharedobject.SharedObjectContainerFactory; import org.eclipse.ecf.provider.generic.ContainerInstantiator; import org.eclipse.ecf.provider.generic.TCPServerSOContainer; diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/app/ServerApplication.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/app/ServerApplication.java index e81c49d5b..2c66f9846 100644 --- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/app/ServerApplication.java +++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/app/ServerApplication.java @@ -13,14 +13,14 @@ import java.security.PermissionCollection; import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import org.eclipse.ecf.core.ISharedObjectContainerGroupManager; -import org.eclipse.ecf.core.ISharedObjectManager; -import org.eclipse.ecf.core.ReplicaSharedObjectDescription; import org.eclipse.ecf.core.identity.ID; import org.eclipse.ecf.core.identity.IDFactory; import org.eclipse.ecf.core.identity.IDCreateException; import org.eclipse.ecf.core.security.IConnectPolicy; import org.eclipse.ecf.core.security.ISharedObjectPolicy; +import org.eclipse.ecf.core.sharedobject.ISharedObjectContainerGroupManager; +import org.eclipse.ecf.core.sharedobject.ISharedObjectManager; +import org.eclipse.ecf.core.sharedobject.ReplicaSharedObjectDescription; import org.eclipse.ecf.provider.generic.SOContainerConfig; import org.eclipse.ecf.provider.generic.TCPServerSOContainer; import org.eclipse.ecf.provider.generic.TCPServerSOContainerGroup; 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 50eba0927..d741c50cc 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 @@ -14,8 +14,6 @@ import java.io.Serializable; import java.net.ConnectException; import org.eclipse.ecf.core.ContainerConnectException; -import org.eclipse.ecf.core.ISharedObjectContainerConfig; -import org.eclipse.ecf.core.SharedObjectDescription; import org.eclipse.ecf.core.comm.AsynchConnectionEvent; import org.eclipse.ecf.core.comm.ConnectionInstantiationException; import org.eclipse.ecf.core.comm.DisconnectConnectionEvent; @@ -32,6 +30,8 @@ import org.eclipse.ecf.core.identity.ID; import org.eclipse.ecf.core.security.Callback; import org.eclipse.ecf.core.security.CallbackHandler; import org.eclipse.ecf.core.security.IConnectContext; +import org.eclipse.ecf.core.sharedobject.ISharedObjectContainerConfig; +import org.eclipse.ecf.core.sharedobject.SharedObjectDescription; import org.eclipse.ecf.provider.generic.gmm.Member; public abstract class ClientSOContainer extends SOContainer { diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOConfig.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOConfig.java index e6faeb006..373b647c9 100644 --- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOConfig.java +++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOConfig.java @@ -17,9 +17,9 @@ package org.eclipse.ecf.provider.generic; import java.util.HashMap; import java.util.Map; -import org.eclipse.ecf.core.ISharedObjectConfig; -import org.eclipse.ecf.core.ISharedObjectContext; import org.eclipse.ecf.core.identity.ID; +import org.eclipse.ecf.core.sharedobject.ISharedObjectConfig; +import org.eclipse.ecf.core.sharedobject.ISharedObjectContext; import org.eclipse.ecf.core.util.IQueueEnqueue; public class SOConfig implements ISharedObjectConfig { diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOConnector.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOConnector.java index 5c575547d..7229602a3 100644 --- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOConnector.java +++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOConnector.java @@ -17,10 +17,10 @@ package org.eclipse.ecf.provider.generic; import java.util.Enumeration; import java.util.Hashtable; -import org.eclipse.ecf.core.ISharedObjectConnector; -import org.eclipse.ecf.core.events.ISharedObjectEvent; -import org.eclipse.ecf.core.events.SharedObjectCallEvent; import org.eclipse.ecf.core.identity.ID; +import org.eclipse.ecf.core.sharedobject.ISharedObjectConnector; +import org.eclipse.ecf.core.sharedobject.events.ISharedObjectEvent; +import org.eclipse.ecf.core.sharedobject.events.SharedObjectCallEvent; import org.eclipse.ecf.core.util.AsynchResult; import org.eclipse.ecf.core.util.IQueueEnqueue; import org.eclipse.ecf.core.util.QueueException; 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 03d1b8765..8ade14b75 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 @@ -28,16 +28,6 @@ import org.eclipse.core.runtime.Platform; import org.eclipse.ecf.core.ContainerConnectException; import org.eclipse.ecf.core.IContainerListener; import org.eclipse.ecf.core.IOSGIService; -import org.eclipse.ecf.core.ISharedObject; -import org.eclipse.ecf.core.ISharedObjectConfig; -import org.eclipse.ecf.core.ISharedObjectContainer; -import org.eclipse.ecf.core.ISharedObjectContainerConfig; -import org.eclipse.ecf.core.ISharedObjectContainerTransaction; -import org.eclipse.ecf.core.ISharedObjectManager; -import org.eclipse.ecf.core.ReplicaSharedObjectDescription; -import org.eclipse.ecf.core.SharedObjectAddException; -import org.eclipse.ecf.core.SharedObjectDescription; -import org.eclipse.ecf.core.SharedObjectInitException; import org.eclipse.ecf.core.comm.AsynchConnectionEvent; import org.eclipse.ecf.core.comm.ConnectionEvent; import org.eclipse.ecf.core.comm.DisconnectConnectionEvent; @@ -48,13 +38,23 @@ import org.eclipse.ecf.core.comm.SynchConnectionEvent; import org.eclipse.ecf.core.events.ContainerDisconnectedEvent; import org.eclipse.ecf.core.events.ContainerDisposeEvent; import org.eclipse.ecf.core.events.IContainerEvent; -import org.eclipse.ecf.core.events.SharedObjectActivatedEvent; -import org.eclipse.ecf.core.events.SharedObjectDeactivatedEvent; import org.eclipse.ecf.core.identity.ID; import org.eclipse.ecf.core.identity.IDFactory; import org.eclipse.ecf.core.identity.Namespace; import org.eclipse.ecf.core.security.IConnectContext; import org.eclipse.ecf.core.security.ISharedObjectPolicy; +import org.eclipse.ecf.core.sharedobject.ISharedObject; +import org.eclipse.ecf.core.sharedobject.ISharedObjectConfig; +import org.eclipse.ecf.core.sharedobject.ISharedObjectContainer; +import org.eclipse.ecf.core.sharedobject.ISharedObjectContainerConfig; +import org.eclipse.ecf.core.sharedobject.ISharedObjectContainerTransaction; +import org.eclipse.ecf.core.sharedobject.ISharedObjectManager; +import org.eclipse.ecf.core.sharedobject.ReplicaSharedObjectDescription; +import org.eclipse.ecf.core.sharedobject.SharedObjectAddException; +import org.eclipse.ecf.core.sharedobject.SharedObjectDescription; +import org.eclipse.ecf.core.sharedobject.SharedObjectInitException; +import org.eclipse.ecf.core.sharedobject.events.SharedObjectActivatedEvent; +import org.eclipse.ecf.core.sharedobject.events.SharedObjectDeactivatedEvent; import org.eclipse.ecf.core.util.Event; import org.eclipse.ecf.core.util.IClassLoaderMapper; import org.eclipse.ecf.core.util.IQueueEnqueue; diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOContainerConfig.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOContainerConfig.java index bfecd6885..36914705d 100644 --- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOContainerConfig.java +++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOContainerConfig.java @@ -13,8 +13,8 @@ package org.eclipse.ecf.provider.generic; import java.util.HashMap; import java.util.Map; -import org.eclipse.ecf.core.ISharedObjectContainerConfig; import org.eclipse.ecf.core.identity.ID; +import org.eclipse.ecf.core.sharedobject.ISharedObjectContainerConfig; public class SOContainerConfig implements ISharedObjectContainerConfig { ID id; diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOContext.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOContext.java index 07784cb9b..da4a6debd 100644 --- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOContext.java +++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOContext.java @@ -20,12 +20,12 @@ import java.util.HashMap; import java.util.Map; import org.eclipse.ecf.core.ContainerConnectException; import org.eclipse.ecf.core.IOSGIService; -import org.eclipse.ecf.core.ISharedObjectContext; -import org.eclipse.ecf.core.ISharedObjectManager; -import org.eclipse.ecf.core.ReplicaSharedObjectDescription; import org.eclipse.ecf.core.identity.ID; import org.eclipse.ecf.core.identity.Namespace; import org.eclipse.ecf.core.security.IConnectContext; +import org.eclipse.ecf.core.sharedobject.ISharedObjectContext; +import org.eclipse.ecf.core.sharedobject.ISharedObjectManager; +import org.eclipse.ecf.core.sharedobject.ReplicaSharedObjectDescription; import org.eclipse.ecf.core.util.IQueueEnqueue; import org.eclipse.ecf.provider.Trace; diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOManager.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOManager.java index fce383583..f9cf886fb 100644 --- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOManager.java +++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOManager.java @@ -23,25 +23,25 @@ import java.util.Enumeration; import java.util.List; import java.util.Map; import java.util.Vector; -import org.eclipse.ecf.core.ISharedObject; -import org.eclipse.ecf.core.ISharedObjectConnector; -import org.eclipse.ecf.core.ISharedObjectManager; -import org.eclipse.ecf.core.SharedObjectAddException; -import org.eclipse.ecf.core.SharedObjectConnectException; -import org.eclipse.ecf.core.SharedObjectCreateException; -import org.eclipse.ecf.core.SharedObjectDescription; -import org.eclipse.ecf.core.SharedObjectDisconnectException; -import org.eclipse.ecf.core.SharedObjectFactory; -import org.eclipse.ecf.core.SharedObjectTypeDescription; -import org.eclipse.ecf.core.events.SharedObjectManagerAddEvent; -import org.eclipse.ecf.core.events.SharedObjectManagerConnectEvent; -import org.eclipse.ecf.core.events.SharedObjectManagerCreateEvent; -import org.eclipse.ecf.core.events.SharedObjectManagerDisconnectEvent; -import org.eclipse.ecf.core.events.SharedObjectManagerRemoveEvent; import org.eclipse.ecf.core.identity.ID; import org.eclipse.ecf.core.identity.IDFactory; import org.eclipse.ecf.core.identity.IDCreateException; import org.eclipse.ecf.core.security.ISharedObjectPolicy; +import org.eclipse.ecf.core.sharedobject.ISharedObject; +import org.eclipse.ecf.core.sharedobject.ISharedObjectConnector; +import org.eclipse.ecf.core.sharedobject.ISharedObjectManager; +import org.eclipse.ecf.core.sharedobject.SharedObjectAddException; +import org.eclipse.ecf.core.sharedobject.SharedObjectConnectException; +import org.eclipse.ecf.core.sharedobject.SharedObjectCreateException; +import org.eclipse.ecf.core.sharedobject.SharedObjectDescription; +import org.eclipse.ecf.core.sharedobject.SharedObjectDisconnectException; +import org.eclipse.ecf.core.sharedobject.SharedObjectFactory; +import org.eclipse.ecf.core.sharedobject.SharedObjectTypeDescription; +import org.eclipse.ecf.core.sharedobject.events.SharedObjectManagerAddEvent; +import org.eclipse.ecf.core.sharedobject.events.SharedObjectManagerConnectEvent; +import org.eclipse.ecf.core.sharedobject.events.SharedObjectManagerCreateEvent; +import org.eclipse.ecf.core.sharedobject.events.SharedObjectManagerDisconnectEvent; +import org.eclipse.ecf.core.sharedobject.events.SharedObjectManagerRemoveEvent; import org.eclipse.ecf.core.util.AbstractFactory; import org.eclipse.ecf.core.util.IQueueEnqueue; import org.eclipse.ecf.provider.Trace; diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOWrapper.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOWrapper.java index f4250dad9..42f3269e7 100644 --- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOWrapper.java +++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOWrapper.java @@ -15,15 +15,15 @@ import java.io.Serializable; import java.security.AccessController; import java.security.PrivilegedAction; -import org.eclipse.ecf.core.ISharedObject; -import org.eclipse.ecf.core.SharedObjectInitException; -import org.eclipse.ecf.core.events.RemoteSharedObjectCreateResponseEvent; -import org.eclipse.ecf.core.events.RemoteSharedObjectEvent; -import org.eclipse.ecf.core.events.SharedObjectActivatedEvent; import org.eclipse.ecf.core.events.ContainerDisconnectedEvent; import org.eclipse.ecf.core.events.ContainerConnectedEvent; -import org.eclipse.ecf.core.events.SharedObjectDeactivatedEvent; import org.eclipse.ecf.core.identity.ID; +import org.eclipse.ecf.core.sharedobject.ISharedObject; +import org.eclipse.ecf.core.sharedobject.SharedObjectInitException; +import org.eclipse.ecf.core.sharedobject.events.RemoteSharedObjectCreateResponseEvent; +import org.eclipse.ecf.core.sharedobject.events.RemoteSharedObjectEvent; +import org.eclipse.ecf.core.sharedobject.events.SharedObjectActivatedEvent; +import org.eclipse.ecf.core.sharedobject.events.SharedObjectDeactivatedEvent; import org.eclipse.ecf.core.util.Event; import org.eclipse.ecf.core.util.SimpleQueueImpl; import org.eclipse.ecf.provider.Trace; 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 b83e0d05b..47c199cb8 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 @@ -18,8 +18,6 @@ import java.net.ConnectException; import java.net.Socket; import java.net.SocketAddress; import org.eclipse.ecf.core.ContainerConnectException; -import org.eclipse.ecf.core.ISharedObjectContainerConfig; -import org.eclipse.ecf.core.ISharedObjectContainerGroupManager; import org.eclipse.ecf.core.comm.IAsynchConnection; import org.eclipse.ecf.core.comm.ISynchAsynchConnection; import org.eclipse.ecf.core.comm.ISynchConnection; @@ -29,6 +27,8 @@ import org.eclipse.ecf.core.events.ContainerEjectedEvent; import org.eclipse.ecf.core.identity.ID; import org.eclipse.ecf.core.security.IConnectContext; import org.eclipse.ecf.core.security.IConnectPolicy; +import org.eclipse.ecf.core.sharedobject.ISharedObjectContainerConfig; +import org.eclipse.ecf.core.sharedobject.ISharedObjectContainerGroupManager; import org.eclipse.ecf.provider.generic.gmm.Member; public class ServerSOContainer extends SOContainer implements ISharedObjectContainerGroupManager { diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/TCPClientSOContainer.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/TCPClientSOContainer.java index 9a66b9929..9b7b8a38c 100644 --- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/TCPClientSOContainer.java +++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/TCPClientSOContainer.java @@ -11,12 +11,12 @@ package org.eclipse.ecf.provider.generic; -import org.eclipse.ecf.core.ISharedObjectContainerConfig; import org.eclipse.ecf.core.comm.ConnectionFactory; import org.eclipse.ecf.core.comm.ConnectionInstantiationException; import org.eclipse.ecf.core.comm.ISynchAsynchConnection; import org.eclipse.ecf.core.identity.ID; import org.eclipse.ecf.core.identity.IDFactory; +import org.eclipse.ecf.core.sharedobject.ISharedObjectContainerConfig; public class TCPClientSOContainer extends ClientSOContainer { int keepAlive = 0; diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/TCPServerSOContainer.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/TCPServerSOContainer.java index 965836356..1dc127e3b 100644 --- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/TCPServerSOContainer.java +++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/TCPServerSOContainer.java @@ -17,9 +17,9 @@ import java.net.Socket; import java.net.URI; import java.net.URISyntaxException; -import org.eclipse.ecf.core.ISharedObjectContainerConfig; import org.eclipse.ecf.core.comm.ConnectionRequestHandler; import org.eclipse.ecf.core.comm.ISynchAsynchConnection; +import org.eclipse.ecf.core.sharedobject.ISharedObjectContainerConfig; public class TCPServerSOContainer extends ServerSOContainer implements ConnectionRequestHandler { diff --git a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/views/RosterView.java b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/views/RosterView.java index c2ec65f0d..69871101b 100644 --- a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/views/RosterView.java +++ b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/views/RosterView.java @@ -26,8 +26,6 @@ import org.eclipse.core.runtime.IAdaptable; import org.eclipse.core.runtime.Path; import org.eclipse.ecf.core.ContainerConnectException; import org.eclipse.ecf.core.ContainerCreateException; -import org.eclipse.ecf.core.ISharedObject; -import org.eclipse.ecf.core.ISharedObjectContainer; import org.eclipse.ecf.core.identity.ID; import org.eclipse.ecf.core.identity.IDFactory; import org.eclipse.ecf.core.security.Callback; @@ -35,6 +33,8 @@ import org.eclipse.ecf.core.security.CallbackHandler; import org.eclipse.ecf.core.security.IConnectContext; import org.eclipse.ecf.core.security.NameCallback; import org.eclipse.ecf.core.security.UnsupportedCallbackException; +import org.eclipse.ecf.core.sharedobject.ISharedObject; +import org.eclipse.ecf.core.sharedobject.ISharedObjectContainer; import org.eclipse.ecf.core.user.IUser; import org.eclipse.ecf.core.user.User; import org.eclipse.ecf.core.util.ECFException; diff --git a/framework/bundles/org.eclipse.ecf/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf/META-INF/MANIFEST.MF index 77300766e..5348ebd27 100644 --- a/framework/bundles/org.eclipse.ecf/META-INF/MANIFEST.MF +++ b/framework/bundles/org.eclipse.ecf/META-INF/MANIFEST.MF @@ -20,6 +20,8 @@ Export-Package: org.eclipse.ecf.core, org.eclipse.ecf.core.provider, org.eclipse.ecf.core.security, org.eclipse.ecf.core.sharedobject, + org.eclipse.ecf.core.sharedobject.events, + org.eclipse.ecf.core.sharedobject.provider, org.eclipse.ecf.core.start, org.eclipse.ecf.core.user, org.eclipse.ecf.core.util 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 9531b5800..0eaa9db8d 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 @@ -17,9 +17,10 @@ import java.util.WeakHashMap; import org.eclipse.core.runtime.Status; import org.eclipse.ecf.core.provider.IContainerInstantiator; import org.eclipse.ecf.core.util.AbstractFactory; +import org.eclipse.ecf.core.util.Trace; +import org.eclipse.ecf.internal.core.ECFDebugOptions; import org.eclipse.ecf.internal.core.ECFPlugin; import org.eclipse.ecf.internal.core.IDisposable; -import org.eclipse.ecf.internal.core.Trace; /** * Factory for creating {@link IContainer} instances. This class provides ECF @@ -41,7 +42,6 @@ import org.eclipse.ecf.internal.core.Trace; */ public class ContainerFactory implements IContainerFactory { private static final int DISPOSE_ERROR_CODE = 100; - private static Trace debug = Trace.create("containerfactory"); private static Hashtable containerdescriptions = new Hashtable(); protected static IContainerFactory instance = null; @@ -67,15 +67,11 @@ public class ContainerFactory implements IContainerFactory { } private static void trace(String msg) { - if (Trace.ON && debug != null) { - debug.msg(msg); - } + Trace.trace(ECFPlugin.getDefault(),msg); } private static void dumpStack(String msg, Throwable e) { - if (Trace.ON && debug != null) { - debug.dumpStack(e, msg); - } + Trace.catching(ECFPlugin.getDefault(), ECFDebugOptions.EXCEPTIONS_CATCHING, ContainerFactory.class, "dumpStack", e); } protected void addContainer(IContainer container) { containers.put(container,null); @@ -181,8 +177,8 @@ public class ContainerFactory implements IContainerFactory { String[] argTypes, Object[] args) throws ContainerCreateException { trace("createContainer(" + desc + "," - + Trace.convertStringAToString(argTypes) + "," - + Trace.convertObjectAToString(args) + ")"); + + Trace.getArgumentsString(argTypes) + "," + + Trace.getArgumentsString(args) + ")"); if (desc == null) throw new ContainerCreateException( "ContainerTypeDescription cannot be null"); diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/IContainerListener.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/IContainerListener.java index 4b2bc1f4c..5a1a47ce1 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/IContainerListener.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/IContainerListener.java @@ -9,6 +9,7 @@ package org.eclipse.ecf.core; import org.eclipse.ecf.core.events.IContainerEvent; +import org.eclipse.ecf.core.sharedobject.ISharedObjectContainer; /** * Listener for objects that wish to receive events from an diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/comm/ConnectionFactory.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/comm/ConnectionFactory.java index 118e19e8c..663e0f9b4 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/comm/ConnectionFactory.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/comm/ConnectionFactory.java @@ -13,11 +13,12 @@ import java.util.Hashtable; import java.util.List; import org.eclipse.ecf.core.comm.provider.ISynchAsynchConnectionInstantiator; import org.eclipse.ecf.core.util.AbstractFactory; -import org.eclipse.ecf.internal.core.Trace; +import org.eclipse.ecf.core.util.Trace; +import org.eclipse.ecf.internal.core.ECFDebugOptions; +import org.eclipse.ecf.internal.core.ECFPlugin; public class ConnectionFactory { private static Hashtable connectiontypes = new Hashtable(); - private static Trace debug = Trace.create("connectionfactory"); public final static ConnectionTypeDescription addDescription( ConnectionTypeDescription scd) { @@ -43,15 +44,11 @@ public class ConnectionFactory { } private static void debug(String msg) { - if (Trace.ON && debug != null) { - debug.msg(msg); - } + Trace.trace(ECFPlugin.getDefault(),msg); } - + private static void dumpStack(String msg, Throwable e) { - if (Trace.ON && debug != null) { - debug.dumpStack(e, msg); - } + Trace.catching(ECFPlugin.getDefault(), ECFDebugOptions.EXCEPTIONS_CATCHING, ConnectionFactory.class, "dumpStack", e); } public final static ConnectionTypeDescription getDescription( @@ -98,8 +95,8 @@ public class ConnectionFactory { ConnectionTypeDescription desc, String[] argTypes, Object[] args) throws ConnectionInstantiationException { debug("createSynchAsynchConnection(" + handler + "," + desc + "," - + Trace.convertStringAToString(argTypes) + "," - + Trace.convertObjectAToString(args) + ")"); + + Trace.getArgumentsString(argTypes) + "," + + Trace.getArgumentsString(args) + ")"); if (handler == null) throw new ConnectionInstantiationException( "ISynchAsynchConnectionEventHandler cannot be null"); diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/security/ISharedObjectPolicy.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/security/ISharedObjectPolicy.java index 7f60e730c..de270d50c 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/security/ISharedObjectPolicy.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/security/ISharedObjectPolicy.java @@ -9,8 +9,8 @@ package org.eclipse.ecf.core.security; import java.security.PermissionCollection; -import org.eclipse.ecf.core.ReplicaSharedObjectDescription; import org.eclipse.ecf.core.identity.ID; +import org.eclipse.ecf.core.sharedobject.ReplicaSharedObjectDescription; public interface ISharedObjectPolicy extends IContainerPolicy { /** diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/AbstractSharedObject.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/AbstractSharedObject.java index c48301c21..1ebcde859 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/AbstractSharedObject.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/AbstractSharedObject.java @@ -18,21 +18,17 @@ import java.util.Map; import java.util.Vector; import org.eclipse.ecf.core.IIdentifiable; -import org.eclipse.ecf.core.ISharedObject; -import org.eclipse.ecf.core.ISharedObjectConfig; -import org.eclipse.ecf.core.ISharedObjectContext; -import org.eclipse.ecf.core.ISharedObjectManager; -import org.eclipse.ecf.core.ReplicaSharedObjectDescription; -import org.eclipse.ecf.core.SharedObjectInitException; -import org.eclipse.ecf.core.events.ISharedObjectCreateResponseEvent; -import org.eclipse.ecf.core.events.ISharedObjectMessageEvent; -import org.eclipse.ecf.core.events.RemoteSharedObjectEvent; import org.eclipse.ecf.core.identity.ID; +import org.eclipse.ecf.core.sharedobject.events.ISharedObjectCreateResponseEvent; +import org.eclipse.ecf.core.sharedobject.events.ISharedObjectMessageEvent; +import org.eclipse.ecf.core.sharedobject.events.RemoteSharedObjectEvent; import org.eclipse.ecf.core.util.Event; import org.eclipse.ecf.core.util.IEventProcessor; import org.eclipse.ecf.core.util.IQueueEnqueue; import org.eclipse.ecf.core.util.QueueException; -import org.eclipse.ecf.internal.core.Trace; +import org.eclipse.ecf.core.util.Trace; +import org.eclipse.ecf.internal.core.ECFDebugOptions; +import org.eclipse.ecf.internal.core.ECFPlugin; /** * Base class for shared object classes. @@ -41,8 +37,6 @@ import org.eclipse.ecf.internal.core.Trace; public class AbstractSharedObject implements ISharedObject, IIdentifiable { - private static final Trace trace = Trace.create("abstractsharedobject"); - private ISharedObjectConfig config = null; private List eventProcessors = new Vector(); @@ -180,14 +174,10 @@ public class AbstractSharedObject implements ISharedObject, getContext().sendDispose(remoteID); } private void trace(String msg) { - if (Trace.ON && trace != null) { - trace.msg(getID()+":"+msg); - } + Trace.trace(ECFPlugin.getDefault(),getID()+":"+msg); } private void traceStack(String msg, Throwable t) { - if (Trace.ON && trace != null) { - trace.dumpStack(t,getID()+":"+msg); - } + Trace.catching(ECFPlugin.getDefault(), ECFDebugOptions.EXCEPTIONS_CATCHING, AbstractSharedObject.class, "traceStack", t); } /** * Send SharedObjectMessage to container with given ID. The toID diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/AbstractSharedObjectContainerAdapterFactory.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/AbstractSharedObjectContainerAdapterFactory.java index cf7b6cfdd..dcce10a70 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/AbstractSharedObjectContainerAdapterFactory.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/AbstractSharedObjectContainerAdapterFactory.java @@ -6,7 +6,7 @@ * * Contributors: Composent, Inc. - initial API and implementation ******************************************************************************/ -package org.eclipse.ecf.core; +package org.eclipse.ecf.core.sharedobject; import java.util.Map; diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/IReplicaSharedObjectDescriptionFactory.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/IReplicaSharedObjectDescriptionFactory.java index 09d02680d..5b97c60e6 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/IReplicaSharedObjectDescriptionFactory.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/IReplicaSharedObjectDescriptionFactory.java @@ -6,7 +6,7 @@ * * Contributors: Composent, Inc. - initial API and implementation ******************************************************************************/ -package org.eclipse.ecf.core; +package org.eclipse.ecf.core.sharedobject; import org.eclipse.ecf.core.identity.ID; diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ISharedObject.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/ISharedObject.java index cef818b7f..693d2f985 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ISharedObject.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/ISharedObject.java @@ -6,7 +6,7 @@ * * Contributors: Composent, Inc. - initial API and implementation ******************************************************************************/ -package org.eclipse.ecf.core; +package org.eclipse.ecf.core.sharedobject; import org.eclipse.core.runtime.IAdaptable; import org.eclipse.ecf.core.identity.ID; diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ISharedObjectConfig.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/ISharedObjectConfig.java index bbc2e92fb..f45fe1457 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ISharedObjectConfig.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/ISharedObjectConfig.java @@ -6,7 +6,7 @@ * * Contributors: Composent, Inc. - initial API and implementation ******************************************************************************/ -package org.eclipse.ecf.core; +package org.eclipse.ecf.core.sharedobject; import java.util.Map; import org.eclipse.ecf.core.identity.ID; diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ISharedObjectConnector.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/ISharedObjectConnector.java index a27a6f6ce..c465016d7 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ISharedObjectConnector.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/ISharedObjectConnector.java @@ -6,10 +6,10 @@ * * Contributors: Composent, Inc. - initial API and implementation ******************************************************************************/ -package org.eclipse.ecf.core; +package org.eclipse.ecf.core.sharedobject; -import org.eclipse.ecf.core.events.ISharedObjectEvent; import org.eclipse.ecf.core.identity.ID; +import org.eclipse.ecf.core.sharedobject.events.ISharedObjectEvent; import org.eclipse.ecf.core.util.AsynchResult; import org.eclipse.ecf.core.util.QueueException; diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ISharedObjectContainer.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/ISharedObjectContainer.java index 3ff2bb6cd..33771f15b 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ISharedObjectContainer.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/ISharedObjectContainer.java @@ -6,7 +6,9 @@ * * Contributors: Composent, Inc. - initial API and implementation ******************************************************************************/ -package org.eclipse.ecf.core; +package org.eclipse.ecf.core.sharedobject; + +import org.eclipse.ecf.core.IReliableContainer; /** * Core interface that must be implemented by all ECF container instances. diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ISharedObjectContainerConfig.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/ISharedObjectContainerConfig.java index 385622883..3a0292de1 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ISharedObjectContainerConfig.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/ISharedObjectContainerConfig.java @@ -6,10 +6,12 @@ * * Contributors: Composent, Inc. - initial API and implementation ******************************************************************************/ -package org.eclipse.ecf.core; +package org.eclipse.ecf.core.sharedobject; import java.util.Map; +import org.eclipse.ecf.core.IIdentifiable; + /** * Configuration information associated with ISharedObjectContainer. * 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/sharedobject/ISharedObjectContainerFactory.java index 27cff4350..031c14cbf 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/sharedobject/ISharedObjectContainerFactory.java @@ -6,7 +6,10 @@ * * Contributors: Composent, Inc. - initial API and implementation ******************************************************************************/ -package org.eclipse.ecf.core; +package org.eclipse.ecf.core.sharedobject; + +import org.eclipse.ecf.core.ContainerCreateException; +import org.eclipse.ecf.core.ContainerTypeDescription; /** * Factory contract for {@link SharedObjectContainerFactory} diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ISharedObjectContainerGroupManager.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/ISharedObjectContainerGroupManager.java index e92157dc6..372d5dc47 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ISharedObjectContainerGroupManager.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/ISharedObjectContainerGroupManager.java @@ -6,7 +6,7 @@ * * Contributors: Composent, Inc. - initial API and implementation ******************************************************************************/ -package org.eclipse.ecf.core; +package org.eclipse.ecf.core.sharedobject; import java.io.Serializable; import org.eclipse.ecf.core.identity.ID; diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ISharedObjectContainerTransaction.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/ISharedObjectContainerTransaction.java index 6f14e8813..0d81fd642 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ISharedObjectContainerTransaction.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/ISharedObjectContainerTransaction.java @@ -6,7 +6,7 @@ * * Contributors: Composent, Inc. - initial API and implementation ******************************************************************************/ -package org.eclipse.ecf.core; +package org.eclipse.ecf.core.sharedobject; /** * Implementers represent a transaction associated with the creation of a diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ISharedObjectContext.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/ISharedObjectContext.java index 7ae89a8ea..9e8d6ae09 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ISharedObjectContext.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/ISharedObjectContext.java @@ -6,11 +6,14 @@ * * Contributors: Composent, Inc. - initial API and implementation ******************************************************************************/ -package org.eclipse.ecf.core; +package org.eclipse.ecf.core.sharedobject; import java.io.IOException; import java.util.Map; import org.eclipse.core.runtime.IAdaptable; +import org.eclipse.ecf.core.ContainerConnectException; +import org.eclipse.ecf.core.IContainer; +import org.eclipse.ecf.core.IOSGIService; import org.eclipse.ecf.core.identity.ID; import org.eclipse.ecf.core.identity.Namespace; import org.eclipse.ecf.core.security.IConnectContext; @@ -83,14 +86,14 @@ public interface ISharedObjectContext extends IAdaptable { /** * (non-Javadoc) * - * @see org.eclipse.ecf.core.ISharedObjectContainer#isGroupManager() + * @see org.eclipse.ecf.core.sharedobject.ISharedObjectContainer#isGroupManager() */ public boolean isGroupManager(); /** * (non-Javadoc) * - * @see org.eclipse.ecf.core.ISharedObjectContainer#getGroupMemberIDs() + * @see org.eclipse.ecf.core.sharedobject.ISharedObjectContainer#getGroupMemberIDs() */ public ID[] getGroupMemberIDs(); diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ISharedObjectFactory.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/ISharedObjectFactory.java index 748c2c4fd..6695f4a9d 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ISharedObjectFactory.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/ISharedObjectFactory.java @@ -6,7 +6,7 @@ * * Contributors: Composent, Inc. - initial API and implementation ******************************************************************************/ -package org.eclipse.ecf.core; +package org.eclipse.ecf.core.sharedobject; import java.util.List; diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ISharedObjectManager.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/ISharedObjectManager.java index e5946f0a3..b1edfaa4c 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ISharedObjectManager.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/ISharedObjectManager.java @@ -6,7 +6,7 @@ * * Contributors: Composent, Inc. - initial API and implementation ******************************************************************************/ -package org.eclipse.ecf.core; +package org.eclipse.ecf.core.sharedobject; import java.util.List; import java.util.Map; diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ISharedObjectTransactionConfig.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/ISharedObjectTransactionConfig.java index cff0278b5..85b27df03 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ISharedObjectTransactionConfig.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/ISharedObjectTransactionConfig.java @@ -8,7 +8,7 @@ * Contributors: * Composent, Inc. - initial API and implementation *****************************************************************************/ -package org.eclipse.ecf.core; +package org.eclipse.ecf.core.sharedobject; /** diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ISharedObjectTransactionParticipantsFilter.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/ISharedObjectTransactionParticipantsFilter.java index 057c420fb..e11f9ac52 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ISharedObjectTransactionParticipantsFilter.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/ISharedObjectTransactionParticipantsFilter.java @@ -8,7 +8,7 @@ * Contributors: * Composent, Inc. - initial API and implementation *****************************************************************************/ -package org.eclipse.ecf.core; +package org.eclipse.ecf.core.sharedobject; import org.eclipse.ecf.core.identity.ID; diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/OptimisticSharedObject.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/OptimisticSharedObject.java index 1f20c7460..33a8104a2 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/OptimisticSharedObject.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/OptimisticSharedObject.java @@ -10,13 +10,14 @@ *****************************************************************************/ package org.eclipse.ecf.core.sharedobject; -import org.eclipse.ecf.core.SharedObjectInitException; import org.eclipse.ecf.core.events.IContainerConnectedEvent; -import org.eclipse.ecf.core.events.ISharedObjectActivatedEvent; import org.eclipse.ecf.core.identity.ID; +import org.eclipse.ecf.core.sharedobject.events.ISharedObjectActivatedEvent; import org.eclipse.ecf.core.util.Event; import org.eclipse.ecf.core.util.IEventProcessor; -import org.eclipse.ecf.internal.core.Trace; +import org.eclipse.ecf.core.util.Trace; +import org.eclipse.ecf.internal.core.ECFDebugOptions; +import org.eclipse.ecf.internal.core.ECFPlugin; /** * Superclass for shared object classes that replicate themselves @@ -25,23 +26,18 @@ import org.eclipse.ecf.internal.core.Trace; */ public class OptimisticSharedObject extends AbstractSharedObject { - public static final Trace trace = Trace.create("optimisticsharedobject"); public OptimisticSharedObject() { super(); } protected void trace(String msg) { - if (Trace.ON && trace != null) { - trace.msg(getID() + ":" - + (isPrimary() ? "primary:" : "replica:") - + msg); - } + Trace.trace(ECFPlugin.getDefault(),getID() + ":" + + (isPrimary() ? "primary:" : "replica:") + + msg); } protected void traceStack(String msg, Throwable t) { - if (Trace.ON && trace != null) { - trace.dumpStack(t, getID() + ":" - + (isPrimary() ? "primary" : "replica") - + msg); - } + Trace.catching(ECFPlugin.getDefault(), ECFDebugOptions.EXCEPTIONS_CATCHING, OptimisticSharedObject.class, getID() + ":" + + (isPrimary() ? "primary" : "replica") + + msg, t); } protected void initialize() throws SharedObjectInitException { diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ReplicaSharedObjectDescription.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/ReplicaSharedObjectDescription.java index 94049a532..7972e0286 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ReplicaSharedObjectDescription.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/ReplicaSharedObjectDescription.java @@ -6,7 +6,7 @@ * * Contributors: Composent, Inc. - initial API and implementation ******************************************************************************/ -package org.eclipse.ecf.core; +package org.eclipse.ecf.core.sharedobject; import java.io.Serializable; import java.util.Map; diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/SharedObjectAddAbortException.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/SharedObjectAddAbortException.java index 47e1f3a48..44eaf6c24 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/SharedObjectAddAbortException.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/SharedObjectAddAbortException.java @@ -6,7 +6,7 @@ * * Contributors: Composent, Inc. - initial API and implementation ******************************************************************************/ -package org.eclipse.ecf.core; +package org.eclipse.ecf.core.sharedobject; import java.util.List; import java.util.Map; diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/SharedObjectAddException.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/SharedObjectAddException.java index 3561f7376..ea90f3cd8 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/SharedObjectAddException.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/SharedObjectAddException.java @@ -6,7 +6,7 @@ * * Contributors: Composent, Inc. - initial API and implementation ******************************************************************************/ -package org.eclipse.ecf.core; +package org.eclipse.ecf.core.sharedobject; import org.eclipse.ecf.core.util.ECFException; diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/SharedObjectConnectException.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/SharedObjectConnectException.java index 0c299a1e3..65e77fb00 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/SharedObjectConnectException.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/SharedObjectConnectException.java @@ -6,7 +6,7 @@ * * Contributors: Composent, Inc. - initial API and implementation ******************************************************************************/ -package org.eclipse.ecf.core; +package org.eclipse.ecf.core.sharedobject; import org.eclipse.ecf.core.util.ECFException; 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/sharedobject/SharedObjectContainerFactory.java index 19f0bf008..a6ba4f4d4 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/sharedobject/SharedObjectContainerFactory.java @@ -6,9 +6,14 @@ * * Contributors: Composent, Inc. - initial API and implementation ******************************************************************************/ -package org.eclipse.ecf.core; +package org.eclipse.ecf.core.sharedobject; -import org.eclipse.ecf.internal.core.Trace; +import org.eclipse.ecf.core.ContainerCreateException; +import org.eclipse.ecf.core.ContainerFactory; +import org.eclipse.ecf.core.ContainerTypeDescription; +import org.eclipse.ecf.core.IContainer; +import org.eclipse.ecf.core.util.Trace; +import org.eclipse.ecf.internal.core.ECFPlugin; /** * Factory for creating {@link ISharedObjectContainer} instances. This class @@ -29,7 +34,6 @@ import org.eclipse.ecf.internal.core.Trace; */ public class SharedObjectContainerFactory implements ISharedObjectContainerFactory { - private static Trace debug = Trace.create("sharedobjectcontainerfactory"); protected static ISharedObjectContainerFactory instance = null; static { instance = new SharedObjectContainerFactory(); @@ -43,9 +47,7 @@ public class SharedObjectContainerFactory implements } private static void trace(String msg) { - if (Trace.ON && debug != null) { - debug.msg(msg); - } + Trace.trace(ECFPlugin.getDefault(),msg); } /* @@ -58,8 +60,8 @@ public class SharedObjectContainerFactory implements ContainerTypeDescription desc, String[] argTypes, Object[] args) throws ContainerCreateException { trace("createSharedObjectContainer(" + desc + "," - + Trace.convertStringAToString(argTypes) + "," - + Trace.convertObjectAToString(args) + ")"); + + Trace.getArgumentsString(argTypes) + "," + + Trace.getArgumentsString(args) + ")"); if (desc == null) throw new ContainerCreateException( "ContainerTypeDescription cannot be null"); diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/SharedObjectContainerInitException.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/SharedObjectContainerInitException.java index aeb9528de..862fac8a0 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/SharedObjectContainerInitException.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/SharedObjectContainerInitException.java @@ -6,7 +6,7 @@ * * Contributors: Composent, Inc. - initial API and implementation ******************************************************************************/ -package org.eclipse.ecf.core; +package org.eclipse.ecf.core.sharedobject; import org.eclipse.ecf.core.util.ECFException; diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/SharedObjectCreateException.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/SharedObjectCreateException.java index 2ac48cf10..765ca3b29 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/SharedObjectCreateException.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/SharedObjectCreateException.java @@ -6,7 +6,7 @@ * * Contributors: Composent, Inc. - initial API and implementation ******************************************************************************/ -package org.eclipse.ecf.core; +package org.eclipse.ecf.core.sharedobject; import org.eclipse.ecf.core.util.ECFException; diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/SharedObjectDescription.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/SharedObjectDescription.java index 0bb175a4d..1a54305a0 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/SharedObjectDescription.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/SharedObjectDescription.java @@ -6,7 +6,7 @@ * * Contributors: Composent, Inc. - initial API and implementation ******************************************************************************/ -package org.eclipse.ecf.core; +package org.eclipse.ecf.core.sharedobject; import java.io.Serializable; import java.util.HashMap; diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/SharedObjectDisconnectException.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/SharedObjectDisconnectException.java index 552fda850..78874287d 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/SharedObjectDisconnectException.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/SharedObjectDisconnectException.java @@ -6,7 +6,7 @@ * * Contributors: Composent, Inc. - initial API and implementation ******************************************************************************/ -package org.eclipse.ecf.core; +package org.eclipse.ecf.core.sharedobject; import org.eclipse.ecf.core.util.ECFException; diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/SharedObjectFactory.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/SharedObjectFactory.java index 3505e48d1..17aa776bf 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/SharedObjectFactory.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/SharedObjectFactory.java @@ -6,21 +6,23 @@ * * Contributors: Composent, Inc. - initial API and implementation ******************************************************************************/ -package org.eclipse.ecf.core; +package org.eclipse.ecf.core.sharedobject; import java.util.ArrayList; import java.util.Hashtable; import java.util.List; -import org.eclipse.ecf.core.provider.ISharedObjectInstantiator; + +import org.eclipse.ecf.core.sharedobject.provider.ISharedObjectInstantiator; import org.eclipse.ecf.core.util.AbstractFactory; -import org.eclipse.ecf.internal.core.Trace; +import org.eclipse.ecf.core.util.Trace; +import org.eclipse.ecf.internal.core.ECFDebugOptions; +import org.eclipse.ecf.internal.core.ECFPlugin; /** * Factory for creating {@link ISharedObject} instances. This class provides ECF * clients an entry point to constructing {@link ISharedObject} instances. <br> */ public class SharedObjectFactory implements ISharedObjectFactory { - private static Trace debug = Trace.create("containerfactory"); private static Hashtable sharedobjectdescriptions = new Hashtable(); protected static ISharedObjectFactory instance = null; @@ -37,15 +39,11 @@ public class SharedObjectFactory implements ISharedObjectFactory { } private static void trace(String msg) { - if (Trace.ON && debug != null) { - debug.msg(msg); - } + Trace.trace(ECFPlugin.getDefault(),msg); } private static void dumpStack(String msg, Throwable e) { - if (Trace.ON && debug != null) { - debug.dumpStack(e, msg); - } + Trace.catching(ECFPlugin.getDefault(), ECFDebugOptions.EXCEPTIONS_CATCHING, ECFPlugin.class, "dumpStack", e); } /* @@ -130,8 +128,8 @@ public class SharedObjectFactory implements ISharedObjectFactory { String[] argTypes, Object[] args) throws SharedObjectCreateException { trace("createSharedObject(" + desc + "," - + Trace.convertStringAToString(argTypes) + "," - + Trace.convertObjectAToString(args) + ")"); + + Trace.getArgumentsString(argTypes) + "," + + Trace.getArgumentsString(args) + ")"); if (desc == null) throw new SharedObjectCreateException( "SharedObjectDescription cannot be null"); diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/SharedObjectInitException.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/SharedObjectInitException.java index b2be9f8e1..8d3e01a5c 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/SharedObjectInitException.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/SharedObjectInitException.java @@ -6,7 +6,7 @@ * * Contributors: Composent, Inc. - initial API and implementation ******************************************************************************/ -package org.eclipse.ecf.core; +package org.eclipse.ecf.core.sharedobject; import org.eclipse.ecf.core.util.ECFException; diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/SharedObjectMsgEvent.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/SharedObjectMsgEvent.java index 5d4bb1d49..522b6f913 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/SharedObjectMsgEvent.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/SharedObjectMsgEvent.java @@ -11,8 +11,8 @@ package org.eclipse.ecf.core.sharedobject; -import org.eclipse.ecf.core.events.RemoteSharedObjectEvent; import org.eclipse.ecf.core.identity.ID; +import org.eclipse.ecf.core.sharedobject.events.RemoteSharedObjectEvent; /** * Event type to represent messages sent between shared objects diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/SharedObjectMsgEventProcessor.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/SharedObjectMsgEventProcessor.java index 77338bef1..1eb22f31a 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/SharedObjectMsgEventProcessor.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/SharedObjectMsgEventProcessor.java @@ -11,7 +11,7 @@ package org.eclipse.ecf.core.sharedobject; -import org.eclipse.ecf.core.events.ISharedObjectMessageEvent; +import org.eclipse.ecf.core.sharedobject.events.ISharedObjectMessageEvent; import org.eclipse.ecf.core.util.Event; import org.eclipse.ecf.core.util.IEventProcessor; diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/SharedObjectNotFoundException.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/SharedObjectNotFoundException.java index f2ca8651d..aab9ef3ad 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/SharedObjectNotFoundException.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/SharedObjectNotFoundException.java @@ -6,7 +6,7 @@ * * Contributors: Composent, Inc. - initial API and implementation ******************************************************************************/ -package org.eclipse.ecf.core; +package org.eclipse.ecf.core.sharedobject; import org.eclipse.ecf.core.util.ECFException; diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/SharedObjectTypeDescription.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/SharedObjectTypeDescription.java index 542568e57..c414f24ec 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/SharedObjectTypeDescription.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/SharedObjectTypeDescription.java @@ -6,11 +6,12 @@ * * Contributors: Composent, Inc. - initial API and implementation ******************************************************************************/ -package org.eclipse.ecf.core; +package org.eclipse.ecf.core.sharedobject; import java.io.Serializable; import java.util.Map; -import org.eclipse.ecf.core.provider.ISharedObjectInstantiator; + +import org.eclipse.ecf.core.sharedobject.provider.ISharedObjectInstantiator; /** * Description of shared object type. This class provides the information diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/TransactionSharedObject.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/TransactionSharedObject.java index db8a1a025..20b8fbbcd 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/TransactionSharedObject.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/TransactionSharedObject.java @@ -10,9 +10,6 @@ *****************************************************************************/ package org.eclipse.ecf.core.sharedobject; -import org.eclipse.ecf.core.ISharedObjectContainerTransaction; -import org.eclipse.ecf.core.ISharedObjectTransactionConfig; -import org.eclipse.ecf.core.SharedObjectInitException; /** * Superclass for shared object classes that replicate themselves transactionally. diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/TransactionSharedObjectConfiguration.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/TransactionSharedObjectConfiguration.java index 146ac70fe..cc0025691 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/TransactionSharedObjectConfiguration.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/TransactionSharedObjectConfiguration.java @@ -10,8 +10,6 @@ *****************************************************************************/ package org.eclipse.ecf.core.sharedobject; -import org.eclipse.ecf.core.ISharedObjectTransactionConfig; -import org.eclipse.ecf.core.ISharedObjectTransactionParticipantsFilter; /** * Configuration parameters for transaction shared object creation and replication. diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/TwoPhaseCommitEventProcessor.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/TwoPhaseCommitEventProcessor.java index 54ef81bbf..eb3de3fc8 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/TwoPhaseCommitEventProcessor.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/TwoPhaseCommitEventProcessor.java @@ -14,22 +14,19 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Vector; -import org.eclipse.ecf.core.ISharedObjectContainerTransaction; -import org.eclipse.ecf.core.ISharedObjectContext; -import org.eclipse.ecf.core.ISharedObjectTransactionConfig; -import org.eclipse.ecf.core.ISharedObjectTransactionParticipantsFilter; -import org.eclipse.ecf.core.SharedObjectAddAbortException; import org.eclipse.ecf.core.events.IContainerConnectedEvent; import org.eclipse.ecf.core.events.IContainerDisconnectedEvent; -import org.eclipse.ecf.core.events.ISharedObjectActivatedEvent; -import org.eclipse.ecf.core.events.ISharedObjectCommitEvent; -import org.eclipse.ecf.core.events.ISharedObjectCreateResponseEvent; -import org.eclipse.ecf.core.events.ISharedObjectMessageEvent; -import org.eclipse.ecf.core.events.SharedObjectCommitEvent; import org.eclipse.ecf.core.identity.ID; +import org.eclipse.ecf.core.sharedobject.events.ISharedObjectActivatedEvent; +import org.eclipse.ecf.core.sharedobject.events.ISharedObjectCommitEvent; +import org.eclipse.ecf.core.sharedobject.events.ISharedObjectCreateResponseEvent; +import org.eclipse.ecf.core.sharedobject.events.ISharedObjectMessageEvent; +import org.eclipse.ecf.core.sharedobject.events.SharedObjectCommitEvent; import org.eclipse.ecf.core.util.Event; import org.eclipse.ecf.core.util.IEventProcessor; -import org.eclipse.ecf.internal.core.Trace; +import org.eclipse.ecf.core.util.Trace; +import org.eclipse.ecf.internal.core.ECFDebugOptions; +import org.eclipse.ecf.internal.core.ECFPlugin; /** * Implementation of two-phase commit for transactional replication of shared objects. @@ -37,7 +34,6 @@ import org.eclipse.ecf.internal.core.Trace; */ public class TwoPhaseCommitEventProcessor implements IEventProcessor, ISharedObjectContainerTransaction { - public static final Trace trace = Trace.create("twophasecommiteventprocessor"); AbstractSharedObject sharedObject = null; byte transactionState = ISharedObjectContainerTransaction.ACTIVE; Object lock = new Object(); @@ -57,18 +53,10 @@ public class TwoPhaseCommitEventProcessor implements IEventProcessor, this.participantsFilter = config.getParticipantsFilter(); } protected void trace(String msg) { - if (Trace.ON && trace != null) { - trace.msg(getSharedObject().getID() + ":" - + (getSharedObject().isPrimary() ? "primary:" : "replica:") - + msg); - } + Trace.trace(ECFPlugin.getDefault(),msg); } protected void traceStack(String msg, Throwable t) { - if (Trace.ON && trace != null) { - trace.dumpStack(t, sharedObject.getID() + ":" - + (getSharedObject().isPrimary() ? "primary" : "replica") - + msg); - } + Trace.catching(ECFPlugin.getDefault(), ECFDebugOptions.EXCEPTIONS_CATCHING, TwoPhaseCommitEventProcessor.class, "traceStack", t);; } protected int getTimeout() { return timeout; diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/ISharedObjectActivatedEvent.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/events/ISharedObjectActivatedEvent.java index c46307104..14c37e9ba 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/ISharedObjectActivatedEvent.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/events/ISharedObjectActivatedEvent.java @@ -6,8 +6,9 @@ * * Contributors: Composent, Inc. - initial API and implementation ******************************************************************************/ -package org.eclipse.ecf.core.events; +package org.eclipse.ecf.core.sharedobject.events; +import org.eclipse.ecf.core.events.IContainerEvent; import org.eclipse.ecf.core.identity.ID; public interface ISharedObjectActivatedEvent extends IContainerEvent { diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/ISharedObjectCallEvent.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/events/ISharedObjectCallEvent.java index f3792bd09..42bd2c868 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/ISharedObjectCallEvent.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/events/ISharedObjectCallEvent.java @@ -6,7 +6,7 @@ * * Contributors: Composent, Inc. - initial API and implementation ******************************************************************************/ -package org.eclipse.ecf.core.events; +package org.eclipse.ecf.core.sharedobject.events; import org.eclipse.ecf.core.util.AsynchResult; diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/ISharedObjectCommitEvent.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/events/ISharedObjectCommitEvent.java index 0c7279fcd..5a96b43c3 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/ISharedObjectCommitEvent.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/events/ISharedObjectCommitEvent.java @@ -6,7 +6,7 @@ * * Contributors: Composent, Inc. - initial API and implementation ******************************************************************************/ -package org.eclipse.ecf.core.events; +package org.eclipse.ecf.core.sharedobject.events; public interface ISharedObjectCommitEvent extends ISharedObjectEvent { } diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/ISharedObjectCreateResponseEvent.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/events/ISharedObjectCreateResponseEvent.java index e80781797..f5035bbe3 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/ISharedObjectCreateResponseEvent.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/events/ISharedObjectCreateResponseEvent.java @@ -6,7 +6,7 @@ * * Contributors: Composent, Inc. - initial API and implementation ******************************************************************************/ -package org.eclipse.ecf.core.events; +package org.eclipse.ecf.core.sharedobject.events; public interface ISharedObjectCreateResponseEvent extends ISharedObjectMessageEvent { diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/ISharedObjectDeactivatedEvent.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/events/ISharedObjectDeactivatedEvent.java index d17b55559..112fcdefc 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/ISharedObjectDeactivatedEvent.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/events/ISharedObjectDeactivatedEvent.java @@ -6,8 +6,9 @@ * * Contributors: Composent, Inc. - initial API and implementation ******************************************************************************/ -package org.eclipse.ecf.core.events; +package org.eclipse.ecf.core.sharedobject.events; +import org.eclipse.ecf.core.events.IContainerEvent; import org.eclipse.ecf.core.identity.ID; public interface ISharedObjectDeactivatedEvent extends IContainerEvent { diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/ISharedObjectEvent.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/events/ISharedObjectEvent.java index edeb52708..c1481ffde 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/ISharedObjectEvent.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/events/ISharedObjectEvent.java @@ -6,7 +6,7 @@ * * Contributors: Composent, Inc. - initial API and implementation ******************************************************************************/ -package org.eclipse.ecf.core.events; +package org.eclipse.ecf.core.sharedobject.events; import org.eclipse.ecf.core.identity.ID; import org.eclipse.ecf.core.util.Event; diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/ISharedObjectManagerEvent.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/events/ISharedObjectManagerEvent.java index 1328d9b0b..c6cfb37a1 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/ISharedObjectManagerEvent.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/events/ISharedObjectManagerEvent.java @@ -6,7 +6,9 @@ * * Contributors: Composent, Inc. - initial API and implementation ******************************************************************************/ -package org.eclipse.ecf.core.events; +package org.eclipse.ecf.core.sharedobject.events; + +import org.eclipse.ecf.core.events.IContainerEvent; public interface ISharedObjectManagerEvent extends IContainerEvent { } diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/ISharedObjectMessageEvent.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/events/ISharedObjectMessageEvent.java index 76ff32d77..a66ea811a 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/ISharedObjectMessageEvent.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/events/ISharedObjectMessageEvent.java @@ -6,7 +6,7 @@ * * Contributors: Composent, Inc. - initial API and implementation ******************************************************************************/ -package org.eclipse.ecf.core.events; +package org.eclipse.ecf.core.sharedobject.events; import org.eclipse.ecf.core.identity.ID; diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/RemoteSharedObjectCreateResponseEvent.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/events/RemoteSharedObjectCreateResponseEvent.java index a5768015a..8a1540cf2 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/RemoteSharedObjectCreateResponseEvent.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/events/RemoteSharedObjectCreateResponseEvent.java @@ -6,7 +6,7 @@ * * Contributors: Composent, Inc. - initial API and implementation ******************************************************************************/ -package org.eclipse.ecf.core.events; +package org.eclipse.ecf.core.sharedobject.events; import org.eclipse.ecf.core.identity.ID; diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/RemoteSharedObjectEvent.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/events/RemoteSharedObjectEvent.java index 4e30f0e0b..8b724874d 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/RemoteSharedObjectEvent.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/events/RemoteSharedObjectEvent.java @@ -6,7 +6,7 @@ * * Contributors: Composent, Inc. - initial API and implementation ******************************************************************************/ -package org.eclipse.ecf.core.events; +package org.eclipse.ecf.core.sharedobject.events; import java.io.Serializable; import org.eclipse.ecf.core.identity.ID; diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/SharedObjectActivatedEvent.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/events/SharedObjectActivatedEvent.java index 0aa434864..9fa91ab03 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/SharedObjectActivatedEvent.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/events/SharedObjectActivatedEvent.java @@ -6,7 +6,7 @@ * * Contributors: Composent, Inc. - initial API and implementation ******************************************************************************/ -package org.eclipse.ecf.core.events; +package org.eclipse.ecf.core.sharedobject.events; import org.eclipse.ecf.core.identity.ID; diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/SharedObjectCallEvent.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/events/SharedObjectCallEvent.java index 3592c55c5..8ec7c88c6 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/SharedObjectCallEvent.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/events/SharedObjectCallEvent.java @@ -9,7 +9,7 @@ * Composent, Inc. - initial API and implementation *****************************************************************************/ -package org.eclipse.ecf.core.events; +package org.eclipse.ecf.core.sharedobject.events; import org.eclipse.ecf.core.identity.ID; import org.eclipse.ecf.core.util.AsynchResult; diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/SharedObjectCommitEvent.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/events/SharedObjectCommitEvent.java index 3fa8d3f2b..df5ca6e1c 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/SharedObjectCommitEvent.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/events/SharedObjectCommitEvent.java @@ -6,7 +6,7 @@ * * Contributors: Composent, Inc. - initial API and implementation ******************************************************************************/ -package org.eclipse.ecf.core.events; +package org.eclipse.ecf.core.sharedobject.events; import org.eclipse.ecf.core.identity.ID; import org.eclipse.ecf.core.util.Event; diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/SharedObjectDeactivatedEvent.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/events/SharedObjectDeactivatedEvent.java index 8db527ccf..9367eadbf 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/SharedObjectDeactivatedEvent.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/events/SharedObjectDeactivatedEvent.java @@ -6,7 +6,7 @@ * * Contributors: Composent, Inc. - initial API and implementation ******************************************************************************/ -package org.eclipse.ecf.core.events; +package org.eclipse.ecf.core.sharedobject.events; import org.eclipse.ecf.core.identity.ID; diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/SharedObjectManagerAddEvent.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/events/SharedObjectManagerAddEvent.java index a96289fbb..f4a34a49d 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/SharedObjectManagerAddEvent.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/events/SharedObjectManagerAddEvent.java @@ -6,11 +6,11 @@ * * Contributors: Composent, Inc. - initial API and implementation ******************************************************************************/ -package org.eclipse.ecf.core.events; +package org.eclipse.ecf.core.sharedobject.events; import java.util.Map; -import org.eclipse.ecf.core.ISharedObject; import org.eclipse.ecf.core.identity.ID; +import org.eclipse.ecf.core.sharedobject.ISharedObject; /** * @author slewis diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/SharedObjectManagerConnectEvent.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/events/SharedObjectManagerConnectEvent.java index b33a542f5..030c9c7b3 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/SharedObjectManagerConnectEvent.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/events/SharedObjectManagerConnectEvent.java @@ -6,7 +6,7 @@ * * Contributors: Composent, Inc. - initial API and implementation ******************************************************************************/ -package org.eclipse.ecf.core.events; +package org.eclipse.ecf.core.sharedobject.events; import java.util.Arrays; import org.eclipse.ecf.core.identity.ID; diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/SharedObjectManagerCreateEvent.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/events/SharedObjectManagerCreateEvent.java index 27f2a71c8..8229b4b04 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/SharedObjectManagerCreateEvent.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/events/SharedObjectManagerCreateEvent.java @@ -6,10 +6,10 @@ * * Contributors: Composent, Inc. - initial API and implementation ******************************************************************************/ -package org.eclipse.ecf.core.events; +package org.eclipse.ecf.core.sharedobject.events; -import org.eclipse.ecf.core.SharedObjectDescription; import org.eclipse.ecf.core.identity.ID; +import org.eclipse.ecf.core.sharedobject.SharedObjectDescription; /** * @author slewis diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/SharedObjectManagerDisconnectEvent.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/events/SharedObjectManagerDisconnectEvent.java index 477d69f20..2dc0c9536 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/SharedObjectManagerDisconnectEvent.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/events/SharedObjectManagerDisconnectEvent.java @@ -6,7 +6,7 @@ * * Contributors: Composent, Inc. - initial API and implementation ******************************************************************************/ -package org.eclipse.ecf.core.events; +package org.eclipse.ecf.core.sharedobject.events; import org.eclipse.ecf.core.identity.ID; diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/SharedObjectManagerRemoveEvent.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/events/SharedObjectManagerRemoveEvent.java index 91e766b14..3e7e94864 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/SharedObjectManagerRemoveEvent.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/events/SharedObjectManagerRemoveEvent.java @@ -6,7 +6,7 @@ * * Contributors: Composent, Inc. - initial API and implementation ******************************************************************************/ -package org.eclipse.ecf.core.events; +package org.eclipse.ecf.core.sharedobject.events; import org.eclipse.ecf.core.identity.ID; diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/provider/ISharedObjectInstantiator.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/provider/ISharedObjectInstantiator.java index 3f5408921..1bdb4f059 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/provider/ISharedObjectInstantiator.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/sharedobject/provider/ISharedObjectInstantiator.java @@ -6,11 +6,11 @@ * * Contributors: Composent, Inc. - initial API and implementation ******************************************************************************/ -package org.eclipse.ecf.core.provider; +package org.eclipse.ecf.core.sharedobject.provider; -import org.eclipse.ecf.core.ISharedObject; -import org.eclipse.ecf.core.SharedObjectCreateException; -import org.eclipse.ecf.core.SharedObjectTypeDescription; +import org.eclipse.ecf.core.sharedobject.ISharedObject; +import org.eclipse.ecf.core.sharedobject.SharedObjectCreateException; +import org.eclipse.ecf.core.sharedobject.SharedObjectTypeDescription; /** * Interface that must be implemented by extensions of the sharedObjectFactory extension point 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 45baea860..31d001de9 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 @@ -31,21 +31,21 @@ import org.eclipse.core.runtime.Status; import org.eclipse.ecf.core.ContainerFactory; import org.eclipse.ecf.core.ContainerTypeDescription; import org.eclipse.ecf.core.IContainerFactory; -import org.eclipse.ecf.core.ISharedObjectFactory; -import org.eclipse.ecf.core.SharedObjectFactory; -import org.eclipse.ecf.core.SharedObjectTypeDescription; import org.eclipse.ecf.core.comm.ConnectionFactory; import org.eclipse.ecf.core.comm.ConnectionTypeDescription; import org.eclipse.ecf.core.comm.provider.ISynchAsynchConnectionInstantiator; import org.eclipse.ecf.core.provider.IContainerInstantiator; -import org.eclipse.ecf.core.provider.ISharedObjectInstantiator; +import org.eclipse.ecf.core.sharedobject.ISharedObjectFactory; +import org.eclipse.ecf.core.sharedobject.SharedObjectFactory; +import org.eclipse.ecf.core.sharedobject.SharedObjectTypeDescription; +import org.eclipse.ecf.core.sharedobject.provider.ISharedObjectInstantiator; import org.eclipse.ecf.core.start.ECFStartJob; import org.eclipse.ecf.core.start.IECFStart; +import org.eclipse.ecf.core.util.Trace; import org.osgi.framework.BundleContext; public class ECFPlugin extends Plugin { - protected static Trace trace = null; - + public static final String PLUGIN_ID = "org.eclipse.ecf"; public static final String ECFNAMESPACE = PLUGIN_ID; @@ -83,15 +83,11 @@ public class ECFPlugin extends Plugin { private Map disposables = new WeakHashMap(); private IRegistryChangeListener registryManager = null; private static void debug(String msg) { - if (Trace.ON && trace != null) { - trace.msg(msg); - } + Trace.trace(ECFPlugin.getDefault(),msg); } private static void dumpStack(String msg, Throwable e) { - if (Trace.ON && trace != null) { - trace.dumpStack(e, msg); - } + Trace.catching(ECFPlugin.getDefault(), ECFDebugOptions.EXCEPTIONS_CATCHING, ECFPlugin.class, "dumpStack", e); } public ECFPlugin() { super(); @@ -586,7 +582,6 @@ public class ECFPlugin extends Plugin { */ public void start(BundleContext context) throws Exception { super.start(context); - trace = Trace.create("factoryinit"); this.bundlecontext = context; this.registryManager = new ECFRegistryManager(); Platform.getExtensionRegistry().addRegistryChangeListener( diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/internal/core/Trace.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/internal/core/Trace.java deleted file mode 100644 index 278faf1e5..000000000 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/internal/core/Trace.java +++ /dev/null @@ -1,138 +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.internal.core; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.PrintStream; -import java.text.SimpleDateFormat; -import java.util.Date; -import org.eclipse.core.runtime.Platform; - -public class Trace { - private static final String TRACENAME = "org.eclipse.ecf.Trace"; - - public static final String tracePrefix = "(trace)"; - public static boolean ON = false; - protected static boolean isEclipse = false; - protected static String pluginName = ""; - protected static String debugPrefix = "/debug/"; - - protected static PrintStream getPrintStream(String outputFileName) { - if (outputFileName != null) try { - File f = new File(outputFileName); - PrintStream ps = new PrintStream(new FileOutputStream(f,true)); - System.out.println(TRACENAME+" directed to "+f.getCanonicalPath()); - return ps; - } catch (Exception e) { - System.err.println("Exception opening output file '"+outputFileName+"' for tracing...using System.out"); - } - return System.out; - } - - protected static PrintStream printStream = null; - - static { - String val = System.getProperty(TRACENAME); - printStream = getPrintStream(val); - if (val != null) { - ON = true; - isEclipse = false; - } else { - try { - ON = Platform.inDebugMode(); - pluginName = ECFPlugin.getDefault().getBundle().getSymbolicName(); - } catch (Exception e) { - System.out.println("WARNING: Platform not available for trace"); - } - isEclipse = true; - } - } - - public static Trace create(String key) { - if (isEclipse) { - String res = ""; - try { - res = Platform.getDebugOption(pluginName + debugPrefix + key); - } catch (Exception e) { - // ignore...this means that the Platform class not found. - } - if (res != null) { - Boolean on = new Boolean(res); - if (on.booleanValue()) - return new Trace(pluginName + "(" + key + ")"); - else - return null; - } else { - return null; - } - } else - return new Trace(key); - } - - String name; - - public void dumpStack(Throwable e, String msg) { - msg(msg); - e.printStackTrace(printStream); - } - - public void msg(String msg) { - StringBuffer sb = new StringBuffer(name); - sb.append(getTimeString()).append(msg); - printStream.println(sb.toString()); - } - - protected static String getTimeString() { - Date d = new Date(); - SimpleDateFormat df = new SimpleDateFormat("[MM/dd/yy;HH:mm:ss:SSS]"); - return df.format(d); - } - - protected Trace(String str) { - name = tracePrefix + str; - } - - public static String convertStringAToString(String[] strings) { - if (strings == null) - return ""; - StringBuffer sb = new StringBuffer(); - for (int i = 0; i < strings.length; i++) { - if (strings[i] == null) - sb.append("(null)"); - else - sb.append(strings[i]); - if (i != (strings.length - 1)) - sb.append(";"); - } - return sb.toString(); - } - - public static String convertObjectAToString(Object[] objs) { - if (objs == null) - return ""; - StringBuffer sb = new StringBuffer("["); - for (int i = 0; i < objs.length; i++) { - if (objs[i] == null) - sb.append("null"); - else - sb.append(objs[i].toString()); - if (i != (objs.length - 1)) - sb.append(","); - } - sb.append("]"); - return sb.toString(); - } - - public static void setThreadDebugGroup(Object obj) { - // Do nothing - } -}
\ No newline at end of file diff --git a/providers/bundles/org.eclipse.ecf.provider.datashare/src/org/eclipse/ecf/provider/datashare/BaseChannel.java b/providers/bundles/org.eclipse.ecf.provider.datashare/src/org/eclipse/ecf/provider/datashare/BaseChannel.java index ad0d6324a..dd9dfd62a 100644 --- a/providers/bundles/org.eclipse.ecf.provider.datashare/src/org/eclipse/ecf/provider/datashare/BaseChannel.java +++ b/providers/bundles/org.eclipse.ecf.provider.datashare/src/org/eclipse/ecf/provider/datashare/BaseChannel.java @@ -10,14 +10,14 @@ package org.eclipse.ecf.provider.datashare; import java.io.Serializable; import java.util.Map; -import org.eclipse.ecf.core.ISharedObjectTransactionConfig; -import org.eclipse.ecf.core.ReplicaSharedObjectDescription; -import org.eclipse.ecf.core.SharedObjectInitException; import org.eclipse.ecf.core.events.IContainerConnectedEvent; import org.eclipse.ecf.core.events.IContainerDisconnectedEvent; -import org.eclipse.ecf.core.events.ISharedObjectMessageEvent; import org.eclipse.ecf.core.identity.ID; +import org.eclipse.ecf.core.sharedobject.ISharedObjectTransactionConfig; +import org.eclipse.ecf.core.sharedobject.ReplicaSharedObjectDescription; +import org.eclipse.ecf.core.sharedobject.SharedObjectInitException; import org.eclipse.ecf.core.sharedobject.TransactionSharedObject; +import org.eclipse.ecf.core.sharedobject.events.ISharedObjectMessageEvent; import org.eclipse.ecf.core.util.ECFException; import org.eclipse.ecf.core.util.Event; import org.eclipse.ecf.core.util.IEventProcessor; diff --git a/providers/bundles/org.eclipse.ecf.provider.datashare/src/org/eclipse/ecf/provider/datashare/ChannelFactory.java b/providers/bundles/org.eclipse.ecf.provider.datashare/src/org/eclipse/ecf/provider/datashare/ChannelFactory.java index 4b0b7dff7..f9e685371 100644 --- a/providers/bundles/org.eclipse.ecf.provider.datashare/src/org/eclipse/ecf/provider/datashare/ChannelFactory.java +++ b/providers/bundles/org.eclipse.ecf.provider.datashare/src/org/eclipse/ecf/provider/datashare/ChannelFactory.java @@ -11,11 +11,11 @@ package org.eclipse.ecf.provider.datashare; -import org.eclipse.ecf.core.ISharedObject; -import org.eclipse.ecf.core.ISharedObjectTransactionConfig; -import org.eclipse.ecf.core.SharedObjectCreateException; -import org.eclipse.ecf.core.SharedObjectTypeDescription; -import org.eclipse.ecf.core.provider.ISharedObjectInstantiator; +import org.eclipse.ecf.core.sharedobject.ISharedObject; +import org.eclipse.ecf.core.sharedobject.ISharedObjectTransactionConfig; +import org.eclipse.ecf.core.sharedobject.SharedObjectCreateException; +import org.eclipse.ecf.core.sharedobject.SharedObjectTypeDescription; +import org.eclipse.ecf.core.sharedobject.provider.ISharedObjectInstantiator; import org.eclipse.ecf.datashare.IChannelListener; public class ChannelFactory implements ISharedObjectInstantiator { diff --git a/providers/bundles/org.eclipse.ecf.provider.datashare/src/org/eclipse/ecf/provider/datashare/DatashareContainer.java b/providers/bundles/org.eclipse.ecf.provider.datashare/src/org/eclipse/ecf/provider/datashare/DatashareContainer.java index 8a9e229d9..da229df36 100644 --- a/providers/bundles/org.eclipse.ecf.provider.datashare/src/org/eclipse/ecf/provider/datashare/DatashareContainer.java +++ b/providers/bundles/org.eclipse.ecf.provider.datashare/src/org/eclipse/ecf/provider/datashare/DatashareContainer.java @@ -10,9 +10,9 @@ package org.eclipse.ecf.provider.datashare; import java.util.Map; -import org.eclipse.ecf.core.ISharedObjectContainerConfig; import org.eclipse.ecf.core.identity.ID; import org.eclipse.ecf.core.identity.Namespace; +import org.eclipse.ecf.core.sharedobject.ISharedObjectContainerConfig; import org.eclipse.ecf.core.util.ECFException; import org.eclipse.ecf.datashare.IChannel; import org.eclipse.ecf.datashare.IChannelConfig; diff --git a/providers/bundles/org.eclipse.ecf.provider.datashare/src/org/eclipse/ecf/provider/datashare/DatashareContainerAdapter.java b/providers/bundles/org.eclipse.ecf.provider.datashare/src/org/eclipse/ecf/provider/datashare/DatashareContainerAdapter.java index 6fd9e24fa..3f01a30fb 100644 --- a/providers/bundles/org.eclipse.ecf.provider.datashare/src/org/eclipse/ecf/provider/datashare/DatashareContainerAdapter.java +++ b/providers/bundles/org.eclipse.ecf.provider.datashare/src/org/eclipse/ecf/provider/datashare/DatashareContainerAdapter.java @@ -19,21 +19,21 @@ import java.util.Iterator; import java.util.List; import java.util.Map; import org.eclipse.ecf.core.IContainerListener; -import org.eclipse.ecf.core.ISharedObject; -import org.eclipse.ecf.core.ISharedObjectTransactionConfig; -import org.eclipse.ecf.core.ISharedObjectTransactionParticipantsFilter; -import org.eclipse.ecf.core.SharedObjectCreateException; -import org.eclipse.ecf.core.SharedObjectDescription; -import org.eclipse.ecf.core.SharedObjectFactory; -import org.eclipse.ecf.core.SharedObjectTypeDescription; import org.eclipse.ecf.core.events.IContainerEvent; -import org.eclipse.ecf.core.events.ISharedObjectActivatedEvent; -import org.eclipse.ecf.core.events.ISharedObjectDeactivatedEvent; import org.eclipse.ecf.core.identity.ID; import org.eclipse.ecf.core.identity.IDFactory; import org.eclipse.ecf.core.identity.IDCreateException; import org.eclipse.ecf.core.identity.Namespace; import org.eclipse.ecf.core.identity.StringID; +import org.eclipse.ecf.core.sharedobject.ISharedObject; +import org.eclipse.ecf.core.sharedobject.ISharedObjectTransactionConfig; +import org.eclipse.ecf.core.sharedobject.ISharedObjectTransactionParticipantsFilter; +import org.eclipse.ecf.core.sharedobject.SharedObjectCreateException; +import org.eclipse.ecf.core.sharedobject.SharedObjectDescription; +import org.eclipse.ecf.core.sharedobject.SharedObjectFactory; +import org.eclipse.ecf.core.sharedobject.SharedObjectTypeDescription; +import org.eclipse.ecf.core.sharedobject.events.ISharedObjectActivatedEvent; +import org.eclipse.ecf.core.sharedobject.events.ISharedObjectDeactivatedEvent; import org.eclipse.ecf.core.util.ECFException; import org.eclipse.ecf.datashare.IChannel; import org.eclipse.ecf.datashare.IChannelConfig; diff --git a/providers/bundles/org.eclipse.ecf.provider.datashare/src/org/eclipse/ecf/provider/datashare/DatashareContainerAdapterFactory.java b/providers/bundles/org.eclipse.ecf.provider.datashare/src/org/eclipse/ecf/provider/datashare/DatashareContainerAdapterFactory.java index a5b7212cb..55573e91b 100644 --- a/providers/bundles/org.eclipse.ecf.provider.datashare/src/org/eclipse/ecf/provider/datashare/DatashareContainerAdapterFactory.java +++ b/providers/bundles/org.eclipse.ecf.provider.datashare/src/org/eclipse/ecf/provider/datashare/DatashareContainerAdapterFactory.java @@ -10,9 +10,9 @@ *****************************************************************************/ package org.eclipse.ecf.provider.datashare; -import org.eclipse.ecf.core.AbstractSharedObjectContainerAdapterFactory; -import org.eclipse.ecf.core.ISharedObject; -import org.eclipse.ecf.core.ISharedObjectContainer; +import org.eclipse.ecf.core.sharedobject.AbstractSharedObjectContainerAdapterFactory; +import org.eclipse.ecf.core.sharedobject.ISharedObject; +import org.eclipse.ecf.core.sharedobject.ISharedObjectContainer; import org.eclipse.ecf.datashare.IChannelContainerAdapter; public class DatashareContainerAdapterFactory extends diff --git a/providers/bundles/org.eclipse.ecf.provider.datashare/src/org/eclipse/ecf/provider/datashare/DatashareContainerConfig.java b/providers/bundles/org.eclipse.ecf.provider.datashare/src/org/eclipse/ecf/provider/datashare/DatashareContainerConfig.java index df37fb244..f3aca9a3c 100644 --- a/providers/bundles/org.eclipse.ecf.provider.datashare/src/org/eclipse/ecf/provider/datashare/DatashareContainerConfig.java +++ b/providers/bundles/org.eclipse.ecf.provider.datashare/src/org/eclipse/ecf/provider/datashare/DatashareContainerConfig.java @@ -10,8 +10,8 @@ package org.eclipse.ecf.provider.datashare; import java.util.HashMap; import java.util.Map; -import org.eclipse.ecf.core.ISharedObjectContainerConfig; import org.eclipse.ecf.core.identity.ID; +import org.eclipse.ecf.core.sharedobject.ISharedObjectContainerConfig; public class DatashareContainerConfig implements ISharedObjectContainerConfig { diff --git a/providers/bundles/org.eclipse.ecf.provider.datashare/src/org/eclipse/ecf/provider/datashare/SharedObjectDatashareContainerAdapter.java b/providers/bundles/org.eclipse.ecf.provider.datashare/src/org/eclipse/ecf/provider/datashare/SharedObjectDatashareContainerAdapter.java index 6ce227f55..9da0f696e 100644 --- a/providers/bundles/org.eclipse.ecf.provider.datashare/src/org/eclipse/ecf/provider/datashare/SharedObjectDatashareContainerAdapter.java +++ b/providers/bundles/org.eclipse.ecf.provider.datashare/src/org/eclipse/ecf/provider/datashare/SharedObjectDatashareContainerAdapter.java @@ -19,22 +19,22 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import org.eclipse.ecf.core.ISharedObject; -import org.eclipse.ecf.core.ISharedObjectTransactionConfig; -import org.eclipse.ecf.core.ISharedObjectTransactionParticipantsFilter; -import org.eclipse.ecf.core.SharedObjectCreateException; -import org.eclipse.ecf.core.SharedObjectDescription; -import org.eclipse.ecf.core.SharedObjectFactory; -import org.eclipse.ecf.core.SharedObjectInitException; -import org.eclipse.ecf.core.SharedObjectTypeDescription; -import org.eclipse.ecf.core.events.ISharedObjectActivatedEvent; -import org.eclipse.ecf.core.events.ISharedObjectDeactivatedEvent; import org.eclipse.ecf.core.identity.ID; import org.eclipse.ecf.core.identity.IDFactory; import org.eclipse.ecf.core.identity.IDCreateException; import org.eclipse.ecf.core.identity.Namespace; import org.eclipse.ecf.core.identity.StringID; import org.eclipse.ecf.core.sharedobject.AbstractSharedObject; +import org.eclipse.ecf.core.sharedobject.ISharedObject; +import org.eclipse.ecf.core.sharedobject.ISharedObjectTransactionConfig; +import org.eclipse.ecf.core.sharedobject.ISharedObjectTransactionParticipantsFilter; +import org.eclipse.ecf.core.sharedobject.SharedObjectCreateException; +import org.eclipse.ecf.core.sharedobject.SharedObjectDescription; +import org.eclipse.ecf.core.sharedobject.SharedObjectFactory; +import org.eclipse.ecf.core.sharedobject.SharedObjectInitException; +import org.eclipse.ecf.core.sharedobject.SharedObjectTypeDescription; +import org.eclipse.ecf.core.sharedobject.events.ISharedObjectActivatedEvent; +import org.eclipse.ecf.core.sharedobject.events.ISharedObjectDeactivatedEvent; import org.eclipse.ecf.core.util.ECFException; import org.eclipse.ecf.core.util.Event; import org.eclipse.ecf.core.util.IEventProcessor; diff --git a/providers/bundles/org.eclipse.ecf.provider.jmdns/src/org/eclipse/ecf/provider/jmdns/container/ContainerConfig.java b/providers/bundles/org.eclipse.ecf.provider.jmdns/src/org/eclipse/ecf/provider/jmdns/container/ContainerConfig.java index 388024bf5..408cff8af 100644 --- a/providers/bundles/org.eclipse.ecf.provider.jmdns/src/org/eclipse/ecf/provider/jmdns/container/ContainerConfig.java +++ b/providers/bundles/org.eclipse.ecf.provider.jmdns/src/org/eclipse/ecf/provider/jmdns/container/ContainerConfig.java @@ -13,8 +13,8 @@ package org.eclipse.ecf.provider.jmdns.container; import java.util.HashMap; import java.util.Map; -import org.eclipse.ecf.core.ISharedObjectContainerConfig; import org.eclipse.ecf.core.identity.ID; +import org.eclipse.ecf.core.sharedobject.ISharedObjectContainerConfig; public class ContainerConfig implements ISharedObjectContainerConfig { ID id; diff --git a/providers/bundles/org.eclipse.ecf.provider.remoteservice/src/org/eclipse/ecf/provider/remoteservice/generic/RegistrySharedObject.java b/providers/bundles/org.eclipse.ecf.provider.remoteservice/src/org/eclipse/ecf/provider/remoteservice/generic/RegistrySharedObject.java index f56f1d524..8967f4eea 100644 --- a/providers/bundles/org.eclipse.ecf.provider.remoteservice/src/org/eclipse/ecf/provider/remoteservice/generic/RegistrySharedObject.java +++ b/providers/bundles/org.eclipse.ecf.provider.remoteservice/src/org/eclipse/ecf/provider/remoteservice/generic/RegistrySharedObject.java @@ -22,11 +22,11 @@ import java.util.Map; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; -import org.eclipse.ecf.core.SharedObjectInitException; import org.eclipse.ecf.core.events.IContainerConnectedEvent; import org.eclipse.ecf.core.events.IContainerDisconnectedEvent; import org.eclipse.ecf.core.identity.ID; import org.eclipse.ecf.core.sharedobject.AbstractSharedObject; +import org.eclipse.ecf.core.sharedobject.SharedObjectInitException; import org.eclipse.ecf.core.sharedobject.SharedObjectMsg; import org.eclipse.ecf.core.util.ECFException; import org.eclipse.ecf.core.util.Event; diff --git a/providers/bundles/org.eclipse.ecf.provider.remoteservice/src/org/eclipse/ecf/provider/remoteservice/generic/RemoteServiceContainer.java b/providers/bundles/org.eclipse.ecf.provider.remoteservice/src/org/eclipse/ecf/provider/remoteservice/generic/RemoteServiceContainer.java index c750936f1..e3903d50b 100644 --- a/providers/bundles/org.eclipse.ecf.provider.remoteservice/src/org/eclipse/ecf/provider/remoteservice/generic/RemoteServiceContainer.java +++ b/providers/bundles/org.eclipse.ecf.provider.remoteservice/src/org/eclipse/ecf/provider/remoteservice/generic/RemoteServiceContainer.java @@ -10,8 +10,8 @@ package org.eclipse.ecf.provider.remoteservice.generic; import java.util.Dictionary; -import org.eclipse.ecf.core.ISharedObjectContainerConfig; import org.eclipse.ecf.core.identity.ID; +import org.eclipse.ecf.core.sharedobject.ISharedObjectContainerConfig; import org.eclipse.ecf.provider.generic.TCPClientSOContainer; import org.eclipse.ecf.remoteservice.IRemoteService; import org.eclipse.ecf.remoteservice.IRemoteServiceContainerAdapter; diff --git a/providers/bundles/org.eclipse.ecf.provider.remoteservice/src/org/eclipse/ecf/provider/remoteservice/generic/RemoteServiceContainerAdapterFactory.java b/providers/bundles/org.eclipse.ecf.provider.remoteservice/src/org/eclipse/ecf/provider/remoteservice/generic/RemoteServiceContainerAdapterFactory.java index 149ba8231..9354d4bd2 100644 --- a/providers/bundles/org.eclipse.ecf.provider.remoteservice/src/org/eclipse/ecf/provider/remoteservice/generic/RemoteServiceContainerAdapterFactory.java +++ b/providers/bundles/org.eclipse.ecf.provider.remoteservice/src/org/eclipse/ecf/provider/remoteservice/generic/RemoteServiceContainerAdapterFactory.java @@ -8,9 +8,9 @@ ******************************************************************************/ package org.eclipse.ecf.provider.remoteservice.generic; -import org.eclipse.ecf.core.AbstractSharedObjectContainerAdapterFactory; -import org.eclipse.ecf.core.ISharedObject; -import org.eclipse.ecf.core.ISharedObjectContainer; +import org.eclipse.ecf.core.sharedobject.AbstractSharedObjectContainerAdapterFactory; +import org.eclipse.ecf.core.sharedobject.ISharedObject; +import org.eclipse.ecf.core.sharedobject.ISharedObjectContainer; import org.eclipse.ecf.remoteservice.IRemoteServiceContainerAdapter; public class RemoteServiceContainerAdapterFactory extends AbstractSharedObjectContainerAdapterFactory { diff --git a/providers/bundles/org.eclipse.ecf.provider.remoteservice/src/org/eclipse/ecf/provider/remoteservice/generic/RemoteServiceContainerFactory.java b/providers/bundles/org.eclipse.ecf.provider.remoteservice/src/org/eclipse/ecf/provider/remoteservice/generic/RemoteServiceContainerFactory.java index 119ad2061..d3282bc37 100644 --- a/providers/bundles/org.eclipse.ecf.provider.remoteservice/src/org/eclipse/ecf/provider/remoteservice/generic/RemoteServiceContainerFactory.java +++ b/providers/bundles/org.eclipse.ecf.provider.remoteservice/src/org/eclipse/ecf/provider/remoteservice/generic/RemoteServiceContainerFactory.java @@ -14,10 +14,10 @@ import java.util.Map; import org.eclipse.ecf.core.ContainerCreateException; import org.eclipse.ecf.core.ContainerTypeDescription; import org.eclipse.ecf.core.IContainer; -import org.eclipse.ecf.core.ISharedObjectContainerConfig; import org.eclipse.ecf.core.identity.ID; import org.eclipse.ecf.core.identity.IDFactory; import org.eclipse.ecf.core.provider.IContainerInstantiator; +import org.eclipse.ecf.core.sharedobject.ISharedObjectContainerConfig; public class RemoteServiceContainerFactory implements IContainerInstantiator { diff --git a/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/container/IGroupChatContainerConfig.java b/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/container/IGroupChatContainerConfig.java index c28cbfcbc..8b463879e 100644 --- a/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/container/IGroupChatContainerConfig.java +++ b/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/container/IGroupChatContainerConfig.java @@ -10,7 +10,7 @@ *****************************************************************************/ package org.eclipse.ecf.provider.xmpp.container; -import org.eclipse.ecf.core.ISharedObjectContainerConfig; +import org.eclipse.ecf.core.sharedobject.ISharedObjectContainerConfig; public interface IGroupChatContainerConfig extends ISharedObjectContainerConfig { 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 26f5c9bcb..0224b90a6 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 @@ -21,7 +21,6 @@ import java.util.Vector; import org.eclipse.ecf.core.ContainerConnectException; import org.eclipse.ecf.core.ContainerCreateException; -import org.eclipse.ecf.core.SharedObjectAddException; import org.eclipse.ecf.core.comm.AsynchConnectionEvent; import org.eclipse.ecf.core.comm.ConnectionInstantiationException; import org.eclipse.ecf.core.comm.ISynchAsynchConnection; @@ -35,6 +34,7 @@ import org.eclipse.ecf.core.identity.Namespace; import org.eclipse.ecf.core.security.Callback; import org.eclipse.ecf.core.security.IConnectContext; import org.eclipse.ecf.core.security.ObjectCallback; +import org.eclipse.ecf.core.sharedobject.SharedObjectAddException; import org.eclipse.ecf.core.util.ECFException; import org.eclipse.ecf.core.util.Event; import org.eclipse.ecf.core.util.IQueueEnqueue; diff --git a/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/container/XMPPGroupChatSOContainer.java b/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/container/XMPPGroupChatSOContainer.java index 81f299c06..d2e4f5812 100644 --- a/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/container/XMPPGroupChatSOContainer.java +++ b/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/container/XMPPGroupChatSOContainer.java @@ -12,8 +12,6 @@ import java.io.IOException; import java.util.HashMap; import org.eclipse.ecf.core.ContainerConnectException; -import org.eclipse.ecf.core.ISharedObjectContainerConfig; -import org.eclipse.ecf.core.SharedObjectAddException; import org.eclipse.ecf.core.comm.ConnectionInstantiationException; import org.eclipse.ecf.core.comm.ISynchAsynchConnection; import org.eclipse.ecf.core.events.ContainerConnectedEvent; @@ -28,6 +26,8 @@ import org.eclipse.ecf.core.security.Callback; import org.eclipse.ecf.core.security.CallbackHandler; import org.eclipse.ecf.core.security.IConnectContext; import org.eclipse.ecf.core.security.NameCallback; +import org.eclipse.ecf.core.sharedobject.ISharedObjectContainerConfig; +import org.eclipse.ecf.core.sharedobject.SharedObjectAddException; import org.eclipse.ecf.core.util.IQueueEnqueue; import org.eclipse.ecf.presence.IMessageListener; import org.eclipse.ecf.presence.chat.IChatMessageSender; diff --git a/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/container/XMPPGroupChatSharedObject.java b/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/container/XMPPGroupChatSharedObject.java index cf9af783b..efc6c91fd 100644 --- a/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/container/XMPPGroupChatSharedObject.java +++ b/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/container/XMPPGroupChatSharedObject.java @@ -14,12 +14,12 @@ import java.net.URISyntaxException; import java.util.Iterator; import java.util.Vector; -import org.eclipse.ecf.core.ISharedObject; -import org.eclipse.ecf.core.ISharedObjectConfig; -import org.eclipse.ecf.core.ISharedObjectContext; -import org.eclipse.ecf.core.SharedObjectInitException; import org.eclipse.ecf.core.identity.ID; import org.eclipse.ecf.core.identity.Namespace; +import org.eclipse.ecf.core.sharedobject.ISharedObject; +import org.eclipse.ecf.core.sharedobject.ISharedObjectConfig; +import org.eclipse.ecf.core.sharedobject.ISharedObjectContext; +import org.eclipse.ecf.core.sharedobject.SharedObjectInitException; import org.eclipse.ecf.core.util.Event; import org.eclipse.ecf.presence.IMessageListener; import org.eclipse.ecf.presence.IPresence; diff --git a/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/container/XMPPPresenceSharedObject.java b/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/container/XMPPPresenceSharedObject.java index 6202fb992..1be92f116 100644 --- a/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/container/XMPPPresenceSharedObject.java +++ b/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/container/XMPPPresenceSharedObject.java @@ -14,18 +14,18 @@ import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Vector; -import org.eclipse.ecf.core.ISharedObject; -import org.eclipse.ecf.core.ISharedObjectConfig; -import org.eclipse.ecf.core.ISharedObjectContext; -import org.eclipse.ecf.core.SharedObjectInitException; -import org.eclipse.ecf.core.events.ISharedObjectActivatedEvent; import org.eclipse.ecf.core.events.IContainerConnectedEvent; import org.eclipse.ecf.core.events.IContainerDisconnectedEvent; -import org.eclipse.ecf.core.events.ISharedObjectDeactivatedEvent; -import org.eclipse.ecf.core.events.ISharedObjectMessageEvent; import org.eclipse.ecf.core.identity.ID; import org.eclipse.ecf.core.identity.IDFactory; import org.eclipse.ecf.core.identity.Namespace; +import org.eclipse.ecf.core.sharedobject.ISharedObject; +import org.eclipse.ecf.core.sharedobject.ISharedObjectConfig; +import org.eclipse.ecf.core.sharedobject.ISharedObjectContext; +import org.eclipse.ecf.core.sharedobject.SharedObjectInitException; +import org.eclipse.ecf.core.sharedobject.events.ISharedObjectActivatedEvent; +import org.eclipse.ecf.core.sharedobject.events.ISharedObjectDeactivatedEvent; +import org.eclipse.ecf.core.sharedobject.events.ISharedObjectMessageEvent; import org.eclipse.ecf.core.util.ECFException; import org.eclipse.ecf.core.util.Event; import org.eclipse.ecf.presence.IAccountManager; |