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 2011/12/28 22:42:01 UTC
svn commit: r1225351 -
/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java
Author: rmannibucau
Date: Wed Dec 28 21:42:00 2011
New Revision: 1225351
URL: http://svn.apache.org/viewvc?rev=1225351&view=rev
Log:
TOMEE-58 adding jar file merging
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java
Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java?rev=1225351&r1=1225350&r2=1225351&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java Wed Dec 28 21:42:00 2011
@@ -181,6 +181,12 @@ public class ReadDescriptors implements
unit.getMappingFile().add(mappingFile);
}
}
+ for (String jarFile : fragmentUnit.getJarFile()) {
+ if (!unit.getJarFile().contains(jarFile)) {
+ logger.info("Adding jar file " + jarFile + " to persistence unit " + fragmentUnit.getName());
+ unit.getJarFile().add(jarFile);
+ }
+ }
if (fragmentUnit.isExcludeUnlistedClasses()) {
unit.setExcludeUnlistedClasses(true);
logger.info("Excluding unlisted classes for persistence unit " + fragmentUnit.getName());