Author: jgallimore
Date: Wed Apr 20 15:31:18 2011
New Revision: 1095435
URL: http://svn.apache.org/viewvc?rev=1095435&view=rev
Log:
Upgrade to dbcp-1.4 and override close() method on BasicManagedDataSource to
stop Tomcat closing the datasource when apps are undeployed
Modified:
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/pom.xml
openejb/trunk/openejb3/container/openejb-core/pom.xml
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/BasicManagedDataSource.java
openejb/trunk/openejb3/pom.xml
openejb/trunk/openejb3/server/openejb-derbynet/pom.xml
openejb/trunk/openejb3/server/openejb-hsql/pom.xml
Modified:
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/pom.xml?rev=1095435&r1=1095434&r2=1095435&view=diff
==============================================================================
---
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/pom.xml
(original)
+++
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/pom.xml
Wed Apr 20 15:31:18 2011
@@ -192,6 +192,12 @@
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-derbynet</artifactId>
+ <version>${project.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
<artifactId>openejb-http</artifactId>
<version>${project.version}</version>
<scope>runtime</scope>
@@ -235,6 +241,11 @@
<artifactId>derby</artifactId>
<version>10.7.1.1</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbyclient</artifactId>
+ <version>10.7.1.1</version>
+ </dependency>
</dependencies>
</project>
Modified: openejb/trunk/openejb3/container/openejb-core/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/pom.xml?rev=1095435&r1=1095434&r2=1095435&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/pom.xml (original)
+++ openejb/trunk/openejb3/container/openejb-core/pom.xml Wed Apr 20 15:31:18
2011
@@ -341,8 +341,12 @@
<artifactId>hsqldb</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>commons-dbcp-all</artifactId>
+ <groupId>commons-dbcp</groupId>
+ <artifactId>commons-dbcp</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-pool</groupId>
+ <artifactId>commons-pool</artifactId>
</dependency>
<dependency>
<groupId>org.codehaus.swizzle</groupId>
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/BasicManagedDataSource.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/BasicManagedDataSource.java?rev=1095435&r1=1095434&r2=1095435&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/BasicManagedDataSource.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/BasicManagedDataSource.java
Wed Apr 20 15:31:18 2011
@@ -133,4 +133,7 @@ public class BasicManagedDataSource exte
protected void wrapTransactionManager() {
}
+ public synchronized void close() throws SQLException {
+ }
+
}
Modified: openejb/trunk/openejb3/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/pom.xml?rev=1095435&r1=1095434&r2=1095435&view=diff
==============================================================================
--- openejb/trunk/openejb3/pom.xml (original)
+++ openejb/trunk/openejb3/pom.xml Wed Apr 20 15:31:18 2011
@@ -942,17 +942,27 @@
<artifactId>swizzle-stream</artifactId>
<version>1.0.2</version>
</dependency>
- <dependency>
+ <!-- <dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>commons-dbcp-all</artifactId>
<version>1.3-r699049</version>
- </dependency>
+ </dependency> -->
<dependency>
<groupId>axis</groupId>
<artifactId>axis</artifactId>
<version>1.4</version>
</dependency>
<dependency>
+ <groupId>commons-dbcp</groupId>
+ <artifactId>commons-dbcp</artifactId>
+ <version>1.4</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-pool</groupId>
+ <artifactId>commons-pool</artifactId>
+ <version>1.5.4</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.ws.security</groupId>
<artifactId>wss4j</artifactId>
<version>1.5.8</version>
Modified: openejb/trunk/openejb3/server/openejb-derbynet/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-derbynet/pom.xml?rev=1095435&r1=1095434&r2=1095435&view=diff
==============================================================================
--- openejb/trunk/openejb3/server/openejb-derbynet/pom.xml (original)
+++ openejb/trunk/openejb3/server/openejb-derbynet/pom.xml Wed Apr 20 15:31:18
2011
@@ -53,12 +53,12 @@
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
- <version>10.3.2.1</version>
+ <version>10.7.1.1</version>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbynet</artifactId>
- <version>10.3.2.1</version>
+ <version>10.7.1.1</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Modified: openejb/trunk/openejb3/server/openejb-hsql/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-hsql/pom.xml?rev=1095435&r1=1095434&r2=1095435&view=diff
==============================================================================
--- openejb/trunk/openejb3/server/openejb-hsql/pom.xml (original)
+++ openejb/trunk/openejb3/server/openejb-hsql/pom.xml Wed Apr 20 15:31:18 2011
@@ -51,8 +51,13 @@
<artifactId>hsqldb</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>commons-dbcp-all</artifactId>
+ <groupId>commons-dbcp</groupId>
+ <artifactId>commons-dbcp</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-pool</groupId>
+ <artifactId>commons-pool</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
