You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2012/01/11 14:09:34 UTC
svn commit: r1229995 -
/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
Author: rmannibucau
Date: Wed Jan 11 13:09:34 2012
New Revision: 1229995
URL: http://svn.apache.org/viewvc?rev=1229995&view=rev
Log:
http://docs.oracle.com/javaee/6/tutorial/doc/bnbqw.html seems to mean all persistence units (even in jar lib of a war) should be deployed which was no more the case
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java?rev=1229995&r1=1229994&r2=1229995&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java Wed Jan 11 13:09:34 2012
@@ -88,7 +88,6 @@ import static org.apache.openejb.util.UR
*/
public class DeploymentLoader implements DeploymentFilterable {
public static final Logger logger = Logger.getInstance(LogCategory.OPENEJB_STARTUP_CONFIG, "org.apache.openejb.util.resources");
- public static final String OPENEJB_READ_ALL_PERSISTENCE_XML = "openejb.read-all.persistence.xml";
private static final String OPENEJB_ALTDD_PREFIX = "openejb.altdd.prefix";
private static final String ddDir = "META-INF/";
private boolean scanManagedBeans = true;
@@ -192,14 +191,10 @@ public class DeploymentLoader implements
addWebModule(appModule, baseUrl, getOpenEJBClassLoader(baseUrl), getContextRoot(), getModuleName());
final Map<String, URL> otherDD;
- if (Boolean.getBoolean(OPENEJB_READ_ALL_PERSISTENCE_XML)) {
- WebModule webModule = appModule.getWebModules().iterator().next();
- final List<URL> urls = webModule.getScannableUrls();
- final ResourceFinder finder = new ResourceFinder("", urls.toArray(new URL[urls.size()]));
- otherDD = getDescriptors(finder, false);
- } else {
- otherDD = new HashMap<String, URL>();
- }
+ WebModule webModule = appModule.getWebModules().iterator().next();
+ final List<URL> urls = webModule.getScannableUrls();
+ final ResourceFinder finder = new ResourceFinder("", urls.toArray(new URL[urls.size()]));
+ otherDD = getDescriptors(finder, false);
addWebPersistenceDD("persistence.xml", file, baseUrl, otherDD, appModule);
addWebPersistenceDD("persistence-fragment.xml", file, baseUrl, otherDD, appModule);