Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorslewis2016-10-10 00:33:14 +0000
committerslewis2016-10-10 00:33:14 +0000
commiteb9c0e6146c418167fe4d0a6e06f1a0c1e68a7ef (patch)
treee422e4df2f3d9aff640cd1cd25a1f8ab85843da0
parent1a8b4288a15f169cd0ebd6f45b2c97225e2c55b6 (diff)
downloadorg.eclipse.ecf-eb9c0e6146c418167fe4d0a6e06f1a0c1e68a7ef.tar.gz
org.eclipse.ecf-eb9c0e6146c418167fe4d0a6e06f1a0c1e68a7ef.tar.xz
org.eclipse.ecf-eb9c0e6146c418167fe4d0a6e06f1a0c1e68a7ef.zip
Changed TCPClientSOContainer to be 'server' containers, to allow them to
host remote service instances Change-Id: I6db56c4cab49f328a18a1b1d76def9b05a44b438
-rw-r--r--framework/bundles/org.eclipse.ecf.provider/plugin.xml2
-rw-r--r--framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/internal/provider/ProviderPlugin.java4
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.remoteservice/src/org/eclipse/ecf/provider/remoteservice/generic/RegistrySharedObject.java2
3 files changed, 5 insertions, 3 deletions
diff --git a/framework/bundles/org.eclipse.ecf.provider/plugin.xml b/framework/bundles/org.eclipse.ecf.provider/plugin.xml
index 2274ab0a2..c4d098dc6 100644
--- a/framework/bundles/org.eclipse.ecf.provider/plugin.xml
+++ b/framework/bundles/org.eclipse.ecf.provider/plugin.xml
@@ -16,6 +16,7 @@
class="org.eclipse.ecf.provider.generic.GenericContainerInstantiator"
description="ECF Generic Client"
hidden="true"
+ server="true"
name="ecf.generic.client">
</containerFactory>
</extension>
@@ -34,6 +35,7 @@
class="org.eclipse.ecf.provider.generic.SSLGenericContainerInstantiator"
description="ECF Generic Secure Client"
hidden="true"
+ server="true"
name="ecf.generic.ssl.client">
</containerFactory>
</extension>
diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/internal/provider/ProviderPlugin.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/internal/provider/ProviderPlugin.java
index fa91ca875..8c7aecfd9 100644
--- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/internal/provider/ProviderPlugin.java
+++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/internal/provider/ProviderPlugin.java
@@ -74,9 +74,9 @@ public class ProviderPlugin implements BundleActivator {
SafeRunner.run(new ExtensionRegistryRunnable(this.context) {
protected void runWithoutRegistry() throws Exception {
context1.registerService(ContainerTypeDescription.class, new ContainerTypeDescription(GenericContainerInstantiator.TCPSERVER_NAME, new GenericContainerInstantiator(), "ECF Generic Server", true, false), null); //$NON-NLS-1$
- context1.registerService(ContainerTypeDescription.class, new ContainerTypeDescription(GenericContainerInstantiator.TCPCLIENT_NAME, new GenericContainerInstantiator(), "ECF Generic Client", false, true), null); //$NON-NLS-1$
+ context1.registerService(ContainerTypeDescription.class, new ContainerTypeDescription(GenericContainerInstantiator.TCPCLIENT_NAME, new GenericContainerInstantiator(), "ECF Generic Client", true, true), null); //$NON-NLS-1$
context1.registerService(ContainerTypeDescription.class, new ContainerTypeDescription(SSLGenericContainerInstantiator.SSLSERVER_NAME, new SSLGenericContainerInstantiator(), "ECF SSL Generic Server", true, false), null); //$NON-NLS-1$
- context1.registerService(ContainerTypeDescription.class, new ContainerTypeDescription(SSLGenericContainerInstantiator.SSLCLIENT_NAME, new SSLGenericContainerInstantiator(), "ECF SSL Generic Client", false, true), null); //$NON-NLS-1$
+ context1.registerService(ContainerTypeDescription.class, new ContainerTypeDescription(SSLGenericContainerInstantiator.SSLCLIENT_NAME, new SSLGenericContainerInstantiator(), "ECF SSL Generic Client", true, true), null); //$NON-NLS-1$
}
});
if (genericClassResolverOverride) {
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 c10b31c6d..27d7e2a54 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
@@ -532,7 +532,7 @@ public class RegistrySharedObject extends BaseSharedObject implements IRemoteSer
return;
}
try {
- registryUpdateRequests.wait(500);
+ registryUpdateRequests.wait(100);
} catch (InterruptedException e) {
return;
}

Back to the top