You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ga...@apache.org on 2013/04/09 01:37:10 UTC
svn commit: r1465826 - in /geronimo/server/branches/3.0/plugins:
activemq/pom.xml
openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbModuleImpl.java
Author: gawor
Date: Mon Apr 8 23:37:10 2013
New Revision: 1465826
URL: http://svn.apache.org/r1465826
Log:
1) ensure openejb modules are started with the right application classloader, and 2) switch to activemq 5.4.3 to avoid possible licensing issues (AMQ-3491)
Modified:
geronimo/server/branches/3.0/plugins/activemq/pom.xml
geronimo/server/branches/3.0/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbModuleImpl.java
Modified: geronimo/server/branches/3.0/plugins/activemq/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0/plugins/activemq/pom.xml?rev=1465826&r1=1465825&r2=1465826&view=diff
==============================================================================
--- geronimo/server/branches/3.0/plugins/activemq/pom.xml (original)
+++ geronimo/server/branches/3.0/plugins/activemq/pom.xml Mon Apr 8 23:37:10 2013
@@ -65,7 +65,7 @@
</profiles>
<properties>
- <activemqVersion>5.4.2</activemqVersion>
+ <activemqVersion>5.4.3</activemqVersion>
</properties>
<dependencyManagement>
Modified: geronimo/server/branches/3.0/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbModuleImpl.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbModuleImpl.java?rev=1465826&r1=1465825&r2=1465826&view=diff
==============================================================================
--- geronimo/server/branches/3.0/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbModuleImpl.java (original)
+++ geronimo/server/branches/3.0/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbModuleImpl.java Mon Apr 8 23:37:10 2013
@@ -172,6 +172,17 @@ public class EjbModuleImpl implements EJ
}
public void doStart() throws Exception {
+ Thread currentThread = Thread.currentThread();
+ ClassLoader oldCL = currentThread.getContextClassLoader();
+ try {
+ currentThread.setContextClassLoader(classLoader);
+ start();
+ } finally {
+ currentThread.setContextClassLoader(oldCL);
+ }
+ }
+
+ private void start() throws Exception {
List<BeanContext> allDeployments = appInfoGBean.getModuleBeanContexts(moduleURI);
//start code from openejb assembler