geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r580477 - in /geronimo/server/branches/2.0/modules: geronimo-connector-builder/pom.xml geronimo-connector-builder/src/test/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java geronimo-connector/pom.xml
Date Fri, 28 Sep 2007 20:29:20 GMT
Author: djencks
Date: Fri Sep 28 13:29:20 2007
New Revision: 580477

URL: http://svn.apache.org/viewvc?rev=580477&view=rev
Log:
remove obsolete dependency on tranql

Modified:
    geronimo/server/branches/2.0/modules/geronimo-connector-builder/pom.xml
    geronimo/server/branches/2.0/modules/geronimo-connector-builder/src/test/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java
    geronimo/server/branches/2.0/modules/geronimo-connector/pom.xml

Modified: geronimo/server/branches/2.0/modules/geronimo-connector-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/modules/geronimo-connector-builder/pom.xml?rev=580477&r1=580476&r2=580477&view=diff
==============================================================================
--- geronimo/server/branches/2.0/modules/geronimo-connector-builder/pom.xml (original)
+++ geronimo/server/branches/2.0/modules/geronimo-connector-builder/pom.xml Fri Sep 28 13:29:20
2007
@@ -62,12 +62,7 @@
             <artifactId>geronimo-test-ddbean</artifactId>
             <version>${version}</version>
         </dependency>
-        
-        <dependency>
-            <groupId>org.tranql</groupId>
-            <artifactId>tranql</artifactId>
-        </dependency>
-        
+                
     </dependencies>
     
     <build>

Modified: geronimo/server/branches/2.0/modules/geronimo-connector-builder/src/test/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/modules/geronimo-connector-builder/src/test/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java?rev=580477&r1=580476&r2=580477&view=diff
==============================================================================
--- geronimo/server/branches/2.0/modules/geronimo-connector-builder/src/test/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java
(original)
+++ geronimo/server/branches/2.0/modules/geronimo-connector-builder/src/test/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java
Fri Sep 28 13:29:20 2007
@@ -78,13 +78,12 @@
 import org.apache.geronimo.system.serverinfo.BasicServerInfo;
 import org.apache.geronimo.testsupport.TestSupport;
 import org.apache.geronimo.transaction.manager.GeronimoTransactionManagerGBean;
-import org.tranql.sql.jdbc.JDBCUtil;
 
 /**
  * @version $Rev:385232 $ $Date$
  */
 public class ConnectorModuleBuilderTest extends TestSupport {
-    
+
     private boolean defaultXATransactionCaching = true;
     private boolean defaultXAThreadCaching = false;
     private int defaultMaxSize = 10;
@@ -148,7 +147,8 @@
                     null,
                     null,
                     null,
-                    new ConnectorModuleBuilder(defaultEnvironment, defaultMaxSize, defaultMinSize,
defaultBlockingTimeoutMilliseconds, defaultidleTimeoutMinutes, defaultXATransactionCaching,
defaultXAThreadCaching, Collections.singleton(serviceBuilder)),
+                    new ConnectorModuleBuilder(defaultEnvironment, defaultMaxSize, defaultMinSize,
defaultBlockingTimeoutMilliseconds, defaultidleTimeoutMinutes, defaultXATransactionCaching,
defaultXAThreadCaching,
+                            Collections.singleton(serviceBuilder)),
                     activationSpecInfoLocator,
                     null,
                     null,
@@ -288,7 +288,7 @@
         };
         executeTestBuildModule(action, true);
     }
-    
+
     public void testBuildPackedModule15LocalTx() throws Exception {
         InstallAction action = new InstallAction() {
             private File rarFile = new File(BASEDIR, "target/test-rar-15-localtx.rar");
@@ -328,7 +328,8 @@
         String resourceAdapterName = "testRA";
 
         try {
-            ConnectorModuleBuilder moduleBuilder = new ConnectorModuleBuilder(defaultEnvironment,
defaultMaxSize, defaultMinSize, defaultBlockingTimeoutMilliseconds, defaultidleTimeoutMinutes,
defaultXATransactionCaching, defaultXAThreadCaching, Collections.singleton(new GBeanBuilder(null,
null)));
+            ConnectorModuleBuilder moduleBuilder = new ConnectorModuleBuilder(defaultEnvironment,
defaultMaxSize, defaultMinSize, defaultBlockingTimeoutMilliseconds, defaultidleTimeoutMinutes,
defaultXATransactionCaching,
+                    defaultXAThreadCaching, Collections.singleton(new GBeanBuilder(null,
null)));
             File rarFile = action.getRARFile();
 
             ClassLoader oldCl = Thread.currentThread().getContextClassLoader();
@@ -491,15 +492,16 @@
             configurationManager.unloadConfiguration(configurationId);
         } finally {
             if (ds != null) {
-                Connection connection = null;
-                Statement statement = null;
+                Connection connection = ds.getConnection();
                 try {
-                    connection = ds.getConnection();
-                    statement = connection.createStatement();
-                    statement.execute("SHUTDOWN");
+                    Statement statement = connection.createStatement();
+                    try {
+                        statement.execute("SHUTDOWN");
+                    } finally {
+                        statement.close();
+                    }
                 } finally {
-                    JDBCUtil.close(statement);
-                    JDBCUtil.close(connection);
+                    connection.close();
                 }
             }
 
@@ -553,7 +555,6 @@
         GBeanData serverData = bootstrap.addGBean("geronimo", J2EEServerImpl.GBEAN_INFO);
         serverName = serverData.getAbstractName();
         bootstrap.addGBean(serverData);
-
 
         // add fake TransactionManager so refs will resolve
         GBeanData tm = bootstrap.addGBean("TransactionManager", GeronimoTransactionManagerGBean.GBEAN_INFO);

Modified: geronimo/server/branches/2.0/modules/geronimo-connector/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/modules/geronimo-connector/pom.xml?rev=580477&r1=580476&r2=580477&view=diff
==============================================================================
--- geronimo/server/branches/2.0/modules/geronimo-connector/pom.xml (original)
+++ geronimo/server/branches/2.0/modules/geronimo-connector/pom.xml Fri Sep 28 13:29:20 2007
@@ -76,18 +76,6 @@
             <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.tranql</groupId>
-            <artifactId>tranql</artifactId>
-            <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>commons-logging</groupId>
-                    <artifactId>commons-logging</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
         <!-- needed for passwordcredential realm-->
         <dependency>
             <groupId>regexp</groupId>



Mime
View raw message