Author: rmannibucau
Date: Tue Jul 24 00:04:55 2012
New Revision: 1364849
URL: http://svn.apache.org/viewvc?rev=1364849&view=rev
Log:
activating tomee pool by default in tomee
Modified:
openejb/branches/openejb-pool/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
openejb/branches/openejb-pool/tomee/tomee-catalina/pom.xml
openejb/branches/openejb-pool/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java
openejb/branches/openejb-pool/tomee/tomee-webapp/pom.xml
Modified:
openejb/branches/openejb-pool/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
URL:
http://svn.apache.org/viewvc/openejb/branches/openejb-pool/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java?rev=1364849&r1=1364848&r2=1364849&view=diff
==============================================================================
---
openejb/branches/openejb-pool/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
(original)
+++
openejb/branches/openejb-pool/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
Tue Jul 24 00:04:55 2012
@@ -110,6 +110,7 @@ import static org.apache.openejb.config.
import static org.apache.openejb.config.ServiceUtils.implies;
public class ConfigurationFactory implements OpenEjbConfigurationFactory {
+ public static final String OPENEJB_JDBC_DATASOURCE_CREATOR =
"openejb.jdbc.datasource-creator";
public static final String ADDITIONAL_DEPLOYMENTS = "conf/deployments.xml";
static final String CONFIGURATION_PROPERTY = "openejb.configuration";
@@ -145,7 +146,7 @@ public class ConfigurationFactory implem
final Options options = SystemInstance.get().getOptions();
if (SystemInstance.get().getComponent(DataSourceCreator.class) ==
null) {
- final String creator =
SystemInstance.get().getOptions().get("openejb.jdbc.datasource-creator",
(String) null);
+ final String creator =
SystemInstance.get().getOptions().get(OPENEJB_JDBC_DATASOURCE_CREATOR, (String)
null);
if (creator == null) {
SystemInstance.get().setComponent(DataSourceCreator.class, new
DefaultDataSourceCreator());
} else {
Modified: openejb/branches/openejb-pool/tomee/tomee-catalina/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/branches/openejb-pool/tomee/tomee-catalina/pom.xml?rev=1364849&r1=1364848&r2=1364849&view=diff
==============================================================================
--- openejb/branches/openejb-pool/tomee/tomee-catalina/pom.xml (original)
+++ openejb/branches/openejb-pool/tomee/tomee-catalina/pom.xml Tue Jul 24
00:04:55 2012
@@ -75,6 +75,11 @@
<version>${openejb.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>tomee-jdbc</artifactId>
+ <version>${tomee.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-catalina</artifactId>
<version>${tomcat.version}</version>
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=1364849&r1=1364848&r2=1364849&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 00:04:55 2012
@@ -28,9 +28,9 @@ import org.apache.catalina.core.Standard
import org.apache.catalina.startup.Bootstrap;
import org.apache.catalina.startup.Catalina;
import org.apache.openejb.OpenEJB;
-import org.apache.openejb.assembler.classic.Assembler;
import org.apache.openejb.assembler.classic.OpenEjbConfiguration;
import org.apache.openejb.assembler.classic.WebAppBuilder;
+import org.apache.openejb.config.ConfigurationFactory;
import org.apache.openejb.config.NewLoaderLogic;
import org.apache.openejb.config.sys.Tomee;
import org.apache.openejb.core.ServerFederation;
@@ -42,7 +42,6 @@ import org.apache.openejb.server.ServerS
import org.apache.openejb.server.ServiceException;
import org.apache.openejb.server.ServiceManager;
import org.apache.openejb.server.ejbd.EjbServer;
-import org.apache.openejb.spi.ContainerSystem;
import org.apache.openejb.spi.Service;
import org.apache.openejb.util.Join;
import org.apache.openejb.util.LogCategory;
@@ -51,6 +50,7 @@ import org.apache.openejb.util.OptionsLo
import org.apache.tomcat.util.scan.Constants;
import org.apache.tomee.installer.Installer;
import org.apache.tomee.installer.Paths;
+import org.apache.tomee.jdbc.TomEEDataSourceCreator;
import org.apache.tomee.loader.TomcatHelper;
import java.io.File;
@@ -169,6 +169,10 @@ public class TomcatLoader implements Loa
SystemInstance.get().setProperty("openejb.configuration.class",
Tomee.class.getName());
}
+ // set tomcat pool
+ // TODO: valid it works
+
SystemInstance.get().setProperty(ConfigurationFactory.OPENEJB_JDBC_DATASOURCE_CREATOR,
TomEEDataSourceCreator.class.getName());
+
// 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-webapp/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/branches/openejb-pool/tomee/tomee-webapp/pom.xml?rev=1364849&r1=1364848&r2=1364849&view=diff
==============================================================================
--- openejb/branches/openejb-pool/tomee/tomee-webapp/pom.xml (original)
+++ openejb/branches/openejb-pool/tomee/tomee-webapp/pom.xml Tue Jul 24
00:04:55 2012
@@ -232,12 +232,6 @@
<groupId>org.codehaus.swizzle</groupId>
<artifactId>swizzle-stream</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>tomee-jdbc</artifactId>
- <version>${tomee.version}</version>
- <scope>runtime</scope>
- </dependency>
</dependencies>
</project>
