You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2007/01/18 10:24:05 UTC
svn commit: r497369 - in /incubator/openejb/trunk/openejb3/container:
openejb-core/src/main/java/org/apache/openejb/alt/config/ConfigurationFactory.java
openejb-persistence/src/main/java/org/apache/openejb/persistence/GlobalJndiDataSourceResolver.java
Author: dblevins
Date: Thu Jan 18 01:24:05 2007
New Revision: 497369
URL: http://svn.apache.org/viewvc?view=rev&rev=497369
Log:
Fixed ConfigFactory to throw the exception if a container is not found
Hacked the jpa code to not attempt to get the datasource. This hack needs to be removed immediately.
Modified:
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/ConfigurationFactory.java
incubator/openejb/trunk/openejb3/container/openejb-persistence/src/main/java/org/apache/openejb/persistence/GlobalJndiDataSourceResolver.java
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/ConfigurationFactory.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/ConfigurationFactory.java?view=diff&rev=497369&r1=497368&r2=497369
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/ConfigurationFactory.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/ConfigurationFactory.java Thu Jan 18 01:24:05 2007
@@ -266,9 +266,9 @@
appInfo.ejbJars.add(ejbJarInfo);
- } catch (Exception e) {
- e.printStackTrace();
+ } catch (OpenEJBException e) {
ConfigUtils.logger.i18n.warning("conf.0004", ejbModule.getJarURI(), e.getMessage());
+ throw e;
}
}
Modified: incubator/openejb/trunk/openejb3/container/openejb-persistence/src/main/java/org/apache/openejb/persistence/GlobalJndiDataSourceResolver.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-persistence/src/main/java/org/apache/openejb/persistence/GlobalJndiDataSourceResolver.java?view=diff&rev=497369&r1=497368&r2=497369
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-persistence/src/main/java/org/apache/openejb/persistence/GlobalJndiDataSourceResolver.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-persistence/src/main/java/org/apache/openejb/persistence/GlobalJndiDataSourceResolver.java Thu Jan 18 01:24:05 2007
@@ -34,7 +34,11 @@
}
public DataSource getDataSource(String name) throws Exception {
- try {
+ String hack = System.getProperty("duct tape");
+ if (hack != null){
+ return null;
+ }
+ try {
initialContext = new InitialContext(jndiProperties);
} catch (NamingException ne) {
throw new RuntimeException(ne);