Additional modifications and simplification of discovery view. Moved number of support classes for discovery view to internal package. Moved AbstractRemoteServiceAccessHandler to discovery.ui.views

2 files changed, 6 insertions, 2 deletions

diff --git a/server-side/examples/bundles/org.eclipse.ecf.examples.updatesite.server/launch/Remote Updatesite Server.launch b/server-side/examples/bundles/org.eclipse.ecf.examples.updatesite.server/launch/Remote Updatesite Server.launch
index a11c4ddda..7f1aaa818 100644
--- a/server-side/examples/bundles/org.eclipse.ecf.examples.updatesite.server/launch/Remote Updatesite Server.launch
+++ b/server-side/examples/bundles/org.eclipse.ecf.examples.updatesite.server/launch/Remote Updatesite Server.launch
@@ -16,7 +16,7 @@
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dorg.osgi.service.http.port=8081"/>
 <stringAttribute key="pde.version" value="3.3"/>
 <booleanAttribute key="show_selected_only" value="true"/>
-<stringAttribute key="target_bundles" value="javax.servlet@default:default,org.apache.commons.logging@default:default,org.apache.commons.logging@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.runtime@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.core.runtime.compatibility.registry@default:default,org.eclipse.equinox.app@default:true,org.eclipse.equinox.common@default:default,org.eclipse.equinox.http.jetty@default:true,org.eclipse.equinox.http.registry@default:true,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.osgi@:,org.eclipse.osgi.services@default:default,org.eclipse.osgi.util@default:default,org.mortbay.jetty@default:default"/>
+<stringAttribute key="target_bundles" value="javax.servlet@default:default,org.apache.commons.logging@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.runtime@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.equinox.app@default:true,org.eclipse.equinox.common@default:default,org.eclipse.equinox.http.jetty@default:true,org.eclipse.equinox.http.registry@default:true,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.osgi@:,org.eclipse.osgi.services@default:default,org.eclipse.osgi.util@default:default,org.mortbay.jetty@default:default"/>
 <booleanAttribute key="tracing" value="false"/>
 <booleanAttribute key="useDefaultConfigArea" value="true"/>
 <stringAttribute key="workspace_bundles" value="org.eclipse.ecf@default:default,org.eclipse.ecf.discovery@default:default,org.eclipse.ecf.examples.updatesite.server@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.ecf.provider.jmdns@default:true"/>
diff --git a/server-side/examples/bundles/org.eclipse.ecf.examples.updatesite.server/src/org/eclipse/ecf/internal/examples/updatesite/DiscoverableServer.java b/server-side/examples/bundles/org.eclipse.ecf.examples.updatesite.server/src/org/eclipse/ecf/internal/examples/updatesite/DiscoverableServer.java
index c271dfaa9..16c5bf178 100644
--- a/server-side/examples/bundles/org.eclipse.ecf.examples.updatesite.server/src/org/eclipse/ecf/internal/examples/updatesite/DiscoverableServer.java
+++ b/server-side/examples/bundles/org.eclipse.ecf.examples.updatesite.server/src/org/eclipse/ecf/internal/examples/updatesite/DiscoverableServer.java
@@ -15,6 +15,7 @@ import java.net.URL;
 import java.security.InvalidParameterException;
 import java.util.Map;
 import javax.naming.ServiceUnavailableException;
+import org.eclipse.ecf.core.ContainerFactory;
 import org.eclipse.ecf.core.util.ECFException;
 import org.eclipse.ecf.discovery.*;
 import org.eclipse.ecf.discovery.identity.IServiceID;
@@ -58,8 +59,11 @@ public class DiscoverableServer implements IApplication {
 		Map args = ctxt.getArguments();
 		initializeFromArguments((String[]) args.get("application.args")); //$NON-NLS-1$
 
+		// Load and start ECF core bundles (to execute ecfstart jobs like discovery providers)
+		ContainerFactory.getDefault().getDescriptions();
+
 		// get discovery service
-		discovery = Activator.getDefault().waitForDiscoveryService(2000);
+		discovery = Activator.getDefault().waitForDiscoveryService(5000);
 		if (discovery == null)
 			throw new ServiceUnavailableException("Discovery service not found."); //$NON-NLS-1$