Changed default timeouts to 30000ms (rather than 10000ms) for all providers (both client and server)

5 files changed, 7 insertions, 7 deletions

diff --git a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ServerStartup.xml b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ServerStartup.xml
index 61399a028..d39048dd5 100644
--- a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ServerStartup.xml
+++ b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ServerStartup.xml
@@ -1,5 +1,5 @@
 <server>
-	<connector protocol="ecftcp"  hostname="localhost" port="3282" timeout="10000">
+	<connector protocol="ecftcp"  hostname="localhost" port="3282" timeout="30000">
 		<group name="server"/>
 	</connector>
 </server>
\ No newline at end of file
diff --git a/framework/bundles/org.eclipse.ecf.provider/conf/server.xml b/framework/bundles/org.eclipse.ecf.provider/conf/server.xml
index 61399a028..d39048dd5 100644
--- a/framework/bundles/org.eclipse.ecf.provider/conf/server.xml
+++ b/framework/bundles/org.eclipse.ecf.provider/conf/server.xml
@@ -1,5 +1,5 @@
 <server>
-	<connector protocol="ecftcp"  hostname="localhost" port="3282" timeout="10000">
+	<connector protocol="ecftcp"  hostname="localhost" port="3282" timeout="30000">
 		<group name="server"/>
 	</connector>
 </server>
\ No newline at end of file
diff --git a/framework/bundles/org.eclipse.ecf.provider/plugin.xml b/framework/bundles/org.eclipse.ecf.provider/plugin.xml
index 52c434f7b..919787b2b 100644
--- a/framework/bundles/org.eclipse.ecf.provider/plugin.xml
+++ b/framework/bundles/org.eclipse.ecf.provider/plugin.xml
@@ -11,7 +11,7 @@
                type="org.eclipse.ecf.core.identity.ID"
                name="id"/>
          <defaultargument
-               value="10000"
+               value="30000"
                type="java.lang.Integer"
                name="keepAlive"/>
          <property
@@ -32,7 +32,7 @@
             description="TCP Client Connection Factory"
             name="org.eclipse.ecf.provider.comm.tcp.Client">
          <defaultargument
-               value="10000"
+               value="30000"
                type="java.lang.Integer"
                name="keepAlive"/>
       </connectionFactory>
@@ -48,7 +48,7 @@
                type="org.eclipse.ecf.core.identity.ID"
                name="id"/>
          <defaultargument
-               value="10000"
+               value="30000"
                type="java.lang.Integer"
                name="keepAlive"/>
          <property
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 7a2d54220..d2d09012e 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
@@ -26,7 +26,7 @@ public class TCPServerSOContainer extends ServerSOContainer implements
         ConnectionRequestHandler {
     public static final String DEFAULT_PROTOCOL = "ecftcp";
     public static final int DEFAULT_PORT = 3282;
-    public static final int DEFAULT_KEEPALIVE = 10000;
+    public static final int DEFAULT_KEEPALIVE = 30000;
     public static final String DEFAULT_NAME = "/server";
     public static final String DEFAULT_HOST = "localhost";
     
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 b7927bc6b..c030ba2b7 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
@@ -60,7 +60,7 @@ import org.jivesoftware.smack.packet.Presence;
 
 public class XMPPClientSOContainer extends ClientSOContainer {
 
-	public static final int DEFAULT_KEEPALIVE = 10000;
+	public static final int DEFAULT_KEEPALIVE = 30000;
 	public static final String XMPP_SHARED_OBJECT_ID = XMPPClientSOContainer.class
 			.getName()
 			+ ".xmpphandler";