Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorslewis2008-12-07 19:58:36 +0000
committerslewis2008-12-07 19:58:36 +0000
commit1d2c5266c4279665265424e10b866fcd55653503 (patch)
treea15d410a14a7cdf73d54902877e483bbbe9af6c0
parent03b774c0efa2a5b5769b1bf1a8ca04a3b714a640 (diff)
downloadorg.eclipse.ecf-1d2c5266c4279665265424e10b866fcd55653503.tar.gz
org.eclipse.ecf-1d2c5266c4279665265424e10b866fcd55653503.tar.xz
org.eclipse.ecf-1d2c5266c4279665265424e10b866fcd55653503.zip
Removed unnecessary applications and added output to system.out for GenericServer.stop
-rw-r--r--server-side/bundles/org.eclipse.ecf.server.generic/META-INF/MANIFEST.MF2
-rw-r--r--server-side/bundles/org.eclipse.ecf.server.generic/plugin.xml19
-rw-r--r--server-side/bundles/org.eclipse.ecf.server.generic/src/org/eclipse/ecf/server/generic/app/GenericServer.java2
3 files changed, 7 insertions, 16 deletions
diff --git a/server-side/bundles/org.eclipse.ecf.server.generic/META-INF/MANIFEST.MF b/server-side/bundles/org.eclipse.ecf.server.generic/META-INF/MANIFEST.MF
index f785d8e59..9e49626de 100644
--- a/server-side/bundles/org.eclipse.ecf.server.generic/META-INF/MANIFEST.MF
+++ b/server-side/bundles/org.eclipse.ecf.server.generic/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %plugin.name
Bundle-SymbolicName: org.eclipse.ecf.server.generic;singleton:=true
-Bundle-Version: 1.2.0.qualifier
+Bundle-Version: 1.2.1.qualifier
Bundle-Activator: org.eclipse.ecf.internal.server.generic.Activator
Bundle-Vendor: %plugin.provider
Bundle-Localization: plugin
diff --git a/server-side/bundles/org.eclipse.ecf.server.generic/plugin.xml b/server-side/bundles/org.eclipse.ecf.server.generic/plugin.xml
index 4f8eeb6eb..aaf2a8938 100644
--- a/server-side/bundles/org.eclipse.ecf.server.generic/plugin.xml
+++ b/server-side/bundles/org.eclipse.ecf.server.generic/plugin.xml
@@ -2,7 +2,7 @@
<?eclipse version="3.2"?>
<plugin>
<extension-point id="configuration" name="ECF Generic Server Configuration" schema="schema/configuration.exsd"/>
-<!--
+<!-- Example use of org.eclipse.ecf.server.generic.configuration extension point
<extension
point="org.eclipse.ecf.server.generic.configuration">
<connector
@@ -18,7 +18,7 @@
-->
<!-- Eclipse 3.3.0 has a bug that doesn't allow 'any' threads to run as main apps -->
- <extension
+<!-- <extension
id="org.eclipse.ecf.provider.AppGenericServer"
point="org.eclipse.core.runtime.applications">
<application
@@ -29,25 +29,14 @@
class="org.eclipse.ecf.server.generic.app.GenericServer"/>
</application>
</extension>
+ -->
<!-- Eclipse 3.3.1 may have a fix to allow this to run in either main/any thread -->
<extension
- id="org.eclipse.ecf.provider.GenericServer"
- point="org.eclipse.core.runtime.applications">
- <application
- cardinality="*"
- thread="any"
- visible="true">
- <run
- class="org.eclipse.ecf.server.generic.app.GenericServer"/>
- </application>
- </extension>
-
- <extension
id="Server"
point="org.eclipse.core.runtime.applications">
<application
cardinality="*"
- thread="main"
+ thread="any"
visible="true">
<run
class="org.eclipse.ecf.server.generic.app.GenericServer"/>
diff --git a/server-side/bundles/org.eclipse.ecf.server.generic/src/org/eclipse/ecf/server/generic/app/GenericServer.java b/server-side/bundles/org.eclipse.ecf.server.generic/src/org/eclipse/ecf/server/generic/app/GenericServer.java
index 02048c571..a8ef605c5 100644
--- a/server-side/bundles/org.eclipse.ecf.server.generic/src/org/eclipse/ecf/server/generic/app/GenericServer.java
+++ b/server-side/bundles/org.eclipse.ecf.server.generic/src/org/eclipse/ecf/server/generic/app/GenericServer.java
@@ -183,6 +183,7 @@ public class GenericServer implements IApplication {
for (final Iterator i = serverGroups.keySet().iterator(); i.hasNext();) {
final TCPServerSOContainerGroup serverGroup = (TCPServerSOContainerGroup) serverGroups.get(i.next());
serverGroup.takeOffTheAir();
+ System.out.println("Taking " + serverGroup.getName() + ":" + serverGroup.getPort() + " off the air"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
final Iterator iter = serverGroup.elements();
for (; iter.hasNext();) {
final TCPServerSOContainer container = (TCPServerSOContainer) iter.next();
@@ -190,6 +191,7 @@ public class GenericServer implements IApplication {
}
}
}
+ serverGroups.clear();
synchronized (this) {
this.notify();
}

Back to the top