diff options
4 files changed, 2 insertions, 8 deletions
diff --git a/examples/bundles/org.eclipse.ecf.example.sdo.editor/META-INF/MANIFEST.MF b/examples/bundles/org.eclipse.ecf.example.sdo.editor/META-INF/MANIFEST.MF index 22615b4d4..987d48dd3 100644 --- a/examples/bundles/org.eclipse.ecf.example.sdo.editor/META-INF/MANIFEST.MF +++ b/examples/bundles/org.eclipse.ecf.example.sdo.editor/META-INF/MANIFEST.MF @@ -9,10 +9,8 @@ Bundle-Localization: plugin Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, org.eclipse.core.resources, - org.eclipse.ecf, org.eclipse.ecf.sdo, org.eclipse.emf.ecore.sdo.editor, - org.eclipse.ecf.test.provider, org.eclipse.ecf.example.collab Eclipse-AutoStart: true Provide-Package: org.eclipse.ecf.example.sdo.editor diff --git a/examples/bundles/org.eclipse.ecf.example.sdo.editor/build.properties b/examples/bundles/org.eclipse.ecf.example.sdo.editor/build.properties index 5d7f3f2f0..fdb7933ee 100644 --- a/examples/bundles/org.eclipse.ecf.example.sdo.editor/build.properties +++ b/examples/bundles/org.eclipse.ecf.example.sdo.editor/build.properties @@ -2,4 +2,5 @@ source.editor.jar = src/ output.editor.jar = bin/ bin.includes = plugin.xml,\ META-INF/,\ - editor.jar + editor.jar,\ + icons/ 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 82381c9fe..c76374055 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 @@ -26,7 +26,6 @@ import org.eclipse.ecf.sdo.SDOPlugin; import org.eclipse.ecf.sdo.WaitablePublicationCallback; import org.eclipse.ecf.sdo.WaitableSubscriptionCallback; import org.eclipse.ecf.sdo.emf.EMFUpdateProvider; -import org.eclipse.ecf.test.EventSpy; import org.eclipse.ui.plugin.AbstractUIPlugin; import org.osgi.framework.BundleContext; @@ -188,9 +187,6 @@ public class EditorPlugin extends AbstractUIPlugin { } this.tracker = tracker; - container.getSharedObjectManager() - .addSharedObject(IDFactory.makeStringID("debug"), - new EventSpy(), null, null); } } }
\ No newline at end of file diff --git a/examples/bundles/org.eclipse.ecf.sdo/META-INF/MANIFEST.MF b/examples/bundles/org.eclipse.ecf.sdo/META-INF/MANIFEST.MF index e96a9a8e6..6b8436287 100644 --- a/examples/bundles/org.eclipse.ecf.sdo/META-INF/MANIFEST.MF +++ b/examples/bundles/org.eclipse.ecf.sdo/META-INF/MANIFEST.MF @@ -7,7 +7,6 @@ Bundle-Activator: org.eclipse.ecf.sdo.SDOPlugin Bundle-Vendor: Eclipse.org Bundle-Localization: plugin Require-Bundle: org.eclipse.core.runtime, - org.eclipse.emf.ecore;reprovide=true, org.eclipse.emf.ecore.sdo;reprovide=true, org.eclipse.ecf;reprovide=true Eclipse-AutoStart: true |