geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From viol...@apache.org
Subject svn commit: r1189034 - in /geronimo/server/trunk/plugins: connector-1_6/ connector-1_6/db-connectors/ connector-1_6/db-connectors/src/main/history/ system-database/sysdb-console-jetty/src/main/plan/ system-database/sysdb-console-tomcat/src/main/plan/ s...
Date Wed, 26 Oct 2011 06:17:39 GMT
Author: violalu
Date: Wed Oct 26 06:17:38 2011
New Revision: 1189034

URL: http://svn.apache.org/viewvc?rev=1189034&view=rev
Log:
GERONIMO-6202 tranql update

Modified:
    geronimo/server/trunk/plugins/connector-1_6/db-connectors/pom.xml
    geronimo/server/trunk/plugins/connector-1_6/db-connectors/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/connector-1_6/pom.xml
    geronimo/server/trunk/plugins/system-database/sysdb-console-jetty/src/main/plan/plan.xml
    geronimo/server/trunk/plugins/system-database/sysdb-console-tomcat/src/main/plan/plan.xml
    geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/i18n-resources/systemdatabase_en.properties
    geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java

Modified: geronimo/server/trunk/plugins/connector-1_6/db-connectors/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/db-connectors/pom.xml?rev=1189034&r1=1189033&r2=1189034&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/db-connectors/pom.xml (original)
+++ geronimo/server/trunk/plugins/connector-1_6/db-connectors/pom.xml Wed Oct 26 06:17:38
2011
@@ -168,6 +168,12 @@
         
         <dependency>
             <groupId>org.tranql</groupId>
+            <artifactId>tranql-connector-sqlserver2008-xa</artifactId>
+            <type>rar</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.tranql</groupId>
             <artifactId>tranql-connector-db2ISeries-xa</artifactId>
             <type>rar</type>
         </dependency>

Modified: geronimo/server/trunk/plugins/connector-1_6/db-connectors/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/db-connectors/src/main/history/dependencies.xml?rev=1189034&r1=1189033&r2=1189034&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/db-connectors/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/plugins/connector-1_6/db-connectors/src/main/history/dependencies.xml
Wed Oct 26 06:17:38 2011
@@ -81,4 +81,9 @@
         <artifactId>tranql-connector-sqlserver2005-xa</artifactId>
         <type>rar</type>
     </dependency>
+    <dependency>
+            <groupId>org.tranql</groupId>
+            <artifactId>tranql-connector-sqlserver2008-xa</artifactId>
+            <type>rar</type>
+        </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/plugins/connector-1_6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/pom.xml?rev=1189034&r1=1189033&r2=1189034&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/pom.xml (original)
+++ geronimo/server/trunk/plugins/connector-1_6/pom.xml Wed Oct 26 06:17:38 2011
@@ -199,7 +199,7 @@
             <dependency>
                 <groupId>org.tranql</groupId>
                 <artifactId>tranql-connector-db2-xa</artifactId>
-                <version>1.6</version>
+                <version>1.7</version>
                 <type>rar</type>
                 <exclusions>
                     <exclusion>
@@ -385,12 +385,29 @@
             
             <dependency>
                 <groupId>org.tranql</groupId>
-                <artifactId>tranql-connector-db2ISeries-xa</artifactId>
+                <artifactId>tranql-connector-sqlserver2008-xa</artifactId>
                 <version>1.0</version>
                 <type>rar</type>
                 <exclusions>
                     <exclusion>
                         <groupId>org.tranql</groupId>
+                        <artifactId>tranql-connector-sqlserver2008-common</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.tranql</groupId>
+                        <artifactId>tranql-connector</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+            
+            <dependency>
+                <groupId>org.tranql</groupId>
+                <artifactId>tranql-connector-db2ISeries-xa</artifactId>
+                <version>1.1</version>
+                <type>rar</type>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.tranql</groupId>
                         <artifactId>tranql-connector-db2ISeries-common</artifactId>
                     </exclusion>
                     <exclusion>

Modified: geronimo/server/trunk/plugins/system-database/sysdb-console-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/sysdb-console-jetty/src/main/plan/plan.xml?rev=1189034&r1=1189033&r2=1189034&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/sysdb-console-jetty/src/main/plan/plan.xml
(original)
+++ geronimo/server/trunk/plugins/system-database/sysdb-console-jetty/src/main/plan/plan.xml
Wed Oct 26 06:17:38 2011
@@ -402,6 +402,14 @@ limitations under the License.
         <attribute name="specific">true</attribute>
         <attribute name="RARName">org.tranql/tranql-connector-sqlserver2005-xa//rar</attribute>
     </gbean>
+    <gbean name="Database283" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+        <attribute name="name">SQL Server 2008 XA</attribute>
+        <attribute name="URLPrototype">null</attribute>
+        <attribute name="driverClassName">null</attribute>
+        <attribute name="defaultPort">0</attribute>
+        <attribute name="specific">true</attribute>
+        <attribute name="RARName">org.tranql/tranql-connector-sqlserver2008-xa//rar</attribute>
+    </gbean>
     <gbean name="Database29" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
         <attribute name="name">SQL Server (jTDS)</attribute>
         <attribute name="URLPrototype">jdbc:jtds:sqlserver://{Host}:{Port};DatabaseName={Database}</attribute>

Modified: geronimo/server/trunk/plugins/system-database/sysdb-console-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/sysdb-console-tomcat/src/main/plan/plan.xml?rev=1189034&r1=1189033&r2=1189034&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/sysdb-console-tomcat/src/main/plan/plan.xml
(original)
+++ geronimo/server/trunk/plugins/system-database/sysdb-console-tomcat/src/main/plan/plan.xml
Wed Oct 26 06:17:38 2011
@@ -403,6 +403,14 @@ limitations under the License.
         <attribute name="specific">true</attribute>
         <attribute name="RARName">org.tranql/tranql-connector-sqlserver2005-xa//rar</attribute>
     </gbean>
+    <gbean name="Database283" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+        <attribute name="name">SQL Server 2008 XA</attribute>
+        <attribute name="URLPrototype">null</attribute>
+        <attribute name="driverClassName">null</attribute>
+        <attribute name="defaultPort">0</attribute>
+        <attribute name="specific">true</attribute>
+        <attribute name="RARName">org.tranql/tranql-connector-sqlserver2008-xa//rar</attribute>
+    </gbean>
     <gbean name="Database29" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
         <attribute name="name">SQL Server (jTDS)</attribute>
         <attribute name="URLPrototype">jdbc:jtds:sqlserver://{Host}:{Port};DatabaseName={Database}</attribute>

Modified: geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/i18n-resources/systemdatabase_en.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/i18n-resources/systemdatabase_en.properties?rev=1189034&r1=1189033&r2=1189034&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/i18n-resources/systemdatabase_en.properties
(original)
+++ geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/i18n-resources/systemdatabase_en.properties
Wed Oct 26 06:17:38 2011
@@ -371,6 +371,23 @@ dbwizard.tranql-connector-sqlserver2005-
 dbwizard.tranql-connector-sqlserver2005-xa.UserNameExp             = The case-insensitive
username used to connect to your SQL Server database.
 dbwizard.tranql-connector-sqlserver2005-xa.PreparedStatementCacheSize = PreparedStatement
Cache Size
 dbwizard.tranql-connector-sqlserver2005-xa.PreparedStatementCacheSizeExp = The value of PreparedStatementCacheSize.
PreparedStatementCacheSize tells the driver how many prepared statements should be associated
with each connection.  The default is no statement caching.
+
+dbwizard.tranql-connector-sqlserver2008-xa.DatabaseName            = Database Name
+dbwizard.tranql-connector-sqlserver2008-xa.DatabaseNameExp         = The name of the SQL
Server database to connect to.
+dbwizard.tranql-connector-sqlserver2008-xa.Password                = Password
+dbwizard.tranql-connector-sqlserver2008-xa.PasswordExp             = The case-insensitive
password used to connect to your SQL Server database.
+dbwizard.tranql-connector-sqlserver2008-xa.PortNumber              = Port Number
+dbwizard.tranql-connector-sqlserver2008-xa.PortNumberExp           = The TCP port of the
SQL Server, the default is 1433.
+dbwizard.tranql-connector-sqlserver2008-xa.SelectMethod            = SelectMethod
+dbwizard.tranql-connector-sqlserver2008-xa.SelectMethodExp         = SelectMethod={cursor
| direct}. Refer to Microsoft documentation for more information. Direct is very unlikely
to work in a managed environment.
+dbwizard.tranql-connector-sqlserver2008-xa.SendStringParameters    = SendStringParameters
+dbwizard.tranql-connector-sqlserver2008-xa.SendStringParametersExp = SendStringParametersAsUnicode={true
| false}. Refer to Microsoft documentation for details. The default is true and this is less
likely to cause encoding conflicts but may be slightly slower under some circumstances.
+dbwizard.tranql-connector-sqlserver2008-xa.ServerName              = Server Name
+dbwizard.tranql-connector-sqlserver2008-xa.ServerNameExp           = The IP address of the
SQL Server.
+dbwizard.tranql-connector-sqlserver2008-xa.UserName                = User Name
+dbwizard.tranql-connector-sqlserver2008-xa.UserNameExp             = The case-insensitive
username used to connect to your SQL Server database.
+dbwizard.tranql-connector-sqlserver2008-xa.PreparedStatementCacheSize = PreparedStatement
Cache Size
+dbwizard.tranql-connector-sqlserver2008-xa.PreparedStatementCacheSizeExp = The value of PreparedStatementCacheSize.
PreparedStatementCacheSize tells the driver how many prepared statements should be associated
with each connection.  The default is no statement caching.
 dbwizard.tranql-connector-db2ISeries-xa.DatabaseName               = Database Name
 dbwizard.tranql-connector-db2ISeries-xa.DatabaseNameExp            = Specifies the name for
the database server. This name is used as the database portion of the connection URL.
 dbwizard.tranql-connector-db2ISeries-xa.Secure                     = Secure
@@ -382,7 +399,7 @@ dbwizard.tranql-connector-db2ISeries-xa.
 dbwizard.tranql-connector-db2ISeries-xa.Password                   = Password
 dbwizard.tranql-connector-db2ISeries-xa.PasswordExp                = The case-insensitive
password used to connect to your DB2 Server database.
 dbwizard.tranql-connector-db2ISeries-xa.DataSourceName             = DataSource Name
-dbwizard.tranql-connector-db2ISeries-xa.DataSourceExp              = Specifies the DataSource
Name.
+dbwizard.tranql-connector-db2ISeries-xa.DataSourceNameExp              = Specifies the DataSource
Name.
 dbwizard.tranql-connector-db2ISeries-xa.PreparedStatementCacheSize = PreparedStatement Cache
Size
 dbwizard.tranql-connector-db2ISeries-xa.PreparedStatementCacheSizeExp = PreparedStatementCacheSize
specifies the driver how many prepared statements should be associated with each connection.
The default is no statement caching.
 dbwizard.tranql-connector-db2ISeries-xa.Libraries                  = Libraries

Modified: geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java?rev=1189034&r1=1189033&r2=1189034&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java
(original)
+++ geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java
Wed Oct 26 06:17:38 2011
@@ -232,6 +232,7 @@ public class DatabasePoolPortlet extends
         rarPathMap.put("TranQL XA Resource Adapter for PostgreSQL", "tranql-connector-postgresql-xa");
         rarPathMap.put("TranQL XA Resource Adapter for SQLServer 2000", "tranql-connector-sqlserver2000-xa");
         rarPathMap.put("TranQL XA Resource Adapter for SQLServer 2005", "tranql-connector-sqlserver2005-xa");
+        rarPathMap.put("TranQL XA Resource Adapter for SQLServer 2008", "tranql-connector-sqlserver2008-xa");
     }
 
     public void destroy() {
@@ -1165,7 +1166,7 @@ public class DatabasePoolPortlet extends
                                 entry.getValue());
                     }
                 }
-                /*Make pool setting effective after server restart                
+                /*Make pool setting effective after server restart*/         
                 Jsr77Naming naming = new Jsr77Naming();
                 AbstractName connectionManagerName = naming.createChildName(new AbstractName(URI.create(data.getAbstractName())),
data.getName(), NameFactory.JCA_CONNECTION_MANAGER);
                 PoolingAttributes pool = (PoolingAttributes) PortletManager.getManagedBean(request,
connectionManagerName);
@@ -1179,7 +1180,7 @@ public class DatabasePoolPortlet extends
                                 data.blockingTimeout));
                 pool.setIdleTimeoutMinutes(
                         data.idleTimeout == null || data.idleTimeout.equals("") ? 15 : Integer.parseInt(
-                                data.idleTimeout));*/
+                                data.idleTimeout));
                                 
             } catch (Exception e) {
                 log.error("Unable to save connection pool", e);



Mime
View raw message