Author: rmannibucau
Date: Tue Jul 24 11:02:16 2012
New Revision: 1364976
URL: http://svn.apache.org/viewvc?rev=1364976&view=rev
Log:
adding tomcat pools to tomee embedded and using it in tomee only if available
Modified:
openejb/branches/openejb-pool/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java
openejb/branches/openejb-pool/tomee/tomee-embedded/pom.xml
Modified:
openejb/branches/openejb-pool/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java
URL:
http://svn.apache.org/viewvc/openejb/branches/openejb-pool/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java?rev=1364976&r1=1364975&r2=1364976&view=diff
==============================================================================
---
openejb/branches/openejb-pool/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java
(original)
+++
openejb/branches/openejb-pool/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java
Tue Jul 24 11:02:16 2012
@@ -170,8 +170,12 @@ public class TomcatLoader implements Loa
}
// set tomcat pool
- // TODO: valid it works
-
SystemInstance.get().setProperty(ConfigurationFactory.OPENEJB_JDBC_DATASOURCE_CREATOR,
TomEEDataSourceCreator.class.getName());
+ try {// in embedded mode we can easily remove it so check we can use
it before setting it
+ final Class<?> creatorClass =
TomcatLoader.class.getClassLoader().loadClass("org.apache.tomee.jdbc.TomEEDataSourceCreator");
+
SystemInstance.get().setProperty(ConfigurationFactory.OPENEJB_JDBC_DATASOURCE_CREATOR,
creatorClass.getName());
+ } catch (Throwable ignored) {
+ // will use the defaul tone
+ }
// tomcat default behavior is webapp, simply keep it, it is
overridable by system property too
SystemInstance.get().setProperty("openejb.default.deployment-module",
System.getProperty("openejb.default.deployment-module",
"org.apache.openejb.config.WebModule"));
Modified: openejb/branches/openejb-pool/tomee/tomee-embedded/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/branches/openejb-pool/tomee/tomee-embedded/pom.xml?rev=1364976&r1=1364975&r2=1364976&view=diff
==============================================================================
--- openejb/branches/openejb-pool/tomee/tomee-embedded/pom.xml (original)
+++ openejb/branches/openejb-pool/tomee/tomee-embedded/pom.xml Tue Jul 24
11:02:16 2012
@@ -118,6 +118,19 @@
<dependency>
<groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-jdbc</artifactId>
+ <version>${tomcat.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-dbcp</artifactId>
+ <version>${tomcat.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-catalina</artifactId>
<version>${tomcat.version}</version>
<scope>compile</scope>
