geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r1465128 - in /geronimo/server/branches/3.0: plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/datasource/DataSourceService.java plugins/connector-1_6/pom.xml pom.xml
Date Fri, 05 Apr 2013 20:57:05 GMT
Author: gawor
Date: Fri Apr  5 20:57:04 2013
New Revision: 1465128

URL: http://svn.apache.org/r1465128
Log:
GERONIMO-6138: switch to tranql 1.8 rc

Modified:
    geronimo/server/branches/3.0/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/datasource/DataSourceService.java
    geronimo/server/branches/3.0/plugins/connector-1_6/pom.xml
    geronimo/server/branches/3.0/pom.xml

Modified: geronimo/server/branches/3.0/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/datasource/DataSourceService.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/datasource/DataSourceService.java?rev=1465128&r1=1465127&r2=1465128&view=diff
==============================================================================
--- geronimo/server/branches/3.0/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/datasource/DataSourceService.java
(original)
+++ geronimo/server/branches/3.0/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/datasource/DataSourceService.java
Fri Apr  5 20:57:04 2013
@@ -30,7 +30,6 @@ import javax.naming.Reference;
 import javax.resource.Referenceable;
 import javax.resource.ResourceException;
 import javax.resource.spi.ManagedConnectionFactory;
-import javax.security.auth.Subject;
 import javax.sql.ConnectionPoolDataSource;
 import javax.sql.DataSource;
 import javax.sql.XAConnection;
@@ -252,9 +251,9 @@ public class DataSourceService implement
         }
         
         @Override
-        protected XAConnection getPhysicalConnection(Subject subject, CredentialExtractor
credentialExtractor) 
+        protected XAConnection getPhysicalConnection(CredentialExtractor credentialExtractor)

             throws ResourceException {
-            XAConnection connection = super.getPhysicalConnection(subject, credentialExtractor);
+            XAConnection connection = super.getPhysicalConnection(credentialExtractor);
             int isolationLevel = dataSourceDescription.getIsolationLevel();
             if (isolationLevel != -1) {
                 try {

Modified: geronimo/server/branches/3.0/plugins/connector-1_6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0/plugins/connector-1_6/pom.xml?rev=1465128&r1=1465127&r2=1465128&view=diff
==============================================================================
--- geronimo/server/branches/3.0/plugins/connector-1_6/pom.xml (original)
+++ geronimo/server/branches/3.0/plugins/connector-1_6/pom.xml Fri Apr  5 20:57:04 2013
@@ -186,7 +186,7 @@
             <dependency>
                 <groupId>org.tranql</groupId>
                 <artifactId>tranql-connector-db2-xa</artifactId>
-                <version>1.7</version>
+                <version>1.8</version>
                 <type>rar</type>
                 <exclusions>
                     <exclusion>
@@ -203,7 +203,7 @@
             <dependency>
                 <groupId>org.tranql</groupId>
                 <artifactId>tranql-connector-informix-xa</artifactId>
-                <version>1.4</version>
+                <version>1.5</version>
                 <type>rar</type>
                 <exclusions>
                     <exclusion>
@@ -220,7 +220,7 @@
             <dependency>
                 <groupId>org.tranql</groupId>
                 <artifactId>tranql-connector-mysql-local</artifactId>
-                <version>1.5</version>
+                <version>1.6</version>
                 <type>rar</type>
                 <exclusions>
                     <exclusion>
@@ -237,7 +237,7 @@
             <dependency>
                 <groupId>org.tranql</groupId>
                 <artifactId>tranql-connector-mysql-xa</artifactId>
-                <version>1.5</version>
+                <version>1.6</version>
                 <type>rar</type>
                 <exclusions>
                     <exclusion>
@@ -254,7 +254,7 @@
             <dependency>
                 <groupId>org.tranql</groupId>
                 <artifactId>tranql-connector-oracle-local</artifactId>
-                <version>1.7</version>
+                <version>1.8</version>
                 <type>rar</type>
                 <exclusions>
                     <exclusion>
@@ -271,7 +271,7 @@
             <dependency>
                 <groupId>org.tranql</groupId>
                 <artifactId>tranql-connector-oracle-xa</artifactId>
-                <version>1.7</version>
+                <version>1.8</version>
                 <type>rar</type>
                 <exclusions>
                     <exclusion>
@@ -288,7 +288,7 @@
             <dependency>
                 <groupId>org.tranql</groupId>
                 <artifactId>tranql-connector-oracle-rac-local</artifactId>
-                <version>1.7</version>
+                <version>1.8</version>
                 <type>rar</type>
                 <exclusions>
                     <exclusion>
@@ -305,7 +305,7 @@
             <dependency>
                 <groupId>org.tranql</groupId>
                 <artifactId>tranql-connector-postgresql-local</artifactId>
-                <version>1.4</version>
+                <version>1.5</version>
                 <type>rar</type>
                 <exclusions>
                     <exclusion>
@@ -322,7 +322,7 @@
             <dependency>
                 <groupId>org.tranql</groupId>
                 <artifactId>tranql-connector-postgresql-xa</artifactId>
-                <version>1.4</version>
+                <version>1.5</version>
                 <type>rar</type>
                 <exclusions>
                     <exclusion>
@@ -339,7 +339,7 @@
             <dependency>
                 <groupId>org.tranql</groupId>
                 <artifactId>tranql-connector-sqlserver2000-xa</artifactId>
-                <version>1.3</version>
+                <version>1.4</version>
                 <type>rar</type>
                 <exclusions>
                     <exclusion>
@@ -356,7 +356,7 @@
             <dependency>
                 <groupId>org.tranql</groupId>
                 <artifactId>tranql-connector-sqlserver2005-xa</artifactId>
-                <version>1.3</version>
+                <version>1.4</version>
                 <type>rar</type>
                 <exclusions>
                     <exclusion>
@@ -373,7 +373,7 @@
             <dependency>
                 <groupId>org.tranql</groupId>
                 <artifactId>tranql-connector-sqlserver2008-xa</artifactId>
-                <version>1.0</version>
+                <version>1.1</version>
                 <type>rar</type>
                 <exclusions>
                     <exclusion>
@@ -390,7 +390,7 @@
             <dependency>
                 <groupId>org.tranql</groupId>
                 <artifactId>tranql-connector-db2ISeries-xa</artifactId>
-                <version>1.1</version>
+                <version>1.2</version>
                 <type>rar</type>
                 <exclusions>
                     <exclusion>

Modified: geronimo/server/branches/3.0/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0/pom.xml?rev=1465128&r1=1465127&r2=1465128&view=diff
==============================================================================
--- geronimo/server/branches/3.0/pom.xml (original)
+++ geronimo/server/branches/3.0/pom.xml Fri Apr  5 20:57:04 2013
@@ -81,8 +81,8 @@
         <xbeanBundleUtilsVersion>3.13</xbeanBundleUtilsVersion>
         <jetty>jetty8</jetty>
         <txmanagerVersion>3.1.1</txmanagerVersion>
-        <tranqlVersion>1.7</tranqlVersion>
-        <tranqlDerbyVersion>1.7</tranqlDerbyVersion>
+        <tranqlVersion>1.8</tranqlVersion>
+        <tranqlDerbyVersion>1.8</tranqlDerbyVersion>
         <jaxbImplVersion>2.2.3-1_1</jaxbImplVersion>
 
         <monitoringConsoleVersion>${project.version}</monitoringConsoleVersion>
@@ -2339,6 +2339,18 @@ only found in cxf
                 <enabled>false</enabled>
             </snapshots>
         </repository>
+
+       <repository>
+            <id>tranql-repo</id>
+            <name>tranql repo</name>
+            <url>https://nexus.codehaus.org/content/repositories/orgtranql-016/</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
     </repositories>      
 
     <profiles>



Mime
View raw message