3:51 p.m.
Author: jolee
Date: 2012-03-22 16:51:52 -0400 (Thu, 22 Mar 2012)
New Revision: 3948
Added:
branches/7.4.x/client/src/main/resources/teiid-client-settings.orig.properties
Removed:
branches/7.4.x/client/src/main/resources/teiid-client-settings.properties
Modified:
branches/7.4.x/client/src/main/java/org/teiid/net/socket/SocketServerConnectionFactory.java
branches/7.4.x/documentation/client-developers-guide/src/main/docbook/en-US/content/jdbc-connection.xml
branches/7.4.x/documentation/client-developers-guide/src/main/docbook/en-US/content/ssl.xml
Log:
TEIID-1950 renaming the teiid-client-settings in the client to not interfere with signed
jars
Modified:
branches/7.4.x/client/src/main/java/org/teiid/net/socket/SocketServerConnectionFactory.java
===================================================================
---
branches/7.4.x/client/src/main/java/org/teiid/net/socket/SocketServerConnectionFactory.java 2012-03-19
15:53:55 UTC (rev 3947)
+++
branches/7.4.x/client/src/main/java/org/teiid/net/socket/SocketServerConnectionFactory.java 2012-03-22
20:51:52 UTC (rev 3948)
@@ -33,16 +33,7 @@
import java.net.NetworkInterface;
import java.net.SocketException;
import java.net.UnknownHostException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-import java.util.Timer;
-import java.util.TimerTask;
+import java.util.*;
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
@@ -158,7 +149,7 @@
private Map<CachedInstance, CachedInstance> instancePool = new
LinkedHashMap<CachedInstance, CachedInstance>();
//config properties
- private long synchronousTtl = 120000l;
+ private long synchronousTtl = 240000l;
private int maxCachedInstances=16;
public static synchronized SocketServerConnectionFactory getInstance() {
Copied: branches/7.4.x/client/src/main/resources/teiid-client-settings.orig.properties
(from rev 3945,
branches/7.4.x/client/src/main/resources/teiid-client-settings.properties)
===================================================================
--- branches/7.4.x/client/src/main/resources/teiid-client-settings.orig.properties
(rev 0)
+++
branches/7.4.x/client/src/main/resources/teiid-client-settings.orig.properties 2012-03-22
20:51:52 UTC (rev 3948)
@@ -0,0 +1,129 @@
+########################################
+# Settings file for Teiid clients
+########################################
+
+########################################
+# SSL Settings
+########################################
+
+#
+# The key store type. Defaults to JKS
+#
+
+org.teiid.ssl.keyStoreType=JKS
+
+#
+# The key store algorithm, defaults to
+# the system property "ssl.TrustManagerFactory.algorithm"
+#
+
+#org.teiid.ssl.algorithm=
+
+#
+# The classpath or filesystem location of the
+# key store.
+#
+# This property is required only if performing 2-way
+# authentication that requires a specific private
+# key.
+#
+
+#org.teiid.ssl.keyStore=
+
+#
+# The key store password (not required)
+#
+
+#org.teiid.ssl.keyStorePassword=
+
+#
+# The classpath or filesystem location of the
+# trust store.
+#
+# This property is required if performing 1-way
+# authentication that requires trust not provided
+# by the system defaults.
+#
+
+#org.teiid.ssl.trustStore=
+
+#
+# The trust store password (not required)
+#
+
+#org.teiid.ssl.trustStorePassword=
+
+#
+# The cipher protocol, defaults to TLSv1
+#
+
+org.teiid.ssl.protocol=TLSv1
+
+#
+# Whether to allow anonymous SSL
+# (the TLS_DH_anon_WITH_AES_128_CBC_SHA cipher suite)
+# defaults to true
+#
+
+org.teiid.ssl.allowAnon=true
+
+########################################
+# Misc Socket Configuration
+########################################
+
+#
+# The time in milliseconds for socket timeouts.
+# A timeout during the initialization, handshake, or
+# a server ping will be treated as an error.
+#
+# Setting this value too low may cause read errors.
+#
+
+org.teiid.sockets.soTimeout=3000
+
+#
+# The max number of cached server instances
+# to reuse. A server instance is a connected
+# socket to a particular cluster member with
+# client encryption and or SSL already established.
+#
+# Caching instances helps in 2 circumstances:
+# - when Connection pooling is not being used.
+# - load-balancing performance to a cluster
+# when using Connection pooling of the DataSource.
+#
+# This value should typically be a multiple of the
+# cluster size.
+#
+# Set to 0 to disable instance caching.
+#
+
+org.teiid.sockets.maxCachedInstances=16
+
+#
+# Set the max time to live (in milliseconds) for non-execution
+# synchronous calls.
+#
+
+org.teiid.sockets.synchronousttl=240000
+
+#
+# Set the socket receive buffer size (in bytes)
+# 0 indicates that the default socket setting will be used.
+#
+
+org.teiid.sockets.receiveBufferSize=0
+
+#
+# Set the socket send buffer size (in bytes)
+# 0 indicates that the default socket setting will be used.
+#
+
+org.teiid.sockets.sendBufferSize=0
+
+#
+# Set to true to enable Nagle's algorithm to conserve bandwidth
+# by minimizing the number of segments that are sent.
+#
+
+org.teiid.sockets.conserveBandwidth=false
Deleted: branches/7.4.x/client/src/main/resources/teiid-client-settings.properties
===================================================================
--- branches/7.4.x/client/src/main/resources/teiid-client-settings.properties 2012-03-19
15:53:55 UTC (rev 3947)
+++ branches/7.4.x/client/src/main/resources/teiid-client-settings.properties 2012-03-22
20:51:52 UTC (rev 3948)
@@ -1,129 +0,0 @@
-########################################
-# Settings file for Teiid clients
-########################################
-
-########################################
-# SSL Settings
-########################################
-
-#
-# The key store type. Defaults to JKS
-#
-
-org.teiid.ssl.keyStoreType=JKS
-
-#
-# The key store algorithm, defaults to
-# the system property "ssl.TrustManagerFactory.algorithm"
-#
-
-#org.teiid.ssl.algorithm=
-
-#
-# The classpath or filesystem location of the
-# key store.
-#
-# This property is required only if performing 2-way
-# authentication that requires a specific private
-# key.
-#
-
-#org.teiid.ssl.keyStore=
-
-#
-# The key store password (not required)
-#
-
-#org.teiid.ssl.keyStorePassword=
-
-#
-# The classpath or filesystem location of the
-# trust store.
-#
-# This property is required if performing 1-way
-# authentication that requires trust not provided
-# by the system defaults.
-#
-
-#org.teiid.ssl.trustStore=
-
-#
-# The trust store password (not required)
-#
-
-#org.teiid.ssl.trustStorePassword=
-
-#
-# The cipher protocol, defaults to TLSv1
-#
-
-org.teiid.ssl.protocol=TLSv1
-
-#
-# Whether to allow anonymous SSL
-# (the TLS_DH_anon_WITH_AES_128_CBC_SHA cipher suite)
-# defaults to true
-#
-
-org.teiid.ssl.allowAnon=true
-
-########################################
-# Misc Socket Configuration
-########################################
-
-#
-# The time in milliseconds for socket timeouts.
-# A timeout during the initialization, handshake, or
-# a server ping will be treated as an error.
-#
-# Setting this value too low may cause read errors.
-#
-
-org.teiid.sockets.soTimeout=3000
-
-#
-# The max number of cached server instances
-# to reuse. A server instance is a connected
-# socket to a particular cluster member with
-# client encryption and or SSL already established.
-#
-# Caching instances helps in 2 circumstances:
-# - when Connection pooling is not being used.
-# - load-balancing performance to a cluster
-# when using Connection pooling of the DataSource.
-#
-# This value should typically be a multiple of the
-# cluster size.
-#
-# Set to 0 to disable instance caching.
-#
-
-org.teiid.sockets.maxCachedInstances=16
-
-#
-# Set the max time to live (in milliseconds) for non-execution
-# synchronous calls.
-#
-
-org.teiid.sockets.synchronousttl=240000
-
-#
-# Set the socket receive buffer size (in bytes)
-# 0 indicates that the default socket setting will be used.
-#
-
-org.teiid.sockets.receiveBufferSize=0
-
-#
-# Set the socket send buffer size (in bytes)
-# 0 indicates that the default socket setting will be used.
-#
-
-org.teiid.sockets.sendBufferSize=0
-
-#
-# Set to true to enable Nagle's algorithm to conserve bandwidth
-# by minimizing the number of segments that are sent.
-#
-
-org.teiid.sockets.conserveBandwidth=false
Modified:
branches/7.4.x/documentation/client-developers-guide/src/main/docbook/en-US/content/jdbc-connection.xml
===================================================================
---
branches/7.4.x/documentation/client-developers-guide/src/main/docbook/en-US/content/jdbc-connection.xml 2012-03-19
15:53:55 UTC (rev 3947)
+++
branches/7.4.x/documentation/client-developers-guide/src/main/docbook/en-US/content/jdbc-connection.xml 2012-03-22
20:51:52 UTC (rev 3948)
@@ -547,9 +547,9 @@
</example>
</para>
<para>Teiid by default maintians a pool of extra socket connections that
are reused. For load balancing, this reduces the potential cost of switching a connection
to another server instance.
- The default setting is to maintain 16 connections (see
<code>org.teiid.sockets.maxCachedInstances</code> in the client jar's
teiid-client-settings.properties file.
+ The default setting is to maintain 16 connections (can be set via
<code>org.teiid.sockets.maxCachedInstances</code> in a
teiid-client-settings.properties file).
If you're client is connecting to large numbers of Teiid instances and
you're using post connection time load balancing, then consider increasing the number
of cached instances.
- You may either set an analogous system property or create another version of
teiid-client-settings.properties file and place it into the classpath ahead of the client
jar.</para>
+ You may either set an analogous system property or create a
teiid-client-settings.properties (see the teiid-client-settings.orig.properties file in
the client jar) file and place it into the classpath ahead of the client
jar.</para>
<note><para>Session level temporary tables, currently running
transactions, session level cache entries, and PreparedPlans for a given session will not
be available on other cluster members.
Therefore, it is recommended that post connection time load balancing is only
used when the logical connection could have been closed, but the actual connection is
reused (the typical connection pool pattern).</para></note>
</section>
Modified:
branches/7.4.x/documentation/client-developers-guide/src/main/docbook/en-US/content/ssl.xml
===================================================================
---
branches/7.4.x/documentation/client-developers-guide/src/main/docbook/en-US/content/ssl.xml 2012-03-19
15:53:55 UTC (rev 3947)
+++
branches/7.4.x/documentation/client-developers-guide/src/main/docbook/en-US/content/ssl.xml 2012-03-22
20:51:52 UTC (rev 3948)
@@ -98,13 +98,13 @@
certificate keystores is not allowed.</para>
<para>In this scenario, a different set of Teiid-specific SSL
properties can be set as system properties or defined inside
- the "teiid-client-settings.properties" file. The
"teiid-client-settings.properties" file
- can be found inside the "teiid-&versionNumber;-client.jar" file
at the root.
+ a "teiid-client-settings.properties" file. A sample
"teiid-client-settings.properties" file
+ can be found inside the "teiid-&versionNumber;-client.jar" file
at the root called "teiid-client-settings.orig.properties".
Extract this file, or make a copy, change the property values required for
the chosen SSL mode,
and place this file in the client application's classpath before
the "teiid-&versionNumber;-client.jar" file.</para>
- <para>SSL properties and definitions inside the
"teiid-client-settings.properties" are shown below.</para>
+ <para>SSL properties and definitions that can be set in a
"teiid-client-settings.properties" file are shown below.</para>
<programlisting><![CDATA[########################################
# SSL Settings