Return-Path: 
 <scm-return-49323-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
X-Original-To: apmail-geronimo-scm-archive@www.apache.org
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 4CF0D1006D
	for <apmail-geronimo-scm-archive@www.apache.org>;
 Mon,  8 Apr 2013 23:37:32 +0000 (UTC)
Received: (qmail 12505 invoked by uid 500); 8 Apr 2013 23:37:32 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 12438 invoked by uid 500); 8 Apr 2013 23:37:31 -0000
Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:scm-help@geronimo.apache.org>
list-unsubscribe: <mailto:scm-unsubscribe@geronimo.apache.org>
List-Post: <mailto:scm@geronimo.apache.org>
Reply-To: dev@geronimo.apache.org
List-Id: <scm.geronimo.apache.org>
Delivered-To: mailing list scm@geronimo.apache.org
Received: (qmail 12429 invoked by uid 99); 8 Apr 2013 23:37:31 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 08 Apr 2013 23:37:31 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 08 Apr 2013 23:37:30 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 84B3D2388994;
	Mon,  8 Apr 2013 23:37:10 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: 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
Date: Mon, 08 Apr 2013 23:37:10 -0000
To: scm@geronimo.apache.org
From: gawor@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20130408233710.84B3D2388994@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

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