admin@glassfish.java.net

diffs for changes to JDBCConnectionPoolConfig, ConnectorConnectionPoolConfig (bug #1638)

From: Lloyd L Chambers <Lloyd.Chambers_at_Sun.COM>
Date: Tue, 19 Dec 2006 12:15:17 -0800

https://glassfish.dev.java.net/issues/show_bug.cgi?id=1638

Anissa,

Here are the diffs. I have not corrected pre-9.1 'boolean' and 'int'
methods as that's an incompatible change, and quite a few other files
are affected (see bug #1804).

I did a clean build, but admin-gui compiled fine? I was expecting
compile-time errors in admin-gui because of the changes from
'boolean' to 'String'. Please advise.

Thanks,
Lloyd


Index: src/java/com/sun/appserv/management/config/
ConnectorConnectionPoolConfig.java
===================================================================
RCS file: /cvs/glassfish/appserv-api/src/java/com/sun/appserv/
management/config/ConnectorConnectionPoolConfig.java,v
retrieving revision 1.1
diff -u -r1.1 ConnectorConnectionPoolConfig.java
--- src/java/com/sun/appserv/management/config/
ConnectorConnectionPoolConfig.java 2 Dec 2006 06:03:02
-0000 1.1
+++ src/java/com/sun/appserv/management/config/
ConnectorConnectionPoolConfig.java 19 Dec 2006 20:10:13 -0000
@@ -45,7 +45,17 @@
      connections, at run time.
      <p>
      There can be more than one pool for one connection-definition
in one
- resource-adapter.
+ resource-adapter.
+ <p>
+ NOTE: some getters/setters use int/boolean. This will be
corrected at a future time; these
+ methods cannot use the AppServer template facility, whereby an
Attribute value can be of
+ the form attr-name=${ATTR_VALUE}. For an example of where/how
this facility is used, see
+ the &lt;http-listener> element, which looks like this:<br/>
+<pre>
+&lt;http-listener id="http-listener-1" address="0.0.0.0" port="$
{HTTP_LISTENER_PORT}" acceptor-threads="1" security-enabled="false"
default-virtual server="server" server-name="" xpowered-by="true"
enabled="true">
+</pre>
+ The 'port' attribute above is set to the value "$
{HTTP_LISTENER_PORT}", which is a system
+ property. Obviously no method that uses 'boolean' could get or
set a String.
*/
public interface ConnectorConnectionPoolConfig
@@ -217,13 +227,13 @@
           on leak tracing.
           @since AppServer 9.1
       */
- int getConnectionLeakTimeoutInSeconds();
+ String getConnectionLeakTimeoutInSeconds();

      /**
          @see #getConnectionLeakTimeoutInSeconds
          @since AppServer 9.1
       */
- void getConnectionLeakTimeoutInSeconds( int timeout );
+ void setConnectionLeakTimeoutInSeconds( String timeout );

      /**
          connection-leak-reclaim (boolean) <br>
@@ -231,13 +241,13 @@
           connection-leak-timeout-in-seconds occurs. Default value
is false.
           @since AppServer 9.1
       */
- boolean getConnectionLeakReclaim();
+ String getConnectionLeakReclaim();

      /**
          @see #getConnectionLeakReclaim
          @since AppServer 9.1
       */
- void setConnectionLeakReclaim( boolean reclaim );
+ void setConnectionLeakReclaim( String reclaim );

      /**
          connection-creation-retry-attempts (integer)<br>
@@ -245,13 +255,13 @@
           implies no retries.
           @since AppServer 9.1
       */
- int getConnectionCreationRetryAttempts();
+ String getConnectionCreationRetryAttempts();

      /**
          @see #getConnectionCreationRetryAttempts
          @since AppServer 9.1
       */
- void setConnectionCreationRetryAttempts( int count );
+ void setConnectionCreationRetryAttempts( String count );

      /**
          connection-creation-retry-interval-in-seconds (integer) <br>
@@ -260,13 +270,13 @@
           greater than 0.
           @since AppServer 9.1
       */
- int getConnectionCreationRetryIntervalInSeconds();
+ String getConnectionCreationRetryIntervalInSeconds();

      /**
          @see #getConnectionCreationRetryIntervalInSeconds
          @since AppServer 9.1
       */
- void setConnectionCreationRetryIntervalInSeconds( int
seconds );
+ void setConnectionCreationRetryIntervalInSeconds( String
seconds );

      /**
          validate-atmost-once-period-in-seconds (integer) <br>
@@ -274,13 +284,13 @@
           Default is 0 seconds, not enabled.
           @since AppServer 9.1
       */
- int getValidateAtMostOncePeriodInSeconds();
+ String getValidateAtMostOncePeriodInSeconds();

      /**
          @see #getValidateAtMostOncePeriodInSeconds
          @since AppServer 9.1
       */
- void setValidateAtMostOncePeriodInSeconds( int seconds );
+ void setValidateAtMostOncePeriodInSeconds( String seconds );

      /**
       lazy-connection-enlistment (boolean)<br>
@@ -290,13 +300,13 @@
           cached in the calling components. Default value is false.
           @since AppServer 9.1
       */
- boolean getLazyConnectionEnlistment();
+ String getLazyConnectionEnlistment();

      /**
          @see #getLazyConnectionEnlistment
          @since AppServer 9.1
       */
- void setLazyConnectionEnlistment( boolean enlist );
+ void setLazyConnectionEnlistment( String enlist );

      /**
          lazy-connection-association (boolean)<br>
@@ -306,13 +316,13 @@
           connections. Default value is false.
           @since AppServer 9.1
       */
- boolean getLazyConnectionAssociation();
+ String getLazyConnectionAssociation();

      /**
          @see #getLazyConnectionAssociation
          @since AppServer 9.1
       */
- void setLazyConnectionAssociation( boolean associate);
+ void setLazyConnectionAssociation( String associate);

      /**
          associate-with-thread (boolean)<br>
@@ -322,14 +332,14 @@
          of getting a connection from the pool. Default value is false.
           @since AppServer 9.1
       */
- boolean getAssociateWithThread();
+ String getAssociateWithThread();

      /**
          @see #getAssociateWithThread
          @since AppServer 9.1
       */
- void getAssociateWithThread( boolean associate);
+ void getAssociateWithThread( String associate);

      /**
@@ -340,14 +350,14 @@
          need not be matched by the resource adapter. Default value
is true.
           @since AppServer 9.1
       */
- boolean getMatchConnections();
+ String getMatchConnections();

      /**
          @see #getMatchConnections
          @since AppServer 9.1
       */
- void setMatchConnections( boolean match );
+ void setMatchConnections( String match );

      /**
          max-connection-usage-count<br>
@@ -356,14 +366,14 @@
          Default value is 0, which implies the feature is not enabled.
           @since AppServer 9.1
       */
- int getMaxConnectionUsageCount();
+ String getMaxConnectionUsageCount();

      /**
          @see #getMaxConnectionUsageCount
          @since AppServer 9.1
       */
- void setMaxConnectionUsageCount( int count);
+ void setMaxConnectionUsageCount( String count);
}
Index: src/java/com/sun/appserv/management/config/
JDBCConnectionPoolConfig.java
===================================================================
RCS file: /cvs/glassfish/appserv-api/src/java/com/sun/appserv/
management/config/JDBCConnectionPoolConfig.java,v
retrieving revision 1.1
diff -u -r1.1 JDBCConnectionPoolConfig.java
--- src/java/com/sun/appserv/management/config/
JDBCConnectionPoolConfig.java 2 Dec 2006 06:03:10 -0000 1.1
+++ src/java/com/sun/appserv/management/config/
JDBCConnectionPoolConfig.java 19 Dec 2006 20:10:13 -0000
@@ -36,6 +36,16 @@
/**
          Configuration for the &lt;jdbc-connection-pool&gt; element.
+ <p>
+ NOTE: some getters/setters use java.lang.boolean. This is a
problem; these
+ methods cannot use the AppServer template facility, whereby an
Attribute value can be of
+ the form attr-name=${ATTR_VALUE}. For an example of where/how
this facility is used, see
+ the &lt;http-listener> element, which looks like this:<br/>
+<pre>
+&lt;http-listener id="http-listener-1" address="0.0.0.0" port="$
{HTTP_LISTENER_PORT}" acceptor-threads="1" security-enabled="false"
default-virtual server="server" server-name="" xpowered-by="true"
enabled="true">
+</pre>
+ The 'port' attribute above is set to the value "$
{HTTP_LISTENER_PORT}", which is a system
+ property. Obviously no method that uses 'boolean' could get or
set a String.
*/
public interface JDBCConnectionPoolConfig
@@ -136,13 +146,13 @@
           on leak tracing.
           @since AppServer 9.1
       */
- int getConnectionLeakTimeoutInSeconds();
+ String getConnectionLeakTimeoutInSeconds();

      /**
          @see #getConnectionLeakTimeoutInSeconds
          @since AppServer 9.1
       */
- void getConnectionLeakTimeoutInSeconds( int timeout );
+ void setConnectionLeakTimeoutInSeconds( String timeout );

      /**
          connection-leak-reclaim (boolean) <br>
@@ -150,13 +160,13 @@
           connection-leak-timeout-in-seconds occurs. Default value
is false.
           @since AppServer 9.1
       */
- boolean getConnectionLeakReclaim();
+ String getConnectionLeakReclaim();

      /**
          @see #getConnectionLeakReclaim
          @since AppServer 9.1
       */
- void setConnectionLeakReclaim( boolean reclaim );
+ void setConnectionLeakReclaim( String reclaim );

      /**
          connection-creation-retry-attempts (integer)<br>
@@ -164,13 +174,13 @@
           implies no retries.
           @since AppServer 9.1
       */
- int getConnectionCreationRetryAttempts();
+ String getConnectionCreationRetryAttempts();

      /**
          @see #getConnectionCreationRetryAttempts
          @since AppServer 9.1
       */
- void setConnectionCreationRetryAttempts( int count );
+ void setConnectionCreationRetryAttempts( String count );

      /**
          connection-creation-retry-interval-in-seconds (integer) <br>
@@ -179,13 +189,13 @@
           greater than 0.
           @since AppServer 9.1
       */
- int getConnectionCreationRetryIntervalInSeconds();
+ String getConnectionCreationRetryIntervalInSeconds();

      /**
          @see #getConnectionCreationRetryIntervalInSeconds
          @since AppServer 9.1
       */
- void setConnectionCreationRetryIntervalInSeconds( int
seconds );
+ void setConnectionCreationRetryIntervalInSeconds( String
seconds );

      /**
          validate-atmost-once-period-in-seconds (integer) <br>
@@ -193,13 +203,13 @@
           Default is 0 seconds, not enabled.
           @since AppServer 9.1
       */
- int getValidateAtMostOncePeriodInSeconds();
+ String getValidateAtMostOncePeriodInSeconds();

      /**
          @see #getValidateAtMostOncePeriodInSeconds
          @since AppServer 9.1
       */
- void setValidateAtMostOncePeriodInSeconds( int seconds );
+ void setValidateAtMostOncePeriodInSeconds( String seconds );

      /**
       lazy-connection-enlistment (boolean)<br>
@@ -209,13 +219,13 @@
           cached in the calling components. Default value is false.
           @since AppServer 9.1
       */
- boolean getLazyConnectionEnlistment();
+ String getLazyConnectionEnlistment();

      /**
          @see #getLazyConnectionEnlistment
          @since AppServer 9.1
       */
- void setLazyConnectionEnlistment( boolean enlist );
+ void setLazyConnectionEnlistment( String enlist );

      /**
          lazy-connection-association (boolean)<br>
@@ -225,13 +235,13 @@
           connections. Default value is false.
           @since AppServer 9.1
       */
- boolean getLazyConnectionAssociation();
+ String getLazyConnectionAssociation();

      /**
          @see #getLazyConnectionAssociation
          @since AppServer 9.1
       */
- void setLazyConnectionAssociation( boolean associate);
+ void setLazyConnectionAssociation( String associate);

      /**
          associate-with-thread (boolean)<br>
@@ -241,14 +251,14 @@
          of getting a connection from the pool. Default value is false.
           @since AppServer 9.1
       */
- boolean getAssociateWithThread();
+ String getAssociateWithThread();

      /**
          @see #getAssociateWithThread
          @since AppServer 9.1
       */
- void getAssociateWithThread( boolean associate);
+ void getAssociateWithThread( String associate);

      /**
@@ -259,14 +269,14 @@
          need not be matched by the resource adapter. Default value
is true.
           @since AppServer 9.1
       */
- boolean getMatchConnections();
+ String getMatchConnections();

      /**
          @see #getMatchConnections
          @since AppServer 9.1
       */
- void setMatchConnections( boolean match );
+ void setMatchConnections( String match );

      /**
          max-connection-usage-count<br>
@@ -275,14 +285,14 @@
          Default value is 0, which implies the feature is not enabled.
           @since AppServer 9.1
       */
- int getMaxConnectionUsageCount();
+ String getMaxConnectionUsageCount();

      /**
          @see #getMaxConnectionUsageCount
          @since AppServer 9.1
       */
- void setMaxConnectionUsageCount( int count);
+ void setMaxConnectionUsageCount( String count);

      /**
@@ -291,13 +301,26 @@
         PreparedStatement, CallableStatement, ResultSet,
DatabaseMetaData.
           @since AppServer 9.1
       */
- boolean getWrapJDBCObjects();
+ String getWrapJDBCObjects();

       /**
          @see #getWrapJDBCObjects
           @since AppServer 9.1
        */
- void setWrapJDBCObjects( boolean wrap );
+ void setWrapJDBCObjects( String wrap );
+
+
+ /**
+ associate-with-thread (integer)<br>
+ @since AppServer 9.1
+ */
+ String getStatementTimeoutInSeconds();
+
+ /**
+ associate-with-thread (integer)<br>
+ @since AppServer 9.1
+ */
+ void setStatementTimeoutInSeconds( final String value );
}