Author: rmannibucau
Date: Wed Dec 19 11:01:59 2012
New Revision: 1423821
URL: http://svn.apache.org/viewvc?rev=1423821&view=rev
Log:
using a constant for ear-webapp-persistence-xml-jars since it is much important
for ear - wonder if it shouldn't be a real API; but since persistence.xml is
not just use the same kind of hook
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/PersistenceUnitLinkResolver.java
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java?rev=1423821&r1=1423820&r2=1423821&view=diff
==============================================================================
---
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java
(original)
+++
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java
Wed Dec 19 11:01:59 2012
@@ -656,7 +656,7 @@ class AppInfoBuilder {
private String findRelatedWebApp(final AppModule appModule, final String
rootUrl) {
for (WebModule webModule : appModule.getWebModules()) {
- final List<URL> pXmls = (List<URL>)
webModule.getAltDDs().get("ear-webapp-persistence-xml-jars");
+ final List<URL> pXmls = (List<URL>)
webModule.getAltDDs().get(DeploymentLoader.EAR_WEBAPP_PERSISTENCE_XML_JARS);
if (pXmls != null) {
for (URL url : pXmls) {
if (url.toExternalForm().contains(rootUrl)) {
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=1423821&r1=1423820&r2=1423821&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 Dec 19 11:01:59 2012
@@ -98,6 +98,7 @@ public class DeploymentLoader implements
public static final String OPENEJB_ALTDD_PREFIX = "openejb.altdd.prefix";
private static final String ddDir = "META-INF/";
+ public static final String EAR_WEBAPP_PERSISTENCE_XML_JARS =
"ear-webapp-persistence-xml-jars";
private boolean scanManagedBeans = true;
private static final Collection<String> KNOWN_DESCRIPTORS =
Arrays.asList("app-ctx.xml", "module.properties", "application.properties",
"web.xml", "ejb-jar.xml", "openejb-jar.xml", "env-entries.properties",
"beans.xml", "ra.xml", "application.xml", "application-client.xml",
"persistence-fragment.xml", "persistence.xml", "validation.xml",
NewLoaderLogic.EXCLUSION_FILE);
private static String ALTDD =
SystemInstance.get().getOptions().get(OPENEJB_ALTDD_PREFIX, (String) null);
@@ -537,7 +538,7 @@ public class DeploymentLoader implements
foundRootUrls.add(url);
}
}
- webModule.getAltDDs().put("ear-webapp-persistence-xml-jars",
foundRootUrls);
+ webModule.getAltDDs().put(EAR_WEBAPP_PERSISTENCE_XML_JARS,
foundRootUrls);
}
for (final DeploymentModule module :
appModule.getDeploymentModule()) {
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/PersistenceUnitLinkResolver.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/PersistenceUnitLinkResolver.java?rev=1423821&r1=1423820&r2=1423821&view=diff
==============================================================================
---
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/PersistenceUnitLinkResolver.java
(original)
+++
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/PersistenceUnitLinkResolver.java
Wed Dec 19 11:01:59 2012
@@ -67,7 +67,7 @@ public class PersistenceUnitLinkResolver
}
private boolean isIn(final PersistenceUnit value, final WebModule war) {
- final Collection<URL> urls = (Collection<URL>)
war.getAltDDs().get("ear-webapp-persistence-xml-jars");
+ final Collection<URL> urls = (Collection<URL>)
war.getAltDDs().get(DeploymentLoader.EAR_WEBAPP_PERSISTENCE_XML_JARS);
if (urls == null || urls.isEmpty()) {
return false;
}
@@ -113,7 +113,7 @@ public class PersistenceUnitLinkResolver
}
for (WebModule webModule : module.getWebModules()) {
- if (isParent(new File(webModule.getJarLocation()), moduleFile,
appModuleFile)) { // isParent()
+ if (isParent(new File(webModule.getJarLocation()), moduleFile,
appModuleFile)) {
return webModule;
}
}
