Bug 405251 - [enterprise] Problems with deploying persistence applications - update openejb-core to put back the default persistence integration classes and mark eclipselink as jar which should not be scanned for annotations upon deploy if brought by the application
diff --git a/build.versions b/build.versions
index 503286a..ff9eff7 100644
--- a/build.versions
+++ b/build.versions
@@ -51,7 +51,7 @@
org.apache.juli.extras=7.0.35.v201302120746
org.apache.mina.core=2.0.2.v201108120515
org.apache.openejb.api=4.0.0.beta-2_v201205041047
-org.apache.openejb.core=4.0.0.beta-2_v201205260545-virgo-6
+org.apache.openejb.core=4.0.0.beta-2_v201205260545-virgo-7
org.apache.openejb.javaagent=4.0.0.beta-2_v201205041047
org.apache.openejb.jee=4.0.0.beta-2_v201205041336
org.apache.openejb.loader=4.0.0.beta-2_v201205041336
diff --git a/hotfix/plugins/org.apache.openejb.core_4.0.0.beta-2_v201205260545-virgo-6.jar b/hotfix/plugins/org.apache.openejb.core_4.0.0.beta-2_v201205260545-virgo-6.jar
deleted file mode 100755
index e059040..0000000
--- a/hotfix/plugins/org.apache.openejb.core_4.0.0.beta-2_v201205260545-virgo-6.jar
+++ /dev/null
Binary files differ
diff --git a/hotfix/plugins/org.apache.openejb.core_4.0.0.beta-2_v201205260545-virgo-7.jar b/hotfix/plugins/org.apache.openejb.core_4.0.0.beta-2_v201205260545-virgo-7.jar
new file mode 100755
index 0000000..e4c5338
--- /dev/null
+++ b/hotfix/plugins/org.apache.openejb.core_4.0.0.beta-2_v201205260545-virgo-7.jar
Binary files differ
diff --git a/hotfix/source/openejb-core/README.txt b/hotfix/source/openejb-core/README.txt
index 1e6ff5c..15b32a2 100755
--- a/hotfix/source/openejb-core/README.txt
+++ b/hotfix/source/openejb-core/README.txt
@@ -5,12 +5,12 @@
After successful build patch the Bundle-Version and jar name to something like this increasing the current version at the back:
org.apache.openejb.core_4.0.0.beta-2_v201205260545-virgo-2
-Add "Exposed-ContentType: Implementation" to the manifest of the newly built openejb-core jar or better yet copy the entire manifest from the old hot fix jar into the new one.
+Add "Exposed-ContentType: Implementation" to the manifest of the newly built openejb-core jar and the package org.apache.openejb.jee.jpa.frag
+ ment;version="[4.0,5)" to the Import-Package header or better yet copy the entire manifest from the old hot fix jar into the new one.
-If you don't copy the whole manifest also remove the version component from the "javax.management.j2ee" package.
+
+If you don't copy the whole manifest also remove the version component from the "javax.management.j2ee" package.
+
Original code is submitted in src.original and can also be found at:
http://svn.apache.org/repos/asf/openejb/tags/openejb-4.0.0-beta-2/
-
-Remove from org/apache/openejb subfolder in the jar the folders eclipselink, hibernate and toplink - the classes from these folders are placed in
-a separate jar, org.eclipse.virgo.openejb.jpa.integration_4.0.0.beta-2_v201205260545.jar
\ No newline at end of file
diff --git a/hotfix/source/openejb-core/src/main/java/org/apache/openejb/config/NewLoaderLogic.java b/hotfix/source/openejb-core/src/main/java/org/apache/openejb/config/NewLoaderLogic.java
index 93167e8..0efcdbf 100755
--- a/hotfix/source/openejb-core/src/main/java/org/apache/openejb/config/NewLoaderLogic.java
+++ b/hotfix/source/openejb-core/src/main/java/org/apache/openejb/config/NewLoaderLogic.java
@@ -403,7 +403,9 @@
"xmlsec-",
"xmltooling-",
"xmlunit-",
- "ziplock-"
+ "ziplock-",
+ "eclipselink.jar",
+ "org.eclipse.persistence."
);
// filter = Filters.optimize(filter, new PatternFilter(".*/openejb-.*"));
