From commitshannahhall@example.com Tue Mar 01 03:53:03 2011 Return-Path: <commitshannahhall@example.com> Delivered-To: hannahhall@example.com Received: (qmail 95785 invoked from network); 1 Mar 2011 03:53:03 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 Mar 2011 03:53:03 -0000 Received: (qmail 10446 invoked by uid 500); 1 Mar 2011 03:53:02 -0000 Delivered-To: hannahhall@example.com Received: (qmail 10388 invoked by uid 500); 1 Mar 2011 03:53:01 -0000 Mailing-List: contact hannahhall@example.com; run by ezmlm Precedence: bulk List-Help: <mailto:hannahhall@example.com> List-Unsubscribe: <mailto:hannahhall@example.com> List-Post: <mailto:hannahhall@example.com> List-Id: <commits.openejb.apache.org> Reply-To: hannahhall@example.com Delivered-To: mailing list hannahhall@example.com Received: (qmail 10381 invoked by uid 99); 1 Mar 2011 03:53:00 -0000 Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Mar 2011 03:53:00 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,T_RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO hel.zones.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Mar 2011 03:52:58 +0000 Received: from hel.zones.apache.org (hel.zones.apache.org [83.161.120.155]) by hel.zones.apache.org (Postfix) with ESMTP id DE7DF42C4E for <hannahhall@example.com>; Tue, 1 Mar 2011 03:52:36 +0000 (UTC) Date: Tue, 1 Mar 2011 03:52:36 +0000 (UTC) From: "Shawn Jiang (JIRA)" <hannahhall@example.com> To: hannahhall@example.com Message-ID: <hannahhall@example.com> Subject: [jira] Created: (OPENEJB-1437) Compilation error due to OpenWebbeans api changes. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-JIRA-FingerPrint: 30527f35849b9dde25b450d4833f0394 X-Virus-Checked: Checked by ClamAV on apache.org Compilation error due to OpenWebbeans api changes. -------------------------------------------------- Key: OPENEJB-1437 URL: https://issues.apache.org/jira/browse/OPENEJB-1437 Project: OpenEJB Issue Type: Bug Reporter: Shawn Jiang recently, we've been seeing many compilation error due to OpenWebbeans api changes. Need to open a JIRA to track them and attach patches for them. -- This message is automatically generated by JIRA. - For more information on JIRA, see: http://www.atlassian.com/software/jira From commitshannahhall@example.com Tue Mar 01 03:54:59 2011 Return-Path: <commitshannahhall@example.com> Delivered-To: hannahhall@example.com Received: (qmail 96261 invoked from network); 1 Mar 2011 03:54:59 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 Mar 2011 03:54:59 -0000 Received: (qmail 15694 invoked by uid 500); 1 Mar 2011 03:54:59 -0000 Delivered-To: hannahhall@example.com Received: (qmail 15637 invoked by uid 500); 1 Mar 2011 03:54:58 -0000 Mailing-List: contact hannahhall@example.com; run by ezmlm Precedence: bulk List-Help: <mailto:hannahhall@example.com> List-Unsubscribe: <mailto:hannahhall@example.com> List-Post: <mailto:hannahhall@example.com> List-Id: <commits.openejb.apache.org> Reply-To: hannahhall@example.com Delivered-To: mailing list hannahhall@example.com Received: (qmail 15630 invoked by uid 99); 1 Mar 2011 03:54:57 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Mar 2011 03:54:57 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,T_RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO hel.zones.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Mar 2011 03:54:56 +0000 Received: from hel.zones.apache.org (hel.zones.apache.org [83.161.120.155]) by hel.zones.apache.org (Postfix) with ESMTP id E3BEA42CAE for <hannahhall@example.com>; Tue, 1 Mar 2011 03:54:36 +0000 (UTC) Date: Tue, 1 Mar 2011 03:54:36 +0000 (UTC) From: "Shawn Jiang (JIRA)" <hannahhall@example.com> To: hannahhall@example.com Message-ID: <hannahhall@example.com> In-Reply-To: <hannahhall@example.com> Subject: [jira] Updated: (OPENEJB-1437) Compilation error due to OpenWebbeans api changes. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-JIRA-FingerPrint: 30527f35849b9dde25b450d4833f0394 [ https://issues.apache.org/jira/browse/OPENEJB-1437?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Shawn Jiang updated OPENEJB-1437: --------------------------------- Attachment: 0001-adapt-to-ScannerService-interface-change.-Nothing-to.patch > Compilation error due to OpenWebbeans api changes. > -------------------------------------------------- > > Key: OPENEJB-1437 > URL: https://issues.apache.org/jira/browse/OPENEJB-1437 > Project: OpenEJB > Issue Type: Bug > Reporter: Shawn Jiang > Attachments: 0001-adapt-to-ScannerService-interface-change.-Nothing-to.patch > > > recently, we've been seeing many compilation error due to OpenWebbeans api changes. Need to open a JIRA to track them and attach patches for them. -- This message is automatically generated by JIRA. - For more information on JIRA, see: http://www.atlassian.com/software/jira From commitshannahhall@example.com Tue Mar 01 04:28:00 2011 Return-Path: <commitshannahhall@example.com> Delivered-To: hannahhall@example.com Received: (qmail 98226 invoked from network); 1 Mar 2011 04:28:00 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 Mar 2011 04:28:00 -0000 Received: (qmail 45796 invoked by uid 500); 1 Mar 2011 04:28:00 -0000 Delivered-To: hannahhall@example.com Received: (qmail 45735 invoked by uid 500); 1 Mar 2011 04:27:58 -0000 Mailing-List: contact hannahhall@example.com; run by ezmlm Precedence: bulk List-Help: <mailto:hannahhall@example.com> List-Unsubscribe: <mailto:hannahhall@example.com> List-Post: <mailto:hannahhall@example.com> List-Id: <commits.openejb.apache.org> Reply-To: hannahhall@example.com Delivered-To: mailing list hannahhall@example.com Received: (qmail 45714 invoked by uid 99); 1 Mar 2011 04:27:57 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Mar 2011 04:27:57 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,T_RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO hel.zones.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Mar 2011 04:27:57 +0000 Received: from hel.zones.apache.org (hel.zones.apache.org [83.161.120.155]) by hel.zones.apache.org (Postfix) with ESMTP id 3A66343552 for <hannahhall@example.com>; Tue, 1 Mar 2011 04:27:37 +0000 (UTC) Date: Tue, 1 Mar 2011 04:27:37 +0000 (UTC) From: "Shawn Jiang (JIRA)" <hannahhall@example.com> To: hannahhall@example.com Message-ID: <hannahhall@example.com> In-Reply-To: <hannahhall@example.com> Subject: [jira] Commented: (OPENEJB-1437) Compilation error due to OpenWebbeans api changes. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-JIRA-FingerPrint: 30527f35849b9dde25b450d4833f0394 [ https://issues.apache.org/jira/browse/OPENEJB-1437?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13000707#comment-13000707 ] Shawn Jiang commented on OPENEJB-1437: -------------------------------------- The "classes" field might be a possible candidate to clear in release() method. But the patch above just add a do noting release() method to CdiScanner to do a quick fix. [1]https://issues.apache.org/jira/browse/OWB-535 free ScannerService resources once we don't need it anymore > Compilation error due to OpenWebbeans api changes. > -------------------------------------------------- > > Key: OPENEJB-1437 > URL: https://issues.apache.org/jira/browse/OPENEJB-1437 > Project: OpenEJB > Issue Type: Bug > Reporter: Shawn Jiang > Attachments: 0001-adapt-to-ScannerService-interface-change.-Nothing-to.patch > > > recently, we've been seeing many compilation error due to OpenWebbeans api changes. Need to open a JIRA to track them and attach patches for them. -- This message is automatically generated by JIRA. - For more information on JIRA, see: http://www.atlassian.com/software/jira From commitshannahhall@example.com Tue Mar 01 05:54:23 2011 Return-Path: <commitshannahhall@example.com> Delivered-To: hannahhall@example.com Received: (qmail 91294 invoked from network); 1 Mar 2011 05:54:23 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 Mar 2011 05:54:23 -0000 Received: (qmail 96751 invoked by uid 500); 1 Mar 2011 05:54:23 -0000 Delivered-To: hannahhall@example.com Received: (qmail 96696 invoked by uid 500); 1 Mar 2011 05:54:21 -0000 Mailing-List: contact hannahhall@example.com; run by ezmlm Precedence: bulk List-Help: <mailto:hannahhall@example.com> List-Unsubscribe: <mailto:hannahhall@example.com> List-Post: <mailto:hannahhall@example.com> List-Id: <commits.openejb.apache.org> Reply-To: hannahhall@example.com Delivered-To: mailing list hannahhall@example.com Received: (qmail 96687 invoked by uid 99); 1 Mar 2011 05:54:20 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Mar 2011 05:54:20 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Mar 2011 05:54:19 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id A560F23888EC; Tue, 1 Mar 2011 05:53:59 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1075668 - /openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiScanner.java Date: Tue, 01 Mar 2011 05:53:59 -0000 To: hannahhall@example.com From: hannahhall@example.com X-Mailer: svnmailer-1.0.8 Message-Id: <hannahhall@example.com> Author: xuhaihong Date: Tue Mar 1 05:53:59 2011 New Revision: 1075668 URL: http://svn.apache.org/viewvc?rev=1075668&view=rev Log: OPENEJB-1437 Codes update due to OpenWebBeans SPI change Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiScanner.java Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiScanner.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiScanner.java?rev=1075668&r1=1075667&r2=1075668&view=diff ============================================================================== --- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiScanner.java (original) +++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiScanner.java Tue Mar 1 05:53:59 2011 @@ -20,7 +20,6 @@ package org.apache.openejb.cdi; -import java.net.URL; import java.util.Collections; import java.util.HashSet; import java.util.Set; @@ -72,7 +71,7 @@ public class CdiScanner implements Scann } final AnnotationManager annotationManager = webBeansContext.getAnnotationManager(); - + for (EjbJarInfo ejbJar : appInfo.ejbJars) { final BeansInfo beans = ejbJar.beans; @@ -159,4 +158,9 @@ public class CdiScanner implements Scann public Set<Class<?>> getBeanClasses() { return classes; } + + @Override + public void release() { + classes.clear(); + } } From commitshannahhall@example.com Tue Mar 01 05:56:02 2011 Return-Path: <commitshannahhall@example.com> Delivered-To: hannahhall@example.com Received: (qmail 91604 invoked from network); 1 Mar 2011 05:56:02 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 Mar 2011 05:56:02 -0000 Received: (qmail 98444 invoked by uid 500); 1 Mar 2011 05:56:01 -0000 Delivered-To: hannahhall@example.com Received: (qmail 98386 invoked by uid 500); 1 Mar 2011 05:56:00 -0000 Mailing-List: contact hannahhall@example.com; run by ezmlm Precedence: bulk List-Help: <mailto:hannahhall@example.com> List-Unsubscribe: <mailto:hannahhall@example.com> List-Post: <mailto:hannahhall@example.com> List-Id: <commits.openejb.apache.org> Reply-To: hannahhall@example.com Delivered-To: mailing list hannahhall@example.com Received: (qmail 98377 invoked by uid 99); 1 Mar 2011 05:56:00 -0000 Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Mar 2011 05:56:00 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,T_RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO hel.zones.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Mar 2011 05:55:58 +0000 Received: from hel.zones.apache.org (hel.zones.apache.org [83.161.120.155]) by hel.zones.apache.org (Postfix) with ESMTP id EA5FA43808 for <hannahhall@example.com>; Tue, 1 Mar 2011 05:55:36 +0000 (UTC) Date: Tue, 1 Mar 2011 05:55:36 +0000 (UTC) From: "Ivan (JIRA)" <hannahhall@example.com> To: hannahhall@example.com Message-ID: <hannahhall@example.com> In-Reply-To: <hannahhall@example.com> Subject: [jira] Resolved: (OPENEJB-1437) Compilation error due to OpenWebbeans api changes. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-JIRA-FingerPrint: 30527f35849b9dde25b450d4833f0394 X-Virus-Checked: Checked by ClamAV on apache.org [ https://issues.apache.org/jira/browse/OPENEJB-1437?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Ivan resolved OPENEJB-1437. --------------------------- Resolution: Fixed Fix Version/s: 3.2 Assignee: Ivan Commit the patch to hannahhall@example.com, thanks for the patch, Shawn. > Compilation error due to OpenWebbeans api changes. > -------------------------------------------------- > > Key: OPENEJB-1437 > URL: https://issues.apache.org/jira/browse/OPENEJB-1437 > Project: OpenEJB > Issue Type: Bug > Reporter: Shawn Jiang > Assignee: Ivan > Fix For: 3.2 > > Attachments: 0001-adapt-to-ScannerService-interface-change.-Nothing-to.patch > > > recently, we've been seeing many compilation error due to OpenWebbeans api changes. Need to open a JIRA to track them and attach patches for them. -- This message is automatically generated by JIRA. - For more information on JIRA, see: http://www.atlassian.com/software/jira From commitshannahhall@example.com Tue Mar 01 23:29:56 2011 Return-Path: <commitshannahhall@example.com> Delivered-To: hannahhall@example.com Received: (qmail 55597 invoked from network); 1 Mar 2011 23:29:56 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 Mar 2011 23:29:56 -0000 Received: (qmail 57590 invoked by uid 500); 1 Mar 2011 23:29:56 -0000 Delivered-To: hannahhall@example.com Received: (qmail 57558 invoked by uid 500); 1 Mar 2011 23:29:55 -0000 Mailing-List: contact hannahhall@example.com; run by ezmlm Precedence: bulk List-Help: <mailto:hannahhall@example.com> List-Unsubscribe: <mailto:hannahhall@example.com> List-Post: <mailto:hannahhall@example.com> List-Id: <commits.openejb.apache.org> Reply-To: hannahhall@example.com Delivered-To: mailing list hannahhall@example.com Received: (qmail 57489 invoked by uid 99); 1 Mar 2011 23:29:55 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Mar 2011 23:29:55 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Mar 2011 23:29:54 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 0528A2388906; Tue, 1 Mar 2011 23:29:04 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1076049 - in /openejb/trunk/openejb3: ./ assembly/openejb-tomcat/openejb-tomcat-catalina/ assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/ assembly/openejb-tomcat/openejb-tomcat-common/ asse... Date: Tue, 01 Mar 2011 23:29:03 -0000 To: hannahhall@example.com From: hannahhall@example.com X-Mailer: svnmailer-1.0.8 Message-Id: <hannahhall@example.com> Author: dblevins Date: Tue Mar 1 23:29:03 2011 New Revision: 1076049 URL: http://svn.apache.org/viewvc?rev=1076049&view=rev Log: Compile against 7.0.8 Modified: openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/pom.xml openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/BackportUtil.java openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/GlobalListenerSupport.java openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/TomcatWebAppBuilder.java openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-common/pom.xml openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-loader/pom.xml openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/pom.xml openejb/trunk/openejb3/assembly/openejb-webapp/pom.xml openejb/trunk/openejb3/pom.xml Modified: openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/pom.xml URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/pom.xml?rev=1076049&r1=1076048&r2=1076049&view=diff ============================================================================== --- openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/pom.xml (original) +++ openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/pom.xml Tue Mar 1 23:29:03 2011 @@ -86,7 +86,7 @@ </dependency> <dependency> <groupId>org.apache.tomcat</groupId> - <artifactId>catalina</artifactId> + <artifactId>tomcat-catalina</artifactId> </dependency> </dependencies> </project> Modified: openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/BackportUtil.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/BackportUtil.java?rev=1076049&r1=1076048&r2=1076049&view=diff ============================================================================== --- openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/BackportUtil.java (original) +++ openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/BackportUtil.java Tue Mar 1 23:29:03 2011 @@ -25,7 +25,11 @@ import org.apache.catalina.deploy.Naming import org.apache.openejb.tomcat.common.TomcatVersion; import javax.servlet.Servlet; +import java.io.File; import java.lang.reflect.Field; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.net.MalformedURLException; import java.security.AccessController; import java.security.PrivilegedAction; @@ -37,14 +41,27 @@ public class BackportUtil { private static API api; static { - if (TomcatVersion.v6.isTheVersion()) { - api = new Tomcat6(); - } else { - api = new Tomcat55(); + switch (TomcatVersion.get()) { + case v7: { + api = new Tomcat7(); + break; + } + case v6: { + api = new Tomcat6(); + break; + } + case v55: { + api = new Tomcat55(); + break; + } + default: { + // TODO Perhaps fail or log + api = new Tomcat55(); + } } } - private static API getAPI() { + public static API getAPI() { return api; } @@ -72,8 +89,20 @@ public class BackportUtil { NamingContextListener getNamingContextListener(StandardContext standardContext); void removeService(NamingContextListener namingContextListener, String serviceName); + + void setConfigFile(StandardContext standardContext, File contextXmlFile); } + public static class Tomcat7 extends Tomcat6 implements API { + @Override + public void setConfigFile(StandardContext standardContext, File contextXmlFile) { + try { + standardContext.setConfigFile(contextXmlFile.toURI().toURL()); + } catch (MalformedURLException e) { + throw new RuntimeException(e); + } + } + } public static class Tomcat6 implements API { public Servlet getServlet(Wrapper wrapper) { @@ -92,6 +121,16 @@ public class BackportUtil { public void removeService(NamingContextListener namingContextListener, String serviceName) { namingContextListener.removeService(serviceName); } + + @Override + public void setConfigFile(StandardContext standardContext, File contextXmlFile) { + try { + Method method = StandardContext.class.getMethod("setConfigFile", String.class); + method.invoke(standardContext, contextXmlFile.getAbsolutePath()); + } catch (Exception e) { + throw new IllegalStateException("Cannot setConfigFile", e); + } + } } public static class Tomcat55 implements API { @@ -127,6 +166,16 @@ public class BackportUtil { public void removeService(NamingContextListener namingContextListener, String serviceName) { } + @Override + public void setConfigFile(StandardContext standardContext, File contextXmlFile) { + try { + Method method = StandardContext.class.getMethod("setConfigFile", String.class); + method.invoke(standardContext, contextXmlFile.getAbsolutePath()); + } catch (Exception e) { + throw new IllegalStateException("Cannot setConfigFile", e); + } + } + private Field getField(final Class clazz, final String name) { return AccessController.doPrivileged(new PrivilegedAction<Field>() { public Field run() { Modified: openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/GlobalListenerSupport.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/GlobalListenerSupport.java?rev=1076049&r1=1076048&r2=1076049&view=diff ============================================================================== --- openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/GlobalListenerSupport.java (original) +++ openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/GlobalListenerSupport.java Tue Mar 1 23:29:03 2011 @@ -44,6 +44,20 @@ import java.util.Map; public class GlobalListenerSupport implements PropertyChangeListener, LifecycleListener { /** + * The LifecycleEvent type for the "component init" event. + * Tomcat 6.0.x only + * Removed in Tomcat 7 + */ + public static final String INIT_EVENT = "init"; + + /** + * The LifecycleEvent type for the "component destroy" event. + * Tomcat 6.0.x only + * Removed in Tomcat 7 + */ + public static final String DESTROY_EVENT = "destroy"; + + /** * Tomcat server instance */ private final StandardServer standardServer; @@ -75,7 +89,7 @@ public class GlobalListenerSupport imple StandardContext standardContext = (StandardContext) source; String type = event.getType(); - if (Lifecycle.INIT_EVENT.equals(type)) { + if (INIT_EVENT.equals(type) || Lifecycle.BEFORE_INIT_EVENT.equals(type)) { contextListener.init(standardContext); } else if (Lifecycle.BEFORE_START_EVENT.equals(type)) { contextListener.beforeStart(standardContext); @@ -97,7 +111,7 @@ public class GlobalListenerSupport imple contextListener.stop(standardContext); } else if (Lifecycle.AFTER_STOP_EVENT.equals(type)) { contextListener.afterStop(standardContext); - } else if (Lifecycle.DESTROY_EVENT.equals(type)) { + } else if (DESTROY_EVENT.equals(type) || Lifecycle.AFTER_DESTROY_EVENT.equals(type)) { contextListener.destroy(standardContext); } } else if (source instanceof StandardHost) { Modified: openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/TomcatWebAppBuilder.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/TomcatWebAppBuilder.java?rev=1076049&r1=1076048&r2=1076049&view=diff ============================================================================== --- openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/TomcatWebAppBuilder.java (original) +++ openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-catalina/src/main/java/org/apache/openejb/tomcat/catalina/TomcatWebAppBuilder.java Tue Mar 1 23:29:03 2011 @@ -197,9 +197,10 @@ public class TomcatWebAppBuilder impleme for (WebAppInfo webApp : appInfo.webApps) { if (getContextInfo(webApp) == null) { StandardContext standardContext = new StandardContext(); - String contextXmlFile = webApp.path + "/META-INF/context.xml"; - if (new File(contextXmlFile).exists()) { - standardContext.setConfigFile(contextXmlFile); + String s = File.pathSeparator; + File contextXmlFile = new File(webApp.path + s + "META-INF" + s + "context.xml"); + if (contextXmlFile.exists()) { + BackportUtil.getAPI().setConfigFile(standardContext, contextXmlFile); standardContext.setOverride(true); } ContextConfig contextConfig = new ContextConfig(); Modified: openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-common/pom.xml URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-common/pom.xml?rev=1076049&r1=1076048&r2=1076049&view=diff ============================================================================== --- openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-common/pom.xml (original) +++ openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-common/pom.xml Tue Mar 1 23:29:03 2011 @@ -63,7 +63,7 @@ </dependency> <dependency> <groupId>org.apache.tomcat</groupId> - <artifactId>catalina</artifactId> + <artifactId>tomcat-catalina</artifactId> </dependency> </dependencies> </project> Modified: openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-loader/pom.xml URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-loader/pom.xml?rev=1076049&r1=1076048&r2=1076049&view=diff ============================================================================== --- openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-loader/pom.xml (original) +++ openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-loader/pom.xml Tue Mar 1 23:29:03 2011 @@ -37,7 +37,7 @@ </dependency> <dependency> <groupId>org.apache.tomcat</groupId> - <artifactId>catalina</artifactId> + <artifactId>tomcat-catalina</artifactId> </dependency> </dependencies> </project> Modified: openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/pom.xml URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/pom.xml?rev=1076049&r1=1076048&r2=1076049&view=diff ============================================================================== --- openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/pom.xml (original) +++ openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/pom.xml Tue Mar 1 23:29:03 2011 @@ -216,7 +216,7 @@ </dependency> <dependency> <groupId>org.apache.tomcat</groupId> - <artifactId>catalina</artifactId> + <artifactId>tomcat-catalina</artifactId> </dependency> <dependency> <groupId>org.apache.myfaces.core</groupId> Modified: openejb/trunk/openejb3/assembly/openejb-webapp/pom.xml URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-webapp/pom.xml?rev=1076049&r1=1076048&r2=1076049&view=diff ============================================================================== --- openejb/trunk/openejb3/assembly/openejb-webapp/pom.xml (original) +++ openejb/trunk/openejb3/assembly/openejb-webapp/pom.xml Tue Mar 1 23:29:03 2011 @@ -216,7 +216,7 @@ </dependency> <dependency> <groupId>org.apache.tomcat</groupId> - <artifactId>catalina</artifactId> + <artifactId>tomcat-catalina</artifactId> </dependency> </dependencies> </project> Modified: openejb/trunk/openejb3/pom.xml URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/pom.xml?rev=1076049&r1=1076048&r2=1076049&view=diff ============================================================================== --- openejb/trunk/openejb3/pom.xml (original) +++ openejb/trunk/openejb3/pom.xml Tue Mar 1 23:29:03 2011 @@ -109,7 +109,7 @@ <openejb.osgi.symbolic.name>${project.groupId}.${project.artifactId}</openejb.osgi.symbolic.name> <!-- Used in assembly/openejb-tomcat* projects --> - <tomcatVersion>6.0.29</tomcatVersion> + <tomcatVersion>7.0.8</tomcatVersion> <!-- - http://docs.codehaus.org/display/MAVENUSER/POM+Element+for+Source+File+Encoding @@ -950,7 +950,7 @@ </dependency> <dependency> <groupId>org.apache.tomcat</groupId> - <artifactId>catalina</artifactId> + <artifactId>tomcat-catalina</artifactId> <version>${tomcatVersion}</version> <optional>true</optional> </dependency> From commitshannahhall@example.com Wed Mar 02 00:25:27 2011 Return-Path: <commitshannahhall@example.com> Delivered-To: hannahhall@example.com Received: (qmail 38500 invoked from network); 2 Mar 2011 00:25:27 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 2 Mar 2011 00:25:27 -0000 Received: (qmail 11436 invoked by uid 500); 2 Mar 2011 00:25:27 -0000 Delivered-To: hannahhall@example.com Received: (qmail 11380 invoked by uid 500); 2 Mar 2011 00:25:27 -0000 Mailing-List: contact hannahhall@example.com; run by ezmlm Precedence: bulk List-Help: <mailto:hannahhall@example.com> List-Unsubscribe: <mailto:hannahhall@example.com> List-Post: <mailto:hannahhall@example.com> List-Id: <commits.openejb.apache.org> Reply-To: hannahhall@example.com Delivered-To: mailing list hannahhall@example.com Received: (qmail 11373 invoked by uid 99); 2 Mar 2011 00:25:27 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Mar 2011 00:25:27 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Mar 2011 00:25:26 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id E070F23888CD; Wed, 2 Mar 2011 00:25:06 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1076064 - in /openejb/trunk/openejb3/assembly: openejb-webapp/ pom.xml Date: Wed, 02 Mar 2011 00:25:06 -0000 To: hannahhall@example.com From: hannahhall@example.com X-Mailer: svnmailer-1.0.8 Message-Id: <hannahhall@example.com> Author: dblevins Date: Wed Mar 2 00:25:06 2011 New Revision: 1076064 URL: http://svn.apache.org/viewvc?rev=1076064&view=rev Log: Yanking the redundant openejb-webapp. Just cruft at this point. Removed: openejb/trunk/openejb3/assembly/openejb-webapp/ Modified: openejb/trunk/openejb3/assembly/pom.xml Modified: openejb/trunk/openejb3/assembly/pom.xml URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/pom.xml?rev=1076064&r1=1076063&r2=1076064&view=diff ============================================================================== --- openejb/trunk/openejb3/assembly/pom.xml (original) +++ openejb/trunk/openejb3/assembly/pom.xml Wed Mar 2 00:25:06 2011 @@ -34,7 +34,6 @@ <module>openejb-itests-standalone-client</module> <module>openejb-tomcat</module> <module>openejb-jetty</module> - <module>openejb-webapp</module> <module>javaee-api-libs</module> <module>openejb-standalone</module> <!-- don't run this just yet, its in progress --> From commitshannahhall@example.com Wed Mar 02 06:31:15 2011 Return-Path: <commitshannahhall@example.com> Delivered-To: hannahhall@example.com Received: (qmail 17726 invoked from network); 2 Mar 2011 06:31:15 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 2 Mar 2011 06:31:15 -0000 Received: (qmail 817 invoked by uid 500); 2 Mar 2011 06:31:15 -0000 Delivered-To: hannahhall@example.com Received: (qmail 765 invoked by uid 500); 2 Mar 2011 06:31:13 -0000 Mailing-List: contact hannahhall@example.com; run by ezmlm Precedence: bulk List-Help: <mailto:hannahhall@example.com> List-Unsubscribe: <mailto:hannahhall@example.com> List-Post: <mailto:hannahhall@example.com> List-Id: <commits.openejb.apache.org> Reply-To: hannahhall@example.com Delivered-To: mailing list hannahhall@example.com Received: (qmail 758 invoked by uid 99); 2 Mar 2011 06:31:12 -0000 Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Mar 2011 06:31:12 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Mar 2011 06:31:10 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 6C7C423889B2; Wed, 2 Mar 2011 06:30:49 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1076113 - /openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java Date: Wed, 02 Mar 2011 06:30:49 -0000 To: hannahhall@example.com From: hannahhall@example.com X-Mailer: svnmailer-1.0.8 Message-Id: <hannahhall@example.com> X-Virus-Checked: Checked by ClamAV on apache.org Author: dblevins Date: Wed Mar 2 06:30:49 2011 New Revision: 1076113 URL: http://svn.apache.org/viewvc?rev=1076113&view=rev Log: Clearly mark standalone web modules as such and ensure their jars are listed in the "fake" appmodule libraries list Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java?rev=1076113&r1=1076112&r2=1076113&view=diff ============================================================================== --- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java (original) +++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java Wed Mar 2 06:30:49 2011 @@ -224,7 +224,9 @@ public class DeploymentLoader implements && (loadingRequiredModuleTypes.contains(WebModule.class) || loadingRequiredModuleTypes.contains(EjbModule.class) || loadingRequiredModuleTypes.contains(PersistenceModule.class))) { final File file = toFile(baseUrl); - AppModule appModule = new AppModule(OpenEJB.class.getClassLoader(), file.getAbsolutePath()); + // Standalone Web Module + + AppModule appModule = new AppModule(OpenEJB.class.getClassLoader(), file.getAbsolutePath(), new Application(), true); addWebModule(appModule, baseUrl, OpenEJB.class.getClassLoader(), getContextRoot(), getModuleName()); return appModule; } else if (PersistenceModule.class.equals(moduleClass) && loadingRequiredModuleTypes.contains(PersistenceModule.class)) { @@ -590,12 +592,14 @@ public class DeploymentLoader implements } protected void addWebModule(AppModule appModule, URL warUrl, ClassLoader parentClassLoader, String contextRoot, String moduleName) throws OpenEJBException { - // create and add the WebModule String warPath = URLs.toFilePath(warUrl); WebModule webModule = createWebModule(appModule.getJarLocation(), warPath, parentClassLoader, contextRoot, moduleName); if (loadingRequiredModuleTypes.contains(WebModule.class)) { appModule.getWebModules().add(webModule); + if (appModule.isStandaloneModule()) { + appModule.getAdditionalLibraries().addAll(webModule.getUrls()); + } } // Per the Spec version of the Collapsed EAR there From commitshannahhall@example.com Thu Mar 03 01:27:58 2011 Return-Path: <commitshannahhall@example.com> Delivered-To: hannahhall@example.com Received: (qmail 71328 invoked from network); 3 Mar 2011 01:27:58 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 3 Mar 2011 01:27:58 -0000 Received: (qmail 65269 invoked by uid 500); 3 Mar 2011 01:27:57 -0000 Delivered-To: hannahhall@example.com Received: (qmail 64805 invoked by uid 500); 3 Mar 2011 01:27:56 -0000 Mailing-List: contact hannahhall@example.com; run by ezmlm Precedence: bulk List-Help: <mailto:hannahhall@example.com> List-Unsubscribe: <mailto:hannahhall@example.com> List-Post: <mailto:hannahhall@example.com> List-Id: <commits.openejb.apache.org> Reply-To: hannahhall@example.com Delivered-To: mailing list hannahhall@example.com Received: (qmail 64643 invoked by uid 99); 3 Mar 2011 01:27:56 -0000 Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Mar 2011 01:27:56 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Mar 2011 01:27:53 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id C08A123889D7; Thu, 3 Mar 2011 01:26:52 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1076484 - in /openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config: AppModule.java ClientModule.java ConnectorModule.java EjbModule.java PersistenceModule.java SunConversion.java WebModule.java Date: Thu, 03 Mar 2011 01:26:52 -0000 To: hannahhall@example.com From: hannahhall@example.com X-Mailer: svnmailer-1.0.8 Message-Id: <hannahhall@example.com> X-Virus-Checked: Checked by ClamAV on apache.org Author: dblevins Date: Thu Mar 3 01:26:52 2011 New Revision: 1076484 URL: http://svn.apache.org/viewvc?rev=1076484&view=rev Log: Add toString() to the DeploymentModule impls for easier debugging.. Normalize jndi reference names to contain "java:comp/env" if they don't already Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AppModule.java openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ClientModule.java openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ConnectorModule.java openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/EjbModule.java openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/PersistenceModule.java openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/SunConversion.java openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/WebModule.java Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AppModule.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AppModule.java?rev=1076484&r1=1076483&r2=1076484&view=diff ============================================================================== --- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AppModule.java (original) +++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AppModule.java Thu Mar 3 01:26:52 2011 @@ -240,4 +240,12 @@ public class AppModule implements Deploy modules.addAll(clientModules); return modules; } + + + @Override + public String toString() { + return "AppModule{" + + "moduleId='" + moduleId + '\'' + + '}'; + } } Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ClientModule.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ClientModule.java?rev=1076484&r1=1076483&r2=1076484&view=diff ============================================================================== --- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ClientModule.java (original) +++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ClientModule.java Thu Mar 3 01:26:52 2011 @@ -140,4 +140,12 @@ public class ClientModule implements Dep public Set<String> getWatchedResources() { return watchedResources; } + + @Override + public String toString() { + return "ClientModule{" + + "moduleId='" + moduleId + '\'' + + ", mainClass='" + mainClass + '\'' + + '}'; + } } Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ConnectorModule.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ConnectorModule.java?rev=1076484&r1=1076483&r2=1076484&view=diff ============================================================================== --- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ConnectorModule.java (original) +++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ConnectorModule.java Thu Mar 3 01:26:52 2011 @@ -114,4 +114,11 @@ public class ConnectorModule implements public Set<String> getWatchedResources() { return watchedResources; } + + @Override + public String toString() { + return "ConnectorModule{" + + "moduleId='" + moduleId + '\'' + + '}'; + } } Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/EjbModule.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/EjbModule.java?rev=1076484&r1=1076483&r2=1076484&view=diff ============================================================================== --- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/EjbModule.java (original) +++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/EjbModule.java Thu Mar 3 01:26:52 2011 @@ -189,4 +189,11 @@ public class EjbModule implements WsModu public Set<String> getWatchedResources() { return watchedResources; } + + @Override + public String toString() { + return "EjbModule{" + + "moduleId='" + moduleId + '\'' + + '}'; + } } Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/PersistenceModule.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/PersistenceModule.java?rev=1076484&r1=1076483&r2=1076484&view=diff ============================================================================== --- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/PersistenceModule.java (original) +++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/PersistenceModule.java Thu Mar 3 01:26:52 2011 @@ -71,4 +71,11 @@ public class PersistenceModule implement public ValidationContext getValidation() { return null; } + + @Override + public String toString() { + return "PersistenceModule{" + + "rootUrl='" + rootUrl + '\'' + + '}'; + } } Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/SunConversion.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/SunConversion.java?rev=1076484&r1=1076483&r2=1076484&view=diff ============================================================================== --- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/SunConversion.java (original) +++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/SunConversion.java Thu Mar 3 01:26:52 2011 @@ -258,6 +258,7 @@ public class SunConversion implements Dy for (EjbRef ref : sunApplicationClient.getEjbRef()) { if (ref.getJndiName() != null) { String refName = ref.getEjbRefName(); + refName = normalize(refName); org.apache.openejb.jee.EjbRef ejbRef = refMap.get(refName); if (ejbRef == null) { ejbRef = new org.apache.openejb.jee.EjbRef(); @@ -277,6 +278,7 @@ public class SunConversion implements Dy for (ResourceRef ref : sunApplicationClient.getResourceRef()) { if (ref.getJndiName() != null) { String refName = ref.getResRefName(); + refName = normalize(refName); JndiReference resEnvRef = resEnvMap.get(refName); if (resEnvRef != null) { resEnvRef.setMappedName(ref.getJndiName()); @@ -286,6 +288,7 @@ public class SunConversion implements Dy for (ResourceEnvRef ref : sunApplicationClient.getResourceEnvRef()) { if (ref.getJndiName() != null) { String refName = ref.getResourceEnvRefName(); + refName = normalize(refName); JndiReference resEnvRef = resEnvMap.get(refName); if (resEnvRef != null) { resEnvRef.setMappedName(ref.getJndiName()); @@ -295,6 +298,7 @@ public class SunConversion implements Dy for (MessageDestinationRef ref : sunApplicationClient.getMessageDestinationRef()) { if (ref.getJndiName() != null) { String refName = ref.getMessageDestinationRefName(); + refName = normalize(refName); JndiReference resEnvRef = resEnvMap.get(refName); if (resEnvRef != null) { resEnvRef.setMappedName(ref.getJndiName()); @@ -305,6 +309,7 @@ public class SunConversion implements Dy Map<String, ServiceRef> serviceRefMap = applicationClient.getServiceRefMap(); for (org.apache.openejb.jee.sun.ServiceRef ref : sunApplicationClient.getServiceRef()) { String refName = ref.getServiceRefName(); + refName = normalize(refName); ServiceRef serviceRef = serviceRefMap.get(refName); if (serviceRef != null) { Map<String,PortComponentRef> ports = new TreeMap<String,PortComponentRef>(); @@ -337,6 +342,11 @@ public class SunConversion implements Dy } } + private String normalize(String refName) { + if (!refName.startsWith("java:")) refName = "java:comp/env/" + refName; + return refName; + } + public void convertModule(WebModule webModule) { if (webModule == null) { return; @@ -384,6 +394,7 @@ public class SunConversion implements Dy for (ResourceRef ref : sunWebApp.getResourceRef()) { if (ref.getJndiName() != null) { String refName = ref.getResRefName(); + refName = normalize(refName); JndiReference resEnvRef = resEnvMap.get(refName); if (resEnvRef != null) { resEnvRef.setMappedName(ref.getJndiName()); @@ -393,6 +404,7 @@ public class SunConversion implements Dy for (ResourceEnvRef ref : sunWebApp.getResourceEnvRef()) { if (ref.getJndiName() != null) { String refName = ref.getResourceEnvRefName(); + refName = normalize(refName); JndiReference resEnvRef = resEnvMap.get(refName); if (resEnvRef != null) { resEnvRef.setMappedName(ref.getJndiName()); @@ -402,6 +414,7 @@ public class SunConversion implements Dy for (MessageDestinationRef ref : sunWebApp.getMessageDestinationRef()) { if (ref.getJndiName() != null) { String refName = ref.getMessageDestinationRefName(); + refName = normalize(refName); JndiReference resEnvRef = resEnvMap.get(refName); if (resEnvRef != null) { resEnvRef.setMappedName(ref.getJndiName()); @@ -412,6 +425,7 @@ public class SunConversion implements Dy Map<String, ServiceRef> serviceRefMap = webApp.getServiceRefMap(); for (org.apache.openejb.jee.sun.ServiceRef ref : sunWebApp.getServiceRef()) { String refName = ref.getServiceRefName(); + refName = normalize(refName); ServiceRef serviceRef = serviceRefMap.get(refName); if (serviceRef != null) { Map<String,PortComponentRef> ports = new TreeMap<String,PortComponentRef>(); @@ -533,6 +547,7 @@ public class SunConversion implements Dy for (EjbRef ref : ejb.getEjbRef()) { if (ref.getJndiName() != null) { String refName = ref.getEjbRefName(); + refName = normalize(refName); EjbLink link = linksMap.get(refName); if (link == null) { link = new EjbLink(); @@ -548,6 +563,7 @@ public class SunConversion implements Dy for (ResourceRef ref : ejb.getResourceRef()) { if (ref.getJndiName() != null) { String refName = ref.getResRefName(); + refName = normalize(refName); ResourceLink link = resourceLinksMap.get(refName); if (link == null) { link = new ResourceLink(); @@ -562,6 +578,7 @@ public class SunConversion implements Dy for (ResourceEnvRef ref : ejb.getResourceEnvRef()) { if (ref.getJndiName() != null) { String refName = ref.getResourceEnvRefName(); + refName = normalize(refName); ResourceLink link = resourceLinksMap.get(refName); if (link == null) { link = new ResourceLink(); @@ -576,6 +593,7 @@ public class SunConversion implements Dy for (MessageDestinationRef ref : ejb.getMessageDestinationRef()) { if (ref.getJndiName() != null) { String refName = ref.getMessageDestinationRefName(); + refName = normalize(refName); ResourceLink link = resourceLinksMap.get(refName); if (link == null) { link = new ResourceLink(); @@ -592,6 +610,7 @@ public class SunConversion implements Dy Map<String, ServiceRef> serviceRefMap = bean.getServiceRefMap(); for (org.apache.openejb.jee.sun.ServiceRef ref : ejb.getServiceRef()) { String refName = ref.getServiceRefName(); + refName = normalize(refName); ServiceRef serviceRef = serviceRefMap.get(refName); if (serviceRef != null) { Map<String,PortComponentRef> ports = new TreeMap<String,PortComponentRef>(); Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/WebModule.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/WebModule.java?rev=1076484&r1=1076483&r2=1076484&view=diff ============================================================================== --- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/WebModule.java (original) +++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/WebModule.java Thu Mar 3 01:26:52 2011 @@ -184,4 +184,12 @@ public class WebModule implements WsModu public List<FacesConfig> getFacesConfigs() { return facesConfigs; } + + @Override + public String toString() { + return "WebModule{" + + "moduleId='" + moduleId + '\'' + + ", contextRoot='" + contextRoot + '\'' + + '}'; + } } From commitshannahhall@example.com Thu Mar 03 05:12:36 2011 Return-Path: <commitshannahhall@example.com> Delivered-To: hannahhall@example.com Received: (qmail 87580 invoked from network); 3 Mar 2011 05:12:36 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 3 Mar 2011 05:12:36 -0000 Received: (qmail 30705 invoked by uid 500); 3 Mar 2011 05:12:34 -0000 Delivered-To: hannahhall@example.com Received: (qmail 30670 invoked by uid 500); 3 Mar 2011 05:12:34 -0000 Mailing-List: contact hannahhall@example.com; run by ezmlm Precedence: bulk List-Help: <mailto:hannahhall@example.com> List-Unsubscribe: <mailto:hannahhall@example.com> List-Post: <mailto:hannahhall@example.com> List-Id: <commits.openejb.apache.org> Reply-To: hannahhall@example.com Delivered-To: mailing list hannahhall@example.com Received: (qmail 30642 invoked by uid 99); 3 Mar 2011 05:12:33 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Mar 2011 05:12:33 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Mar 2011 05:12:34 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 88F0C2388A32; Thu, 3 Mar 2011 05:11:36 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1076527 - /openejb/branches/openejb-3.2.x/ Date: Thu, 03 Mar 2011 05:11:36 -0000 To: hannahhall@example.com From: hannahhall@example.com X-Mailer: svnmailer-1.0.8 Message-Id: <hannahhall@example.com> Author: dblevins Date: Thu Mar 3 05:11:36 2011 New Revision: 1076527 URL: http://svn.apache.org/viewvc?rev=1076527&view=rev Log: New branch for JPA 2.0 and Java 6 support Added: openejb/branches/openejb-3.2.x/ (props changed) - copied from r1076526, openejb/branches/openejb-3.1.x/ Propchange: openejb/branches/openejb-3.2.x/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Thu Mar 3 05:11:36 2011 @@ -0,0 +1,8 @@ +*.ipr +*.iml +*.iws +*.log +*~ +.project +.classpath +target Propchange: openejb/branches/openejb-3.2.x/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Thu Mar 3 05:11:36 2011 @@ -0,0 +1,2 @@ +/openejb/branches/openejb-3.1.1:779593 +/openejb/trunk/openejb3:943472,943862,943965,944757,945989,946399,946485,946489,946705,946792,946805,946814,946861,946863-946864,947010,947017,947042,948022,948241,948243,948548,949014,949233,950391,950801,951611,953191,953196,953556,955104,955496,957463,962382,962750,987030,1004172,1029528 From commitshannahhall@example.com Thu Mar 03 17:24:26 2011 Return-Path: <commitshannahhall@example.com> Delivered-To: hannahhall@example.com Received: (qmail 89426 invoked from network); 3 Mar 2011 17:24:26 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 3 Mar 2011 17:24:26 -0000 Received: (qmail 83262 invoked by uid 500); 3 Mar 2011 17:24:26 -0000 Delivered-To: hannahhall@example.com Received: (qmail 83222 invoked by uid 500); 3 Mar 2011 17:24:25 -0000 Mailing-List: contact hannahhall@example.com; run by ezmlm Precedence: bulk List-Help: <mailto:hannahhall@example.com> List-Unsubscribe: <mailto:hannahhall@example.com> List-Post: <mailto:hannahhall@example.com> List-Id: <commits.openejb.apache.org> Reply-To: hannahhall@example.com Delivered-To: mailing list hannahhall@example.com Received: (qmail 83212 invoked by uid 99); 3 Mar 2011 17:24:25 -0000 Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Mar 2011 17:24:25 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Mar 2011 17:24:23 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id A413923889E7; Thu, 3 Mar 2011 17:24:02 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1076690 - /openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/timer/EjbTimerServiceImpl.java Date: Thu, 03 Mar 2011 17:24:02 -0000 To: hannahhall@example.com From: hannahhall@example.com X-Mailer: svnmailer-1.0.8 Message-Id: <hannahhall@example.com> X-Virus-Checked: Checked by ClamAV on apache.org Author: dblevins Date: Thu Mar 3 17:24:02 2011 New Revision: 1076690 URL: http://svn.apache.org/viewvc?rev=1076690&view=rev Log: Tweak code to check for allowed operations to be more compliant Need to check methods of TimerService, not just TimerImpl Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/timer/EjbTimerServiceImpl.java Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/timer/EjbTimerServiceImpl.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/timer/EjbTimerServiceImpl.java?rev=1076690&r1=1076689&r2=1076690&view=diff ============================================================================== --- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/timer/EjbTimerServiceImpl.java (original) +++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/timer/EjbTimerServiceImpl.java Thu Mar 3 17:24:02 2011 @@ -286,9 +286,7 @@ public class EjbTimerServiceImpl impleme */ private void checkState() throws IllegalStateException { final BaseContext context = (BaseContext) deployment.get(EJBContext.class); - if (!context.isTimerMethodAllowed()) { - throw new IllegalStateException("TimerService method not permitted for current operation " + ThreadContext.getThreadContext().getCurrentOperation().name()); - } + context.check(BaseContext.Call.timerMethod); } /** From commitshannahhall@example.com Thu Mar 03 17:37:51 2011 Return-Path: <commitshannahhall@example.com> Delivered-To: hannahhall@example.com Received: (qmail 46200 invoked from network); 3 Mar 2011 17:37:51 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 3 Mar 2011 17:37:51 -0000 Received: (qmail 16125 invoked by uid 500); 3 Mar 2011 17:37:51 -0000 Delivered-To: hannahhall@example.com Received: (qmail 16099 invoked by uid 500); 3 Mar 2011 17:37:51 -0000 Mailing-List: contact hannahhall@example.com; run by ezmlm Precedence: bulk List-Help: <mailto:hannahhall@example.com> List-Unsubscribe: <mailto:hannahhall@example.com> List-Post: <mailto:hannahhall@example.com> List-Id: <commits.openejb.apache.org> Reply-To: hannahhall@example.com Delivered-To: mailing list hannahhall@example.com Received: (qmail 16092 invoked by uid 99); 3 Mar 2011 17:37:51 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Mar 2011 17:37:51 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Mar 2011 17:37:50 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 88DA92388A41; Thu, 3 Mar 2011 17:37:30 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1076698 - in /openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core: cmp/CmpContainer.java entity/EntityInstanceManager.java Date: Thu, 03 Mar 2011 17:37:30 -0000 To: hannahhall@example.com From: hannahhall@example.com X-Mailer: svnmailer-1.0.8 Message-Id: <hannahhall@example.com> Author: dblevins Date: Thu Mar 3 17:37:30 2011 New Revision: 1076698 URL: http://svn.apache.org/viewvc?rev=1076698&view=rev Log: Ensure the EntityContext is set in the BeanContext so allowed operations checking can work Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/CmpContainer.java openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EntityInstanceManager.java Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/CmpContainer.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/CmpContainer.java?rev=1076698&r1=1076697&r2=1076698&view=diff ============================================================================== --- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/CmpContainer.java (original) +++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/CmpContainer.java Thu Mar 3 17:37:30 2011 @@ -30,6 +30,7 @@ import java.util.Map; import java.util.ArrayList; import java.util.LinkedHashSet; import java.util.Set; +import javax.ejb.EJBContext; import javax.ejb.EJBException; import javax.ejb.EJBHome; import javax.ejb.EJBLocalHome; @@ -158,7 +159,7 @@ public class CmpContainer implements Rpc cmpEngine.deploy(beanContext); beanContext.setContainerData(cmpEngine); - + beanContext.set(EJBContext.class, new EntityContext(securityService)); // try to set deploymentInfo static field on bean implementation class try { Field field = beanContext.getCmpImplClass().getField("deploymentInfo"); Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EntityInstanceManager.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EntityInstanceManager.java?rev=1076698&r1=1076697&r2=1076698&view=diff ============================================================================== --- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EntityInstanceManager.java (original) +++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EntityInstanceManager.java Thu Mar 3 17:37:30 2011 @@ -33,6 +33,7 @@ import org.apache.openejb.util.LogCatego import org.apache.openejb.util.Logger; import org.apache.openejb.util.Stack; +import javax.ejb.EJBContext; import javax.ejb.EntityBean; import javax.ejb.NoSuchEntityException; import java.util.HashMap; @@ -69,6 +70,7 @@ public class EntityInstanceManager { public void deploy(BeanContext beanContext) { poolMap.put(beanContext.getDeploymentID(), new LinkedListStack(poolsize / 2)); + beanContext.set(EJBContext.class, createEntityContext()); } public void undeploy(BeanContext beanContext) { From commitshannahhall@example.com Thu Mar 03 21:07:00 2011 Return-Path: <commitshannahhall@example.com> Delivered-To: hannahhall@example.com Received: (qmail 62407 invoked from network); 3 Mar 2011 21:07:00 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 3 Mar 2011 21:07:00 -0000 Received: (qmail 97423 invoked by uid 500); 3 Mar 2011 21:07:00 -0000 Delivered-To: hannahhall@example.com Received: (qmail 97409 invoked by uid 500); 3 Mar 2011 21:07:00 -0000 Mailing-List: contact hannahhall@example.com; run by ezmlm Precedence: bulk List-Help: <mailto:hannahhall@example.com> List-Unsubscribe: <mailto:hannahhall@example.com> List-Post: <mailto:hannahhall@example.com> List-Id: <commits.openejb.apache.org> Reply-To: hannahhall@example.com Delivered-To: mailing list hannahhall@example.com Received: (qmail 97401 invoked by uid 99); 3 Mar 2011 21:06:59 -0000 Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Mar 2011 21:06:59 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,T_RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO hel.zones.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Mar 2011 21:06:57 +0000 Received: from hel.zones.apache.org (hel.zones.apache.org [83.161.120.155]) by hel.zones.apache.org (Postfix) with ESMTP id DE6304E521 for <hannahhall@example.com>; Thu, 3 Mar 2011 21:06:36 +0000 (UTC) Date: Thu, 3 Mar 2011 21:06:36 +0000 (UTC) From: "David Jencks (JIRA)" <hannahhall@example.com> To: hannahhall@example.com Message-ID: <hannahhall@example.com> Subject: [jira] Assigned: (OPENEJB-1091) Cause of RollbackException swallowed MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-JIRA-FingerPrint: 30527f35849b9dde25b450d4833f0394 X-Virus-Checked: Checked by ClamAV on apache.org [ https://issues.apache.org/jira/browse/OPENEJB-1091?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] David Jencks reassigned OPENEJB-1091: ------------------------------------- Assignee: Jean-Louis MONTEIRO (was: David Jencks) Sounds like you might work on this? > Cause of RollbackException swallowed > ------------------------------------ > > Key: OPENEJB-1091 > URL: https://issues.apache.org/jira/browse/OPENEJB-1091 > Project: OpenEJB > Issue Type: Bug > Components: server > Affects Versions: 3.0-beta-2 > Reporter: Geoff Callender > Assignee: Jean-Louis MONTEIRO > Fix For: 3.0 > > > This is linked to OPENEJB-782 where the problem was first noted. The flaw described there still exists in 3.1, ie. the client still has no way of determining the reason a rollback occurred. > When the client digs into the exception cause, all it finds is javax.transaction.RollbackException. The originating javax.persistence.PersistenceException or java.sql.SQLException is missing. -- This message is automatically generated by JIRA. - For more information on JIRA, see: http://www.atlassian.com/software/jira From commitshannahhall@example.com Thu Mar 03 21:13:08 2011 Return-Path: <commitshannahhall@example.com> Delivered-To: hannahhall@example.com Received: (qmail 65771 invoked from network); 3 Mar 2011 21:13:03 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 3 Mar 2011 21:13:03 -0000 Received: (qmail 12286 invoked by uid 500); 3 Mar 2011 21:13:03 -0000 Delivered-To: hannahhall@example.com Received: (qmail 12260 invoked by uid 500); 3 Mar 2011 21:13:03 -0000 Mailing-List: contact hannahhall@example.com; run by ezmlm Precedence: bulk List-Help: <mailto:hannahhall@example.com> List-Unsubscribe: <mailto:hannahhall@example.com> List-Post: <mailto:hannahhall@example.com> List-Id: <commits.openejb.apache.org> Reply-To: hannahhall@example.com Delivered-To: mailing list hannahhall@example.com Received: (qmail 12122 invoked by uid 99); 3 Mar 2011 21:13:02 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Mar 2011 21:13:02 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,T_RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO hel.zones.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Mar 2011 21:13:02 +0000 Received: from hel.zones.apache.org (hel.zones.apache.org [83.161.120.155]) by hel.zones.apache.org (Postfix) with ESMTP id 677FB4E7C4 for <hannahhall@example.com>; Thu, 3 Mar 2011 21:12:42 +0000 (UTC) Date: Thu, 3 Mar 2011 21:12:42 +0000 (UTC) From: "David Jencks (JIRA)" <hannahhall@example.com> To: hannahhall@example.com Message-ID: <hannahhall@example.com> Subject: [jira] Commented: (OPENEJB-1091) Cause of RollbackException swallowed MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-JIRA-FingerPrint: 30527f35849b9dde25b450d4833f0394 [ https://issues.apache.org/jira/browse/OPENEJB-1091?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13002220#comment-13002220 ] David Jencks commented on OPENEJB-1091: --------------------------------------- I've fixed all the geronimo tm branches starting with 2.1.1 to remember why a transaction is marked rollback-only in a synchronization or by timing out and use this as the cause of the RollbackException. cf GERONIMO-4576 Ashish Jain has also been working on this but got pulled off into some other work. In Openejb, Ashish discovered that since TransactionRolledBackException extends RemoteException you can't call setCause on it :-(. The quick workaround for this is to use the openejb extension of TransactionRolledBackException that you can set the cause on. However a much better fix would be to use the local exception (TransactionRolledBackLocalException?) that you can set the cause of and change the exception conversion code to convert the other way, local to remote instead of remote to local. BTW the next few lines in openejb are wrong too since they directly call setCause on a RemoteException. Here's a link to some recent mail on this: http://mail-archives.apache.org/mod_mbox/hannahhall@example.com%3E > Cause of RollbackException swallowed > ------------------------------------ > > Key: OPENEJB-1091 > URL: https://issues.apache.org/jira/browse/OPENEJB-1091 > Project: OpenEJB > Issue Type: Bug > Components: server > Affects Versions: 3.0-beta-2 > Reporter: Geoff Callender > Assignee: Jean-Louis MONTEIRO > Fix For: 3.0 > > > This is linked to OPENEJB-782 where the problem was first noted. The flaw described there still exists in 3.1, ie. the client still has no way of determining the reason a rollback occurred. > When the client digs into the exception cause, all it finds is javax.transaction.RollbackException. The originating javax.persistence.PersistenceException or java.sql.SQLException is missing. -- This message is automatically generated by JIRA. - For more information on JIRA, see: http://www.atlassian.com/software/jira From commitshannahhall@example.com Thu Mar 03 23:11:03 2011 Return-Path: <commitshannahhall@example.com> Delivered-To: hannahhall@example.com Received: (qmail 57403 invoked from network); 3 Mar 2011 23:11:03 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 3 Mar 2011 23:11:03 -0000 Received: (qmail 37250 invoked by uid 500); 3 Mar 2011 23:11:03 -0000 Delivered-To: hannahhall@example.com Received: (qmail 37233 invoked by uid 500); 3 Mar 2011 23:11:03 -0000 Mailing-List: contact hannahhall@example.com; run by ezmlm Precedence: bulk List-Help: <mailto:hannahhall@example.com> List-Unsubscribe: <mailto:hannahhall@example.com> List-Post: <mailto:hannahhall@example.com> List-Id: <commits.openejb.apache.org> Reply-To: hannahhall@example.com Delivered-To: mailing list hannahhall@example.com Received: (qmail 37225 invoked by uid 99); 3 Mar 2011 23:11:03 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Mar 2011 23:11:03 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Mar 2011 23:11:03 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 0E60823888EA; Thu, 3 Mar 2011 23:10:43 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1076875 - /openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java Date: Thu, 03 Mar 2011 23:10:43 -0000 To: hannahhall@example.com From: hannahhall@example.com X-Mailer: svnmailer-1.0.8 Message-Id: <hannahhall@example.com> Author: jgallimore Date: Thu Mar 3 23:10:42 2011 New Revision: 1076875 URL: http://svn.apache.org/viewvc?rev=1076875&view=rev Log: Find persistence.xml in war files Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java?rev=1076875&r1=1076874&r2=1076875&view=diff ============================================================================== --- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java (original) +++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java Thu Mar 3 23:10:42 2011 @@ -228,7 +228,23 @@ public class DeploymentLoader implements AppModule appModule = new AppModule(OpenEJB.class.getClassLoader(), file.getAbsolutePath(), new Application(), true); addWebModule(appModule, baseUrl, OpenEJB.class.getClassLoader(), getContextRoot(), getModuleName()); - return appModule; + + File persistenceXml = new File(file, "WEB-INF/classes/META-INF/persistence.xml"); + if (persistenceXml.exists() && persistenceXml.isFile()) { + List<URL> persistenceUrls = (List<URL>) appModule.getAltDDs().get("persistence.xml"); + if (persistenceUrls == null) { + persistenceUrls = new ArrayList<URL>(); + appModule.getAltDDs().put("persistence.xml", persistenceUrls); + } + + try { + persistenceUrls.add(persistenceXml.toURI().toURL()); + } catch (Exception e) { + } + } + + addPersistenceUnits(appModule, baseUrl); + return appModule; } else if (PersistenceModule.class.equals(moduleClass) && loadingRequiredModuleTypes.contains(PersistenceModule.class)) { String jarLocation = URLs.toFilePath(baseUrl); ClassLoader classLoader = ClassLoaderUtil.createTempClassLoader(jarPath, new URL[]{baseUrl}, OpenEJB.class.getClassLoader()); From commitshannahhall@example.com Thu Mar 03 23:23:33 2011 Return-Path: <commitshannahhall@example.com> Delivered-To: hannahhall@example.com Received: (qmail 88073 invoked from network); 3 Mar 2011 23:23:33 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 3 Mar 2011 23:23:33 -0000 Received: (qmail 66560 invoked by uid 500); 3 Mar 2011 23:23:33 -0000 Delivered-To: hannahhall@example.com Received: (qmail 66534 invoked by uid 500); 3 Mar 2011 23:23:33 -0000 Mailing-List: contact hannahhall@example.com; run by ezmlm Precedence: bulk List-Help: <mailto:hannahhall@example.com> List-Unsubscribe: <mailto:hannahhall@example.com> List-Post: <mailto:hannahhall@example.com> List-Id: <commits.openejb.apache.org> Reply-To: hannahhall@example.com Delivered-To: mailing list hannahhall@example.com Received: (qmail 66527 invoked by uid 99); 3 Mar 2011 23:23:33 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Mar 2011 23:23:33 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Mar 2011 23:23:33 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id BD36F2388962; Thu, 3 Mar 2011 23:23:12 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1076878 - in /openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb: assembler/classic/Assembler.java config/RemoteServer.java core/timer/EjbTimerServiceImpl.java Date: Thu, 03 Mar 2011 23:23:12 -0000 To: hannahhall@example.com From: hannahhall@example.com X-Mailer: svnmailer-1.0.8 Message-Id: <hannahhall@example.com> Author: dblevins Date: Thu Mar 3 23:23:12 2011 New Revision: 1076878 URL: http://svn.apache.org/viewvc?rev=1076878&view=rev Log: Shutdown the EjbTimerServiceImpl on Assembler.destroy() to prevent the server from hanging on shutdown when timers are used. Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/RemoteServer.java openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/timer/EjbTimerServiceImpl.java Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java?rev=1076878&r1=1076877&r2=1076878&view=diff ============================================================================== --- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java (original) +++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java Thu Mar 3 23:23:12 2011 @@ -89,6 +89,7 @@ import org.apache.openejb.core.transacti import org.apache.openejb.core.transaction.TransactionPolicyFactory; import org.apache.openejb.core.transaction.TransactionType; import org.apache.openejb.javaagent.Agent; +import org.apache.openejb.jee.sun.Default; import org.apache.openejb.loader.Options; import org.apache.openejb.loader.SystemInstance; import org.apache.openejb.persistence.JtaEntityManagerRegistry; @@ -823,6 +824,13 @@ public class Assembler extends Assembler } public void destroy() { + + try { + EjbTimerServiceImpl.shutdown(); + } catch (Exception e) { + logger.warning("Unable to shutdown scheduler", e); + } + logger.debug("Undeploying Applications"); Assembler assembler = this; for (AppInfo appInfo : assembler.getDeployedApplications()) { Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/RemoteServer.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/RemoteServer.java?rev=1076878&r1=1076877&r2=1076878&view=diff ============================================================================== --- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/RemoteServer.java (original) +++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/RemoteServer.java Thu Mar 3 23:23:12 2011 @@ -135,6 +135,7 @@ public class RemoteServer { } } else { File bin = new File(home, "bin"); + File tlib = new File(home, "lib"); File bootstrapJar = new File(bin, "bootstrap.jar"); File juliJar = new File(bin, "tomcat-juli.jar"); File commonsLoggingJar = new File(bin, "commons-logging-api.jar"); @@ -164,6 +165,7 @@ public class RemoteServer { "-Djava.endorsed.dirs=" + endorsed.getAbsolutePath(), "-Dcatalina.base=" + home.getAbsolutePath(), "-Dcatalina.home=" + home.getAbsolutePath(), + "-Dcatalina.ext.dirs=" + tlib.getAbsolutePath(), "-Dopenejb.servicemanager.enabled=" + Boolean.getBoolean("openejb.servicemanager.enabled"), "-classpath", bootstrapJar.getAbsolutePath() + ":" + juliJar.getAbsolutePath() + ":"+ commonsLoggingJar.getAbsolutePath(), @@ -184,6 +186,7 @@ public class RemoteServer { "-Djava.endorsed.dirs=" + endorsed.getAbsolutePath(), "-Dcatalina.base=" + home.getAbsolutePath(), "-Dcatalina.home=" + home.getAbsolutePath(), + "-Dcatalina.ext.dirs=" + tlib.getAbsolutePath(), "-Dopenejb.servicemanager.enabled=" + Boolean.getBoolean("openejb.servicemanager.enabled"), "-classpath", bootstrapJar.getAbsolutePath() + ":" + juliJar.getAbsolutePath() + ":" + commonsLoggingJar.getAbsolutePath(), Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/timer/EjbTimerServiceImpl.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/timer/EjbTimerServiceImpl.java?rev=1076878&r1=1076877&r2=1076878&view=diff ============================================================================== --- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/timer/EjbTimerServiceImpl.java (original) +++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/timer/EjbTimerServiceImpl.java Thu Mar 3 23:23:12 2011 @@ -103,6 +103,16 @@ public class EjbTimerServiceImpl impleme return scheduler; } + public static void shutdown() { + + Scheduler scheduler = SystemInstance.get().getComponent(Scheduler.class); + if (scheduler != null) try { + scheduler.shutdown(); + } catch (SchedulerException e) { + throw new RuntimeException("Unable to shutdown scheduler", e); + } + + } public void start() throws TimerStoreException { // load saved timers Collection<TimerData> timerDatas = timerStore.loadTimers(this, (String)deployment.getDeploymentID()); From commitshannahhall@example.com Fri Mar 04 03:02:00 2011 Return-Path: <commitshannahhall@example.com> Delivered-To: hannahhall@example.com Received: (qmail 6685 invoked from network); 4 Mar 2011 03:01:59 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 4 Mar 2011 03:01:59 -0000 Received: (qmail 44021 invoked by uid 500); 4 Mar 2011 03:01:59 -0000 Delivered-To: hannahhall@example.com Received: (qmail 43965 invoked by uid 500); 4 Mar 2011 03:01:59 -0000 Mailing-List: contact hannahhall@example.com; run by ezmlm Precedence: bulk List-Help: <mailto:hannahhall@example.com> List-Unsubscribe: <mailto:hannahhall@example.com> List-Post: <mailto:hannahhall@example.com> List-Id: <commits.openejb.apache.org> Reply-To: hannahhall@example.com Delivered-To: mailing list hannahhall@example.com Received: (qmail 43900 invoked by uid 99); 4 Mar 2011 03:01:58 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Mar 2011 03:01:58 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Mar 2011 03:01:57 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 657D22388A2C; Fri, 4 Mar 2011 03:01:37 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1076928 - /openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java Date: Fri, 04 Mar 2011 03:01:37 -0000 To: hannahhall@example.com From: hannahhall@example.com X-Mailer: svnmailer-1.0.8 Message-Id: <hannahhall@example.com> Author: xuhaihong Date: Fri Mar 4 03:01:36 2011 New Revision: 1076928 URL: http://svn.apache.org/viewvc?rev=1076928&view=rev Log: Only load persistence.xml if required Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java?rev=1076928&r1=1076927&r2=1076928&view=diff ============================================================================== --- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java (original) +++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java Fri Mar 4 03:01:36 2011 @@ -37,9 +37,7 @@ import org.apache.openejb.jee.TldTaglib; import org.apache.openejb.jee.WebApp; import org.apache.openejb.jee.WebserviceDescription; import org.apache.openejb.jee.Webservices; -import org.apache.openejb.jee.oejb3.OpenejbJar; import org.apache.openejb.loader.FileUtils; -import org.apache.openejb.loader.Options; import org.apache.openejb.loader.SystemInstance; import org.apache.openejb.util.AnnotationFinder; import org.apache.openejb.util.JarExtractor; @@ -225,25 +223,25 @@ public class DeploymentLoader implements final File file = toFile(baseUrl); // Standalone Web Module - + AppModule appModule = new AppModule(OpenEJB.class.getClassLoader(), file.getAbsolutePath(), new Application(), true); addWebModule(appModule, baseUrl, OpenEJB.class.getClassLoader(), getContextRoot(), getModuleName()); - - File persistenceXml = new File(file, "WEB-INF/classes/META-INF/persistence.xml"); - if (persistenceXml.exists() && persistenceXml.isFile()) { - List<URL> persistenceUrls = (List<URL>) appModule.getAltDDs().get("persistence.xml"); - if (persistenceUrls == null) { - persistenceUrls = new ArrayList<URL>(); - appModule.getAltDDs().put("persistence.xml", persistenceUrls); - } - - try { - persistenceUrls.add(persistenceXml.toURI().toURL()); - } catch (Exception e) { - } - } - - addPersistenceUnits(appModule, baseUrl); + + if (loadingRequiredModuleTypes.contains(PersistenceModule.class)) { + File persistenceXml = new File(file, "WEB-INF/classes/META-INF/persistence.xml"); + if (persistenceXml.exists() && persistenceXml.isFile()) { + List<URL> persistenceUrls = (List<URL>) appModule.getAltDDs().get("persistence.xml"); + if (persistenceUrls == null) { + persistenceUrls = new ArrayList<URL>(); + appModule.getAltDDs().put("persistence.xml", persistenceUrls); + } + try { + persistenceUrls.add(persistenceXml.toURI().toURL()); + } catch (Exception e) { + } + } + addPersistenceUnits(appModule, baseUrl); + } return appModule; } else if (PersistenceModule.class.equals(moduleClass) && loadingRequiredModuleTypes.contains(PersistenceModule.class)) { String jarLocation = URLs.toFilePath(baseUrl); @@ -631,7 +629,7 @@ public class DeploymentLoader implements appModule.getEjbModules().add(webEjbModule); try { - // TODO: Put our scanning ehnancements back, here + // TODO: Put our scanning ehnancements back, here AbstractFinder finder = FinderFactory.createFinder(webModule); webModule.setFinder(finder); webEjbModule.setFinder(finder); From commitshannahhall@example.com Fri Mar 04 14:15:58 2011 Return-Path: <commitshannahhall@example.com> Delivered-To: hannahhall@example.com Received: (qmail 29891 invoked from network); 4 Mar 2011 14:15:58 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 4 Mar 2011 14:15:58 -0000 Received: (qmail 34927 invoked by uid 500); 4 Mar 2011 14:15:58 -0000 Delivered-To: hannahhall@example.com Received: (qmail 34870 invoked by uid 500); 4 Mar 2011 14:15:57 -0000 Mailing-List: contact hannahhall@example.com; run by ezmlm Precedence: bulk List-Help: <mailto:hannahhall@example.com> List-Unsubscribe: <mailto:hannahhall@example.com> List-Post: <mailto:hannahhall@example.com> List-Id: <commits.openejb.apache.org> Reply-To: hannahhall@example.com Delivered-To: mailing list hannahhall@example.com Received: (qmail 34860 invoked by uid 99); 4 Mar 2011 14:15:57 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Mar 2011 14:15:57 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,T_RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO hel.zones.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Mar 2011 14:15:57 +0000 Received: from hel.zones.apache.org (hel.zones.apache.org [83.161.120.155]) by hel.zones.apache.org (Postfix) with ESMTP id 0DD5B4F437 for <hannahhall@example.com>; Fri, 4 Mar 2011 14:15:37 +0000 (UTC) Date: Fri, 4 Mar 2011 14:15:37 +0000 (UTC) From: =?utf-8?Q?Andries_Inz=C3=A9_=28JIRA=29?= <hannahhall@example.com> To: hannahhall@example.com Message-ID: <hannahhall@example.com> Subject: [jira] Commented: (OPENEJB-1236) Provide JPA 2.0 support in addition to JPA 1.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-JIRA-FingerPrint: 30527f35849b9dde25b450d4833f0394 [ https://issues.apache.org/jira/browse/OPENEJB-1236?page=3Dcom.atlassi= an.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=3D13= 002614#comment-13002614 ]=20 Andries Inz=C3=A9 commented on OPENEJB-1236: --------------------------------------- Will this be part of OpenEJB 3.2? > Provide JPA 2.0 support in addition to JPA 1.0 > ---------------------------------------------- > > Key: OPENEJB-1236 > URL: https://issues.apache.org/jira/browse/OPENEJB-1236 > Project: OpenEJB > Issue Type: New Feature > Reporter: Jean-Louis MONTEIRO > Assignee: Jean-Louis MONTEIRO > Attachments: OPENEJB-1236.patch > > > JPA 2.0 is out since mid December. It'd be nice to support it. > The difficult part is to be able to keep the JPA 1.0 integration usable. > It's a challenge, cause APIs aren't the same (EntityManager for example d= efines more methods). --=20 This message is automatically generated by JIRA. - For more information on JIRA, see: http://www.atlassian.com/software/jira From commitshannahhall@example.com Fri Mar 04 14:39:58 2011 Return-Path: <commitshannahhall@example.com> Delivered-To: hannahhall@example.com Received: (qmail 20528 invoked from network); 4 Mar 2011 14:39:58 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 4 Mar 2011 14:39:58 -0000 Received: (qmail 18368 invoked by uid 500); 4 Mar 2011 14:39:58 -0000 Delivered-To: hannahhall@example.com Received: (qmail 18313 invoked by uid 500); 4 Mar 2011 14:39:58 -0000 Mailing-List: contact hannahhall@example.com; run by ezmlm Precedence: bulk List-Help: <mailto:hannahhall@example.com> List-Unsubscribe: <mailto:hannahhall@example.com> List-Post: <mailto:hannahhall@example.com> List-Id: <commits.openejb.apache.org> Reply-To: hannahhall@example.com Delivered-To: mailing list hannahhall@example.com Received: (qmail 18305 invoked by uid 99); 4 Mar 2011 14:39:58 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Mar 2011 14:39:58 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,T_RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO hel.zones.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Mar 2011 14:39:57 +0000 Received: from hel.zones.apache.org (hel.zones.apache.org [83.161.120.155]) by hel.zones.apache.org (Postfix) with ESMTP id 8D63A4FFDD for <hannahhall@example.com>; Fri, 4 Mar 2011 14:39:37 +0000 (UTC) Date: Fri, 4 Mar 2011 14:39:37 +0000 (UTC) From: "Thiago Veronezi (JIRA)" <hannahhall@example.com> To: hannahhall@example.com Message-ID: <hannahhall@example.com> Subject: [jira] Commented: (OPENEJB-1236) Provide JPA 2.0 support in addition to JPA 1.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-JIRA-FingerPrint: 30527f35849b9dde25b450d4833f0394 [ https://issues.apache.org/jira/browse/OPENEJB-1236?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13002627#comment-13002627 ] Thiago Veronezi commented on OPENEJB-1236: ------------------------------------------ I found some time to work on this issue during this weekend, and I hope to give some good news soon. > Provide JPA 2.0 support in addition to JPA 1.0 > ---------------------------------------------- > > Key: OPENEJB-1236 > URL: https://issues.apache.org/jira/browse/OPENEJB-1236 > Project: OpenEJB > Issue Type: New Feature > Reporter: Jean-Louis MONTEIRO > Assignee: Jean-Louis MONTEIRO > Attachments: OPENEJB-1236.patch > > > JPA 2.0 is out since mid December. It'd be nice to support it. > The difficult part is to be able to keep the JPA 1.0 integration usable. > It's a challenge, cause APIs aren't the same (EntityManager for example defines more methods). -- This message is automatically generated by JIRA. - For more information on JIRA, see: http://www.atlassian.com/software/jira From commitshannahhall@example.com Fri Mar 04 23:38:10 2011 Return-Path: <commitshannahhall@example.com> Delivered-To: hannahhall@example.com Received: (qmail 21675 invoked from network); 4 Mar 2011 23:38:10 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 4 Mar 2011 23:38:10 -0000 Received: (qmail 42391 invoked by uid 500); 4 Mar 2011 23:38:10 -0000 Delivered-To: hannahhall@example.com Received: (qmail 42369 invoked by uid 500); 4 Mar 2011 23:38:10 -0000 Mailing-List: contact hannahhall@example.com; run by ezmlm Precedence: bulk List-Help: <mailto:hannahhall@example.com> List-Unsubscribe: <mailto:hannahhall@example.com> List-Post: <mailto:hannahhall@example.com> List-Id: <commits.openejb.apache.org> Reply-To: hannahhall@example.com Delivered-To: mailing list hannahhall@example.com Received: (qmail 42362 invoked by uid 99); 4 Mar 2011 23:38:10 -0000 Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Mar 2011 23:38:10 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Mar 2011 23:38:08 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 0CB2A2388962; Fri, 4 Mar 2011 23:37:47 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1078217 - /openejb/trunk/openejb3/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/WsService.java Date: Fri, 04 Mar 2011 23:37:47 -0000 To: hannahhall@example.com From: hannahhall@example.com X-Mailer: svnmailer-1.0.8 Message-Id: <hannahhall@example.com> X-Virus-Checked: Checked by ClamAV on apache.org Author: jlaskowski Date: Fri Mar 4 23:37:46 2011 New Revision: 1078217 URL: http://svn.apache.org/viewvc?rev=1078217&view=rev Log: Typo fixes and slightly better exception message - nothing important code-wise, but possibly improves user experience (if exception handling and its messages may fall into such a category) Modified: openejb/trunk/openejb3/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/WsService.java Modified: openejb/trunk/openejb3/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/WsService.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/WsService.java?rev=1078217&r1=1078216&r2=1078217&view=diff ============================================================================== --- openejb/trunk/openejb3/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/WsService.java (original) +++ openejb/trunk/openejb3/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/WsService.java Fri Mar 4 23:37:46 2011 @@ -265,7 +265,7 @@ public abstract class WsService implemen } } } catch (Throwable e) { - logger.error("Error deploying CXF webservice for ejb " + beanContext.getDeploymentID(), e); + logger.error("Error deploying JAX-WS Web Service for EJB "
{'source': 'Apache Software Foundation Public Mail Archives'}