From openejb-commits-returnyaguilar@example.com Fri Sep 15 02:07:55 2006 Return-Path: <openejb-commits-returnyaguilar@example.com> Delivered-To: yaguilar@example.com Received: (qmail 93007 invoked from network); 15 Sep 2006 02:07:55 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 15 Sep 2006 02:07:55 -0000 Received: (qmail 8025 invoked by uid 500); 15 Sep 2006 02:07:55 -0000 Delivered-To: yaguilar@example.com Received: (qmail 7980 invoked by uid 500); 15 Sep 2006 02:07:54 -0000 Mailing-List: contact yaguilar@example.com; run by ezmlm Precedence: bulk List-Help: <mailto:yaguilar@example.com> List-Unsubscribe: <mailto:yaguilar@example.com> List-Post: <mailto:yaguilar@example.com> List-Id: <openejb-commits.incubator.apache.org> Reply-To: yaguilar@example.com Delivered-To: mailing list yaguilar@example.com Delivered-To: moderator for yaguilar@example.com Received: (qmail 91104 invoked by uid 99); 15 Sep 2006 01:49:07 -0000 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r443547 - /incubator/openejb/ Date: Fri, 15 Sep 2006 01:48:37 -0000 To: yaguilar@example.com From: yaguilar@example.com X-Mailer: svnmailer-1.1.0 Message-Id: <yaguilar@example.com> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: rooneg Date: Thu Sep 14 18:48:37 2006 New Revision: 443547 URL: http://svn.apache.org/viewvc?view=rev&rev=443547 Log: Create space for the openejb import. Added: incubator/openejb/ From openejb-commits-returnyaguilar@example.com Tue Sep 19 23:01:00 2006 Return-Path: <openejb-commits-returnyaguilar@example.com> Delivered-To: yaguilar@example.com Received: (qmail 14691 invoked from network); 19 Sep 2006 23:01:00 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 19 Sep 2006 23:01:00 -0000 Received: (qmail 61579 invoked by uid 500); 19 Sep 2006 23:01:00 -0000 Delivered-To: yaguilar@example.com Received: (qmail 61554 invoked by uid 500); 19 Sep 2006 23:01:00 -0000 Mailing-List: contact yaguilar@example.com; run by ezmlm Precedence: bulk List-Help: <mailto:yaguilar@example.com> List-Unsubscribe: <mailto:yaguilar@example.com> List-Post: <mailto:yaguilar@example.com> List-Id: <openejb-commits.incubator.apache.org> Reply-To: yaguilar@example.com Delivered-To: mailing list yaguilar@example.com Delivered-To: moderator for yaguilar@example.com Received: (qmail 2951 invoked by uid 99); 19 Sep 2006 22:16:23 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=5.0 tests=ALL_TRUSTED,NO_REAL_NAME Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r447996 - /incubator/openejb/trunk/openejb2/modules/openejb-core/src/resources2/META-INF/geronimo-dependency.xml Date: Tue, 19 Sep 2006 22:16:19 -0000 To: yaguilar@example.com From: yaguilar@example.com X-Mailer: svnmailer-1.1.0 Message-Id: <yaguilar@example.com> X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: djencks Date: Tue Sep 19 15:16:18 2006 New Revision: 447996 URL: http://svn.apache.org/viewvc?view=rev&rev=447996 Log: GERONIMO-2398 clean up dependencies in geronimo-dependency.xml Modified: incubator/openejb/trunk/openejb2/modules/openejb-core/src/resources2/META-INF/geronimo-dependency.xml Modified: incubator/openejb/trunk/openejb2/modules/openejb-core/src/resources2/META-INF/geronimo-dependency.xml URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-core/src/resources2/META-INF/geronimo-dependency.xml?view=diff&rev=447996&r1=447995&r2=447996 ============================================================================== --- incubator/openejb/trunk/openejb2/modules/openejb-core/src/resources2/META-INF/geronimo-dependency.xml (original) +++ incubator/openejb/trunk/openejb2/modules/openejb-core/src/resources2/META-INF/geronimo-dependency.xml Tue Sep 19 15:16:18 2006 @@ -1,26 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <dep:service xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2"> <dep:dependency> - <dep:groupId>org.apache.geronimo.modules</dep:groupId> - <dep:artifactId>geronimo-interceptor</dep:artifactId> - </dep:dependency> - <dep:dependency> - <dep:groupId>org.apache.geronimo.modules</dep:groupId> - <dep:artifactId>geronimo-security</dep:artifactId> - </dep:dependency> - <dep:dependency> - <dep:groupId>org.apache.geronimo.modules</dep:groupId> - <dep:artifactId>geronimo-timer</dep:artifactId> - </dep:dependency> - <!--<dep:dependency>--> - <!--<dep:groupId>org.apache.geronimo.modules</dep:groupId>--> - <!--<dep:artifactId>geronimo-axis</dep:artifactId>--> - <!--</dep:dependency>--> - <dep:dependency> - <dep:groupId>org.apache.geronimo.modules</dep:groupId> - <dep:artifactId>geronimo-util</dep:artifactId> - </dep:dependency> - <dep:dependency> <dep:groupId>geronimo-spec</dep:groupId> <dep:artifactId>geronimo-spec-corba</dep:artifactId> </dep:dependency> From openejb-commits-returnyaguilar@example.com Wed Sep 20 19:55:36 2006 Return-Path: <openejb-commits-returnyaguilar@example.com> Delivered-To: yaguilar@example.com Received: (qmail 47139 invoked from network); 20 Sep 2006 19:55:35 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 20 Sep 2006 19:55:35 -0000 Received: (qmail 49219 invoked by uid 500); 20 Sep 2006 19:55:35 -0000 Delivered-To: yaguilar@example.com Received: (qmail 49169 invoked by uid 500); 20 Sep 2006 19:55:35 -0000 Mailing-List: contact yaguilar@example.com; run by ezmlm Precedence: bulk List-Help: <mailto:yaguilar@example.com> List-Unsubscribe: <mailto:yaguilar@example.com> List-Post: <mailto:yaguilar@example.com> List-Id: <openejb-commits.incubator.apache.org> Reply-To: yaguilar@example.com Delivered-To: mailing list yaguilar@example.com Received: (qmail 49159 invoked by uid 99); 20 Sep 2006 19:55:35 -0000 Received: from idunn.apache.osuosl.org (HELO idunn.apache.osuosl.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 20 Sep 2006 12:55:35 -0700 X-ASF-Spam-Status: No, hits=-9.8 required=5.0 tests=ALL_TRUSTED,NO_REAL_NAME Received: from [83.161.120.155] ([83.161.120.155:54393] helo=eris.apache.org) by idunn.apache.osuosl.org (ecelerity 83.161.120.155 r(12930)) with ESMTP id 7B/CC-01963-4BC91154 for <yaguilar@example.com>; Wed, 20 Sep 2006 12:55:33 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 265431A981A; Wed, 20 Sep 2006 12:55:30 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r448317 - /incubator/openejb/trunk/openejb3/pom.xml Date: Wed, 20 Sep 2006 19:55:30 -0000 To: yaguilar@example.com From: yaguilar@example.com X-Mailer: svnmailer-1.1.0 Message-Id: <yaguilar@example.com> X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: jlaskowski Date: Wed Sep 20 12:55:29 2006 New Revision: 448317 URL: http://svn.apache.org/viewvc?view=rev&rev=448317 Log: Point URLs to Apache Incubator Modified: incubator/openejb/trunk/openejb3/pom.xml Modified: incubator/openejb/trunk/openejb3/pom.xml URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/pom.xml?view=diff&rev=448317&r1=448316&r2=448317 ============================================================================== --- incubator/openejb/trunk/openejb3/pom.xml (original) +++ incubator/openejb/trunk/openejb3/pom.xml Wed Sep 20 12:55:29 2006 @@ -6,7 +6,7 @@ <packaging>pom</packaging> <version>3.0-SNAPSHOT</version> <name>OpenEJB 888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4 Project</name> - <url>http://openejb.org</url> + <url>http://incubator.apache.org/projects/openejb</url> <issueManagement> <system>jira</system> <url>http://jira.codehaus.org/browse/OPENEJB</url> @@ -24,8 +24,8 @@ </ciManagement> <inceptionYear>1999</inceptionYear> <scm> - <connection>scm:svn:https://svn.codehaus.org/openejb/trunk/openejb3</connection> - <developerConnection>scm:svn:https://svn.codehaus.org/openejb/trunk/openejb3</developerConnection> + <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/openejb/trunk/openejb3/</connection> + <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/openejb/trunk/openejb3/</developerConnection> </scm> <build> <defaultGoal>install</defaultGoal> @@ -176,4 +176,5 @@ <id>codehaus.org</id> <url>dav:https://dav.codehaus.org/openejb/</url> </site> - </distributionManagement></project> + </distributionManagement> +</project> From openejb-commits-returnyaguilar@example.com Thu Sep 21 21:56:12 2006 Return-Path: <openejb-commits-returnyaguilar@example.com> Delivered-To: yaguilar@example.com Received: (qmail 55749 invoked from network); 21 Sep 2006 21:56:12 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 21 Sep 2006 21:56:12 -0000 Received: (qmail 45446 invoked by uid 500); 21 Sep 2006 21:56:12 -0000 Delivered-To: yaguilar@example.com Received: (qmail 45427 invoked by uid 500); 21 Sep 2006 21:56:11 -0000 Mailing-List: contact yaguilar@example.com; run by ezmlm Precedence: bulk List-Help: <mailto:yaguilar@example.com> List-Unsubscribe: <mailto:yaguilar@example.com> List-Post: <mailto:yaguilar@example.com> List-Id: <openejb-commits.incubator.apache.org> Reply-To: yaguilar@example.com Delivered-To: mailing list yaguilar@example.com Received: (qmail 45418 invoked by uid 99); 21 Sep 2006 21:56:11 -0000 Received: from idunn.apache.osuosl.org (HELO idunn.apache.osuosl.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 21 Sep 2006 14:56:11 -0700 Authentication-Results: idunn.apache.osuosl.org yaguilar@example.com; spf=permerror X-ASF-Spam-Status: No, hits=-9.4 required=5.0 tests=ALL_TRUSTED,NO_REAL_NAME Received-SPF: error (idunn.apache.osuosl.org: domain apache.org from 83.161.120.155 cause and error) Received: from [83.161.120.155] ([83.161.120.155:56174] helo=eris.apache.org) by idunn.apache.osuosl.org (ecelerity 83.161.120.155 r(12930)) with ESMTP id FD/20-05580-B7A03154 for <yaguilar@example.com>; Thu, 21 Sep 2006 14:56:11 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 3BF261A981A; Thu, 21 Sep 2006 14:56:09 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r448706 - /incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/openejb/deployment/OpenEjbModuleBuilder.java Date: Thu, 21 Sep 2006 21:56:09 -0000 To: yaguilar@example.com From: yaguilar@example.com X-Mailer: svnmailer-1.1.0 Message-Id: <yaguilar@example.com> X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: djencks Date: Thu Sep 21 14:56:08 2006 New Revision: 448706 URL: http://svn.apache.org/viewvc?view=rev&rev=448706 Log: GERONIMO-2291 port web service builder changes from 1.1 branch: ws builder gets to determine if there is something to deploy Modified: incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/openejb/deployment/OpenEjbModuleBuilder.java Modified: incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/openejb/deployment/OpenEjbModuleBuilder.java URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/openejb/deployment/OpenEjbModuleBuilder.java?view=diff&rev=448706&r1=448705&r2=448706 ============================================================================== --- incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/openejb/deployment/OpenEjbModuleBuilder.java (original) +++ incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/openejb/deployment/OpenEjbModuleBuilder.java Thu Sep 21 14:56:08 2006 @@ -376,6 +376,7 @@ } OpenejbOpenejbJarType openejbEjbJar = OpenejbOpenejbJarType.Factory.newInstance(); + //TODO add a module id openejbEjbJar.addNewEnterpriseBeans(); return openejbEjbJar; } @@ -533,16 +534,7 @@ throw new DeploymentException(buf.toString()); } - Map portInfoMap = Collections.EMPTY_MAP; - JarFile jarFile = ejbModule.getModuleFile(); - URL wsDDUrl; - try { - wsDDUrl = DeploymentUtil.createJarURL(jarFile, "META-INF/webservices.xml"); - portInfoMap = getWebServiceBuilder().parseWebServiceDescriptor(wsDDUrl, jarFile, true, correctedPortLocations); - } catch (MalformedURLException e) { - //there is no webservices file - } - + Map portInfoMap = getWebServiceBuilder().findWebServices(ejbModule.getModuleFile(), true, correctedPortLocations); TransactionPolicyHelper transactionPolicyHelper; if (ejbJar.isSetAssemblyDescriptor()) { From openejb-commits-returnyaguilar@example.com Fri Sep 22 00:47:36 2006 Return-Path: <openejb-commits-returnyaguilar@example.com> Delivered-To: yaguilar@example.com Received: (qmail 94564 invoked from network); 22 Sep 2006 00:47:36 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 22 Sep 2006 00:47:36 -0000 Received: (qmail 70882 invoked by uid 500); 22 Sep 2006 00:47:36 -0000 Delivered-To: yaguilar@example.com Received: (qmail 70836 invoked by uid 500); 22 Sep 2006 00:47:36 -0000 Mailing-List: contact yaguilar@example.com; run by ezmlm Precedence: bulk List-Help: <mailto:yaguilar@example.com> List-Unsubscribe: <mailto:yaguilar@example.com> List-Post: <mailto:yaguilar@example.com> List-Id: <openejb-commits.incubator.apache.org> Reply-To: yaguilar@example.com Delivered-To: mailing list yaguilar@example.com Received: (qmail 70827 invoked by uid 99); 22 Sep 2006 00:47:36 -0000 Received: from idunn.apache.osuosl.org (HELO idunn.apache.osuosl.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 21 Sep 2006 17:47:36 -0700 Authentication-Results: idunn.apache.osuosl.org yaguilar@example.com; spf=permerror X-ASF-Spam-Status: No, hits=-9.4 required=5.0 tests=ALL_TRUSTED,NO_REAL_NAME Received-SPF: error (idunn.apache.osuosl.org: domain apache.org from 83.161.120.155 cause and error) Received: from [83.161.120.155] ([83.161.120.155:58602] helo=eris.apache.org) by idunn.apache.osuosl.org (ecelerity 83.161.120.155 r(12930)) with ESMTP id 32/B2-06791-7A233154 for <yaguilar@example.com>; Thu, 21 Sep 2006 17:47:36 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id C9E541A981A; Thu, 21 Sep 2006 17:47:33 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r448755 - /incubator/openejb/trunk/openejb2/modules/openejb-core/src/resources2/META-INF/geronimo-dependency.xml Date: Fri, 22 Sep 2006 00:47:33 -0000 To: yaguilar@example.com From: yaguilar@example.com X-Mailer: svnmailer-1.1.0 Message-Id: <yaguilar@example.com> X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: djencks Date: Thu Sep 21 17:47:33 2006 New Revision: 448755 URL: http://svn.apache.org/viewvc?view=rev&rev=448755 Log: GERONIMO-2421 use only one corba spec jar. Maybe we will eventually find out if this one works Modified: incubator/openejb/trunk/openejb2/modules/openejb-core/src/resources2/META-INF/geronimo-dependency.xml Modified: incubator/openejb/trunk/openejb2/modules/openejb-core/src/resources2/META-INF/geronimo-dependency.xml URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-core/src/resources2/META-INF/geronimo-dependency.xml?view=diff&rev=448755&r1=448754&r2=448755 ============================================================================== --- incubator/openejb/trunk/openejb2/modules/openejb-core/src/resources2/META-INF/geronimo-dependency.xml (original) +++ incubator/openejb/trunk/openejb2/modules/openejb-core/src/resources2/META-INF/geronimo-dependency.xml Thu Sep 21 17:47:33 2006 @@ -4,6 +4,10 @@ <dep:groupId>geronimo-spec</dep:groupId> <dep:artifactId>geronimo-spec-corba</dep:artifactId> </dep:dependency> + <dep:dependency> + <dep:groupId>org.apache.geronimo.specs</dep:groupId> + <dep:artifactId>geronimo-corba_2.3_spec</dep:artifactId> + </dep:dependency> <dep:dependency> <dep:groupId>tranql</dep:groupId> <dep:artifactId>tranql</dep:artifactId> From openejb-commits-returnyaguilar@example.com Fri Sep 22 02:13:21 2006 Return-Path: <openejb-commits-returnyaguilar@example.com> Delivered-To: yaguilar@example.com Received: (qmail 15159 invoked from network); 22 Sep 2006 02:13:21 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 22 Sep 2006 02:13:21 -0000 Received: (qmail 28991 invoked by uid 500); 22 Sep 2006 02:13:21 -0000 Delivered-To: yaguilar@example.com Received: (qmail 28973 invoked by uid 500); 22 Sep 2006 02:13:21 -0000 Mailing-List: contact yaguilar@example.com; run by ezmlm Precedence: bulk List-Help: <mailto:yaguilar@example.com> List-Unsubscribe: <mailto:yaguilar@example.com> List-Post: <mailto:yaguilar@example.com> List-Id: <openejb-commits.incubator.apache.org> Reply-To: yaguilar@example.com Delivered-To: mailing list yaguilar@example.com Received: (qmail 28962 invoked by uid 99); 22 Sep 2006 02:13:21 -0000 Received: from idunn.apache.osuosl.org (HELO idunn.apache.osuosl.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 21 Sep 2006 19:13:21 -0700 Authentication-Results: idunn.apache.osuosl.org yaguilar@example.com; spf=permerror X-ASF-Spam-Status: No, hits=-9.4 required=5.0 tests=ALL_TRUSTED,NO_REAL_NAME Received-SPF: error (idunn.apache.osuosl.org: domain apache.org from 83.161.120.155 cause and error) Received: from [83.161.120.155] ([83.161.120.155:61113] helo=eris.apache.org) by idunn.apache.osuosl.org (ecelerity 83.161.120.155 r(12930)) with ESMTP id EC/35-06791-0C643154 for <yaguilar@example.com>; Thu, 21 Sep 2006 19:13:20 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 9A1E51A981A; Thu, 21 Sep 2006 19:13:18 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r448769 - /incubator/openejb/trunk/openejb2/modules/openejb-core/src/resources2/META-INF/geronimo-dependency.xml Date: Fri, 22 Sep 2006 02:13:18 -0000 To: yaguilar@example.com From: yaguilar@example.com X-Mailer: svnmailer-1.1.0 Message-Id: <yaguilar@example.com> X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: djencks Date: Thu Sep 21 19:13:17 2006 New Revision: 448769 URL: http://svn.apache.org/viewvc?view=rev&rev=448769 Log: GERONIMO-2421 use only one corba spec jar. Maybe we will eventually find out if this one works. 2nd try. Modified: incubator/openejb/trunk/openejb2/modules/openejb-core/src/resources2/META-INF/geronimo-dependency.xml Modified: incubator/openejb/trunk/openejb2/modules/openejb-core/src/resources2/META-INF/geronimo-dependency.xml URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-core/src/resources2/META-INF/geronimo-dependency.xml?view=diff&rev=448769&r1=448768&r2=448769 ============================================================================== --- incubator/openejb/trunk/openejb2/modules/openejb-core/src/resources2/META-INF/geronimo-dependency.xml (original) +++ incubator/openejb/trunk/openejb2/modules/openejb-core/src/resources2/META-INF/geronimo-dependency.xml Thu Sep 21 19:13:17 2006 @@ -1,19 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> <dep:service xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2"> - <dep:dependency> - <dep:groupId>geronimo-spec</dep:groupId> - <dep:artifactId>geronimo-spec-corba</dep:artifactId> - </dep:dependency> <dep:dependency> - <dep:groupId>org.apache.geronimo.specs</dep:groupId> - <dep:artifactId>geronimo-corba_2.3_spec</dep:artifactId> + <dep:groupId>org.apache.geronimo.specs</dep:groupId> + <dep:artifactId>geronimo-corba_2.3_spec</dep:artifactId> + </dep:dependency> + <dep:dependency> + <dep:groupId>tranql</dep:groupId> + <dep:artifactId>tranql</dep:artifactId> + </dep:dependency> + <dep:dependency> + <dep:groupId>antlr</dep:groupId> + <dep:artifactId>antlr</dep:artifactId> </dep:dependency> - <dep:dependency> - <dep:groupId>tranql</dep:groupId> - <dep:artifactId>tranql</dep:artifactId> - </dep:dependency> - <dep:dependency> - <dep:groupId>antlr</dep:groupId> - <dep:artifactId>antlr</dep:artifactId> - </dep:dependency> </dep:service> From openejb-commits-returnyaguilar@example.com Sat Sep 23 01:00:43 2006 Return-Path: <openejb-commits-returnyaguilar@example.com> Delivered-To: yaguilar@example.com Received: (qmail 12958 invoked from network); 23 Sep 2006 01:00:42 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 23 Sep 2006 01:00:42 -0000 Received: (qmail 46111 invoked by uid 500); 23 Sep 2006 01:00:42 -0000 Delivered-To: yaguilar@example.com Received: (qmail 46090 invoked by uid 500); 23 Sep 2006 01:00:42 -0000 Mailing-List: contact yaguilar@example.com; run by ezmlm Precedence: bulk List-Help: <mailto:yaguilar@example.com> List-Unsubscribe: <mailto:yaguilar@example.com> List-Post: <mailto:yaguilar@example.com> List-Id: <openejb-commits.incubator.apache.org> Reply-To: yaguilar@example.com Delivered-To: mailing list yaguilar@example.com Received: (qmail 46081 invoked by uid 99); 23 Sep 2006 01:00:42 -0000 Received: from idunn.apache.osuosl.org (HELO idunn.apache.osuosl.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 22 Sep 2006 18:00:42 -0700 Authentication-Results: idunn.apache.osuosl.org yaguilar@example.com; spf=permerror X-ASF-Spam-Status: No, hits=-9.4 required=5.0 tests=ALL_TRUSTED,NO_REAL_NAME Received-SPF: error (idunn.apache.osuosl.org: domain apache.org from 83.161.120.155 cause and error) Received: from [83.161.120.155] ([83.161.120.155:62282] helo=eris.apache.org) by idunn.apache.osuosl.org (ecelerity 83.161.120.155 r(12930)) with ESMTP id 70/C1-25038-73784154 for <yaguilar@example.com>; Fri, 22 Sep 2006 18:00:40 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 812961A981A; Fri, 22 Sep 2006 18:00:37 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r449136 - in /incubator/openejb/trunk/openejb2/modules/openejb-builder/src: main/java/org/openejb/deployment/ test/java/org/openejb/deployment/ Date: Sat, 23 Sep 2006 01:00:37 -0000 To: yaguilar@example.com From: yaguilar@example.com X-Mailer: svnmailer-1.1.0 Message-Id: <yaguilar@example.com> X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: djencks Date: Fri Sep 22 18:00:36 2006 New Revision: 449136 URL: http://svn.apache.org/viewvc?view=rev&rev=449136 Log: GERONIMO-2427. Make ref builders accept either j2ee 1.4 or jee5 deployment descriptor xml Added: incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test/java/org/openejb/deployment/MockResourceEnvironmentSetter.java (with props) Modified: incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/openejb/deployment/OpenEjbAbstractRefBuilder.java incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/openejb/deployment/OpenEjbClientRemoteRefBuilder.java incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/openejb/deployment/OpenEjbLocalRefBuilder.java incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/openejb/deployment/OpenEjbModuleBuilder.java incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/openejb/deployment/OpenEjbRemoteRefBuilder.java incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/openejb/deployment/XmlBeanBuilder.java incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/openejb/deployment/XmlBeansEntityBuilder.java incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/openejb/deployment/XmlBeansMdbBuilder.java incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/openejb/deployment/XmlBeansSessionBuilder.java incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test/java/org/openejb/deployment/DeploymentTestSuite.java incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test/java/org/openejb/deployment/PlanParsingTest.java Modified: incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/openejb/deployment/OpenEjbAbstractRefBuilder.java URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/openejb/deployment/OpenEjbAbstractRefBuilder.java?view=diff&rev=449136&r1=449135&r2=449136 ============================================================================== --- incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/openejb/deployment/OpenEjbAbstractRefBuilder.java (original) +++ incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/openejb/deployment/OpenEjbAbstractRefBuilder.java Fri Sep 22 18:00:36 2006 @@ -40,10 +40,9 @@ import org.openejb.RpcEjbDeployment; /** - * @version $Rev:$ $Date:$ + * @version $Rev$ $Date$ */ public abstract class OpenEjbAbstractRefBuilder extends AbstractNamingBuilder { - protected static final String J2EE_NAMESPACE = "http://java.sun.com/xml/ns/j2ee"; private final static Map STATELESS = Collections.singletonMap(NameFactory.J2EE_TYPE, NameFactory.STATELESS_SESSION_BEAN); private final static Map STATEFUL = Collections.singletonMap(NameFactory.J2EE_TYPE, NameFactory.STATEFUL_SESSION_BEAN); private final static Map ENTITY = Collections.singletonMap(NameFactory.J2EE_TYPE, NameFactory.ENTITY_BEAN); Modified: incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/openejb/deployment/OpenEjbClientRemoteRefBuilder.java URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/openejb/deployment/OpenEjbClientRemoteRefBuilder.java?view=diff&rev=449136&r1=449135&r2=449136 ============================================================================== --- incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/openejb/deployment/OpenEjbClientRemoteRefBuilder.java (original) +++ incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/openejb/deployment/OpenEjbClientRemoteRefBuilder.java Fri Sep 22 18:00:36 2006 @@ -32,20 +32,19 @@ import org.openejb.client.naming.RemoteEJBReference; /** - * @version $Rev:$ $Date:$ + * @version $Rev$ $Date$ */ public class OpenEjbClientRemoteRefBuilder extends OpenEjbRemoteRefBuilder { private final ServerMetaData server; - public OpenEjbClientRemoteRefBuilder(Environment defaultEnvironment, String host, int port) throws UnknownHostException{ - super(defaultEnvironment); + public OpenEjbClientRemoteRefBuilder(Environment defaultEnvironment, String[] eeNamespaces, String host, int port) throws UnknownHostException{ + super(defaultEnvironment, eeNamespaces); server = new ServerMetaData("BOOT", host, port); } protected Reference buildRemoteReference(Artifact configurationId, AbstractNameQuery abstractNameQuery, boolean session, String home, String remote) { - Reference reference = new RemoteEJBReference(abstractNameQuery.toString(), Collections.singletonList(server)); - return reference; + return new RemoteEJBReference(abstractNameQuery.toString(), Collections.singletonList(server)); } public static final GBeanInfo GBEAN_INFO; @@ -56,7 +55,7 @@ infoBuilder.addAttribute("host", String.class, true); infoBuilder.addAttribute("port", int.class, true); - infoBuilder.setConstructor(new String[]{"defaultEnvironment", "host", "port"}); + infoBuilder.setConstructor(new String[]{"defaultEnvironment", "eeNamespaces", "host", "port"}); GBEAN_INFO = infoBuilder.getBeanInfo(); } Modified: incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/openejb/deployment/OpenEjbLocalRefBuilder.java URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/openejb/deployment/OpenEjbLocalRefBuilder.java?view=diff&rev=449136&r1=449135&r2=449136 ============================================================================== --- incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/openejb/deployment/OpenEjbLocalRefBuilder.java (original) +++ incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/openejb/deployment/OpenEjbLocalRefBuilder.java Fri Sep 22 18:00:36 2006 @@ -34,6 +34,7 @@ import org.apache.geronimo.kernel.GBeanNotFoundException; import org.apache.geronimo.kernel.config.Configuration; import org.apache.geronimo.kernel.repository.Artifact; +import org.apache.geronimo.kernel.repository.Environment; import org.apache.geronimo.xbeans.geronimo.naming.GerEjbLocalRefDocument; import org.apache.geronimo.xbeans.geronimo.naming.GerEjbLocalRefType; import org.apache.geronimo.xbeans.geronimo.naming.GerPatternType; @@ -48,13 +49,18 @@ */ public class OpenEjbLocalRefBuilder extends OpenEjbAbstractRefBuilder { - private static final QName EJB_LOCAL_REF_QNAME = new QName(J2EE_NAMESPACE, "ejb-local-ref"); - private static final QNameSet EJB_LOCAL_REF_QNAME_SET = QNameSet.singleton(EJB_LOCAL_REF_QNAME); private static final QName GER_EJB_LOCAL_REF_QNAME = GerEjbLocalRefDocument.type.getDocumentElementName(); private static final QNameSet GER_EJB_LOCAL_REF_QNAME_SET = QNameSet.singleton(GER_EJB_LOCAL_REF_QNAME); + private final QNameSet ejbLocalRefQNameSet; + + public OpenEjbLocalRefBuilder(Environment defaultEnvironment, String[] eeNamespaces) { + super(defaultEnvironment); + ejbLocalRefQNameSet = buildQNameSet(eeNamespaces, "ejb-local-ref"); + } + public void buildNaming(XmlObject specDD, XmlObject plan, Configuration localConfiguration, Configuration remoteConfiguration, Module module, Map componentContext) throws DeploymentException { - XmlObject[] ejbLocalRefsUntyped = specDD.selectChildren(EJB_LOCAL_REF_QNAME_SET); + XmlObject[] ejbLocalRefsUntyped = convert(specDD.selectChildren(ejbLocalRefQNameSet), J2EE_CONVERTER, EjbLocalRefType.type); XmlObject[] gerEjbLocalRefsUntyped = plan == null? NO_REFS: plan.selectChildren(GER_EJB_LOCAL_REF_QNAME_SET); Map ejbLocalRefMap = mapEjbLocalRefs(gerEjbLocalRefsUntyped); ClassLoader cl = localConfiguration.getConfigurationClassLoader(); @@ -120,7 +126,7 @@ } public QNameSet getSpecQNameSet() { - return EJB_LOCAL_REF_QNAME_SET; + return ejbLocalRefQNameSet; } public QNameSet getPlanQNameSet() { @@ -185,6 +191,10 @@ static { GBeanInfoBuilder infoBuilder = GBeanInfoBuilder.createStatic(OpenEjbLocalRefBuilder.class, NameFactory.MODULE_BUILDER); //TODO decide what type this should be + infoBuilder.addAttribute("eeNamespaces", String[].class, true, true); + infoBuilder.addAttribute("defaultEnvironment", Environment.class, true, true); + + infoBuilder.setConstructor(new String[] {"defaultEnvironment", "eeNamespaces"}); GBEAN_INFO = infoBuilder.getBeanInfo(); } Modified: incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/openejb/deployment/OpenEjbModuleBuilder.java URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/openejb/deployment/OpenEjbModuleBuilder.java?view=diff&rev=449136&r1=449135&r2=449136 ============================================================================== --- incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/openejb/deployment/OpenEjbModuleBuilder.java (original) +++ incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/openejb/deployment/OpenEjbModuleBuilder.java Fri Sep 22 18:00:36 2006 @@ -50,7 +50,6 @@ import java.io.File; import java.io.IOException; -import java.net.MalformedURLException; import java.net.URI; import java.net.URL; import java.security.Permissions; @@ -96,6 +95,7 @@ import org.apache.geronimo.kernel.config.ConfigurationStore; import org.apache.geronimo.kernel.repository.Environment; import org.apache.geronimo.naming.deployment.ENCConfigBuilder; +import org.apache.geronimo.naming.deployment.ResourceEnvironmentSetter; import org.apache.geronimo.schema.NamespaceElementConverter; import org.apache.geronimo.schema.SchemaConversionUtils; import org.apache.geronimo.security.jacc.ComponentPermissions; @@ -143,6 +143,7 @@ private final NamespaceDrivenBuilderCollection serviceBuilders; private final NamingBuilder namingBuilders; private final ActivationSpecInfoLocator activationSpecInfoLocator; + private final ResourceEnvironmentSetter resourceEnvironmentSetter; static { @@ -164,6 +165,7 @@ NamespaceDrivenBuilder securityBuilder, NamespaceDrivenBuilder serviceBuilder, NamingBuilder namingBuilders, + ResourceEnvironmentSetter resourceEnvironmentSetter, ActivationSpecInfoLocator activationSpecInfoLocator, Kernel kernel) throws GBeanNotFoundException { @@ -179,7 +181,9 @@ securityBuilder == null ? Collections.EMPTY_SET : Collections.singleton(securityBuilder), serviceBuilder == null ? Collections.EMPTY_SET : Collections.singleton(serviceBuilder), namingBuilders, - activationSpecInfoLocator, kernel); + resourceEnvironmentSetter, + activationSpecInfoLocator, + kernel); } public OpenEjbModuleBuilder(Environment defaultEnvironment, @@ -194,6 +198,7 @@ NamespaceDrivenBuilder securityBuilder, NamespaceDrivenBuilder serviceBuilder, NamingBuilder namingBuilders, + ResourceEnvironmentSetter resourceEnvironmentSetter, ActivationSpecInfoLocator activationSpecInfoLocator, Kernel kernel) { @@ -209,6 +214,7 @@ securityBuilder == null ? Collections.EMPTY_SET : Collections.singleton(securityBuilder), serviceBuilder == null ? Collections.EMPTY_SET : Collections.singleton(serviceBuilder), namingBuilders, + resourceEnvironmentSetter, activationSpecInfoLocator, kernel); } @@ -225,7 +231,8 @@ Collection securityBuilders, Collection serviceBuilders, NamingBuilder namingBuilders, - ActivationSpecInfoLocator activationSpecInfoLocator, Kernel kernel) { + ResourceEnvironmentSetter resourceEnvironmentSetter, ActivationSpecInfoLocator activationSpecInfoLocator, + Kernel kernel) { this.defaultEnvironment = defaultEnvironment; this.listener = listener; @@ -237,6 +244,7 @@ this.securityBuilders = new NamespaceDrivenBuilderCollection(securityBuilders); this.serviceBuilders = new NamespaceDrivenBuilderCollection(serviceBuilders); this.namingBuilders = namingBuilders; + this.resourceEnvironmentSetter = resourceEnvironmentSetter; this.activationSpecInfoLocator = activationSpecInfoLocator; } @@ -618,6 +626,7 @@ infoBuilder.addReference("SecurityBuilders", NamespaceDrivenBuilder.class, NameFactory.MODULE_BUILDER); infoBuilder.addReference("ServiceBuilders", NamespaceDrivenBuilder.class, NameFactory.MODULE_BUILDER); infoBuilder.addReference("NamingBuilders", NamingBuilder.class, NameFactory.MODULE_BUILDER); + infoBuilder.addReference("ResourceEnvironmentSetter", ResourceEnvironmentSetter.class, NameFactory.MODULE_BUILDER); infoBuilder.addReference("ActivationSpecInfoLocator", ActivationSpecInfoLocator.class, NameFactory.MODULE_BUILDER); infoBuilder.setConstructor(new String[]{ @@ -633,6 +642,7 @@ "SecurityBuilders", "ServiceBuilders", "NamingBuilders", + "ResourceEnvironmentSetter", "ActivationSpecInfoLocator", "kernel"}); GBEAN_INFO = infoBuilder.getBeanInfo(); @@ -644,5 +654,9 @@ public ActivationSpecInfoLocator getActivationSpecInfoLocator() { return activationSpecInfoLocator; + } + + public ResourceEnvironmentSetter getResourceEnvironmentSetter() { + return resourceEnvironmentSetter; } } Modified: incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/openejb/deployment/OpenEjbRemoteRefBuilder.java URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/openejb/deployment/OpenEjbRemoteRefBuilder.java?view=diff&rev=449136&r1=449135&r2=449136 ============================================================================== --- incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/openejb/deployment/OpenEjbRemoteRefBuilder.java (original) +++ incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/openejb/deployment/OpenEjbRemoteRefBuilder.java Fri Sep 22 18:00:36 2006 @@ -52,13 +52,14 @@ */ public class OpenEjbRemoteRefBuilder extends OpenEjbAbstractRefBuilder { - private static final QName EJB_REF_QNAME = new QName(J2EE_NAMESPACE, "ejb-ref"); - private static final QNameSet EJB_REF_QNAME_SET = QNameSet.singleton(EJB_REF_QNAME); private static final QName GER_EJB_REF_QNAME = GerEjbRefDocument.type.getDocumentElementName(); private static final QNameSet GER_EJB_REF_QNAME_SET = QNameSet.singleton(GER_EJB_REF_QNAME); - public OpenEjbRemoteRefBuilder(Environment defaultEnvironment) { + private final QNameSet ejbRefQNameSet; + + public OpenEjbRemoteRefBuilder(Environment defaultEnvironment, String[] eeNamespaces) { super(defaultEnvironment); + ejbRefQNameSet = buildQNameSet(eeNamespaces, "ejb-ref"); } protected boolean willMergeEnvironment(XmlObject specDD, XmlObject plan) { @@ -83,7 +84,7 @@ } private XmlObject[] getEjbRefs(XmlObject specDD) { - return specDD.selectChildren(EJB_REF_QNAME_SET); + return convert(specDD.selectChildren(ejbRefQNameSet), J2EE_CONVERTER, EjbRefType.type); } private Reference addEJBRef(Configuration earContext, Configuration ejbContext, URI moduleURI, EjbRefType ejbRef, GerEjbRefType remoteRef, ClassLoader cl) throws DeploymentException { @@ -161,7 +162,7 @@ } public QNameSet getSpecQNameSet() { - return EJB_REF_QNAME_SET; + return ejbRefQNameSet; } public QNameSet getPlanQNameSet() { @@ -240,9 +241,10 @@ static { GBeanInfoBuilder infoBuilder = GBeanInfoBuilder.createStatic(OpenEjbRemoteRefBuilder.class, NameFactory.MODULE_BUILDER); //TODO decide what type this should be + infoBuilder.addAttribute("eeNamespaces", String[].class, true, true); infoBuilder.addAttribute("defaultEnvironment", Environment.class, true, true); - infoBuilder.setConstructor(new String[] {"defaultEnvironment"}); + infoBuilder.setConstructor(new String[] {"defaultEnvironment", "eeNamespaces"}); GBEAN_INFO = infoBuilder.getBeanInfo(); } Modified: incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/openejb/deployment/XmlBeanBuilder.java URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/openejb/deployment/XmlBeanBuilder.java?view=diff&rev=449136&r1=449135&r2=449136 ============================================================================== --- incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/openejb/deployment/XmlBeanBuilder.java (original) +++ incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/openejb/deployment/XmlBeanBuilder.java Fri Sep 22 18:00:36 2006 @@ -49,6 +49,7 @@ import org.apache.geronimo.j2ee.deployment.NamingBuilder; import org.apache.geronimo.j2ee.deployment.ActivationSpecInfoLocator; +import org.apache.geronimo.naming.deployment.ResourceEnvironmentSetter; public abstract class XmlBeanBuilder { protected final OpenEjbModuleBuilder moduleBuilder; @@ -63,6 +64,10 @@ public NamingBuilder getNamingBuilders() { return moduleBuilder.getNamingBuilders(); + } + + public ResourceEnvironmentSetter getResourceEnvironmentSetter() { + return moduleBuilder.getResourceEnvironmentSetter(); } public ActivationSpecInfoLocator getActivationSpecInfoLocator() { Modified: incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/openejb/deployment/XmlBeansEntityBuilder.java URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/openejb/deployment/XmlBeansEntityBuilder.java?view=diff&rev=449136&r1=449135&r2=449136 ============================================================================== --- incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/openejb/deployment/XmlBeansEntityBuilder.java (original) +++ incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/openejb/deployment/XmlBeansEntityBuilder.java Fri Sep 22 18:00:36 2006 @@ -219,7 +219,7 @@ Configuration earConfiguration = earContext.getConfiguration(); getNamingBuilders().buildNaming(entityBean, openejbEntityBean, earConfiguration, earConfiguration, ejbModule, componentContext); builder.setComponentContext(componentContext); - ENCConfigBuilder.setResourceEnvironment(builder, resourceRefs, openejbResourceRefs); + getResourceEnvironmentSetter().setResourceEnvironment(builder, resourceRefs, openejbResourceRefs); } public void initContext(EARContext earContext, AbstractName moduleBaseName, URI moduleUri, ClassLoader cl, EnterpriseBeansType enterpriseBeans) throws DeploymentException { Modified: incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/openejb/deployment/XmlBeansMdbBuilder.java URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/openejb/deployment/XmlBeansMdbBuilder.java?view=diff&rev=449136&r1=449135&r2=449136 ============================================================================== --- incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/openejb/deployment/XmlBeansMdbBuilder.java (original) +++ incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/openejb/deployment/XmlBeansMdbBuilder.java Fri Sep 22 18:00:36 2006 @@ -437,6 +437,6 @@ Configuration earConfiguration = earContext.getConfiguration(); getNamingBuilders().buildNaming(messageDrivenBean, openejbMessageDrivenBean, earConfiguration, earConfiguration, ejbModule, componentContext); builder.setComponentContext(componentContext); - ENCConfigBuilder.setResourceEnvironment(builder, resourceRefs, openejbResourceRefs); + getResourceEnvironmentSetter().setResourceEnvironment(builder, resourceRefs, openejbResourceRefs); } } Modified: incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/openejb/deployment/XmlBeansSessionBuilder.java URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/openejb/deployment/XmlBeansSessionBuilder.java?view=diff&rev=449136&r1=449135&r2=449136 ============================================================================== --- incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/openejb/deployment/XmlBeansSessionBuilder.java (original) +++ incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/openejb/deployment/XmlBeansSessionBuilder.java Fri Sep 22 18:00:36 2006 @@ -286,7 +286,7 @@ Configuration earConfiguration = earContext.getConfiguration(); getNamingBuilders().buildNaming(sessionBean, openejbSessionBean, earConfiguration, earConfiguration, ejbModule, componentContext); sessionBuilder.setComponentContext(componentContext); - ENCConfigBuilder.setResourceEnvironment(sessionBuilder, resourceRefs, openejbResourceRefs); + getResourceEnvironmentSetter().setResourceEnvironment(sessionBuilder, resourceRefs, openejbResourceRefs); } private List createHandlerInfos(JarFile moduleFile, String ejbName, ClassLoader cl) throws DeploymentException { Modified: incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test/java/org/openejb/deployment/DeploymentTestSuite.java URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test/java/org/openejb/deployment/DeploymentTestSuite.java?view=diff&rev=449136&r1=449135&r2=449136 ============================================================================== --- incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test/java/org/openejb/deployment/DeploymentTestSuite.java (original) +++ incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test/java/org/openejb/deployment/DeploymentTestSuite.java Fri Sep 22 18:00:36 2006 @@ -160,6 +160,7 @@ null, new GBeanBuilder(null, null), new NamingBuilderCollection(null, null), + new MockResourceEnvironmentSetter(), ACTIVATION_SPEC_INFO_LOCATOR, null); Added: incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test/java/org/openejb/deployment/MockResourceEnvironmentSetter.java URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test/java/org/openejb/deployment/MockResourceEnvironmentSetter.java?view=auto&rev=449136 ============================================================================== --- incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test/java/org/openejb/deployment/MockResourceEnvironmentSetter.java (added) +++ incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test/java/org/openejb/deployment/MockResourceEnvironmentSetter.java Fri Sep 22 18:00:36 2006 @@ -0,0 +1,34 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + + +package org.openejb.deployment; + +import org.apache.geronimo.naming.deployment.ResourceEnvironmentSetter; +import org.apache.geronimo.naming.deployment.ResourceEnvironmentBuilder; +import org.apache.geronimo.xbeans.geronimo.naming.GerResourceRefType; +import org.apache.xmlbeans.XmlObject; + +/** + * @version $Rev:$ $Date:$ + */ +public class MockResourceEnvironmentSetter implements ResourceEnvironmentSetter { + public void setResourceEnvironment(ResourceEnvironmentBuilder builder, XmlObject[] resourceRefs, GerResourceRefType[] gerResourceRefs) { + } +} Propchange: incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test/java/org/openejb/deployment/MockResourceEnvironmentSetter.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test/java/org/openejb/deployment/MockResourceEnvironmentSetter.java ------------------------------------------------------------------------------ svn:keywords = Date Revision Propchange: incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test/java/org/openejb/deployment/MockResourceEnvironmentSetter.java ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test/java/org/openejb/deployment/PlanParsingTest.java URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test/java/org/openejb/deployment/PlanParsingTest.java?view=diff&rev=449136&r1=449135&r2=449136 ============================================================================== --- incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test/java/org/openejb/deployment/PlanParsingTest.java (original) +++ incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test/java/org/openejb/deployment/PlanParsingTest.java Fri Sep 22 18:00:36 2006 @@ -4,8 +4,6 @@ import java.util.Collections; import junit.framework.TestCase; -import org.apache.geronimo.gbean.GBeanData; -import org.apache.geronimo.gbean.SingleElementCollection; import org.apache.geronimo.j2ee.deployment.NamingBuilderCollection; import org.openejb.xbeans.ejbjar.OpenejbOpenejbJarType; @@ -29,6 +27,7 @@ Collections.EMPTY_LIST, Collections.EMPTY_LIST, new NamingBuilderCollection(null, null), + new MockResourceEnvironmentSetter(), null, null); } From openejb-commits-returnyaguilar@example.com Sat Sep 23 07:35:47 2006 Return-Path: <openejb-commits-returnyaguilar@example.com> Delivered-To: yaguilar@example.com Received: (qmail 77360 invoked from network); 23 Sep 2006 07:35:47 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 23 Sep 2006 07:35:47 -0000 Received: (qmail 10651 invoked by uid 500); 23 Sep 2006 07:35:47 -0000 Delivered-To: yaguilar@example.com Received: (qmail 10629 invoked by uid 500); 23 Sep 2006 07:35:46 -0000 Mailing-List: contact yaguilar@example.com; run by ezmlm Precedence: bulk List-Help: <mailto:yaguilar@example.com> List-Unsubscribe: <mailto:yaguilar@example.com> List-Post: <mailto:yaguilar@example.com> List-Id: <openejb-commits.incubator.apache.org> Reply-To: yaguilar@example.com Delivered-To: mailing list yaguilar@example.com Received: (qmail 10620 invoked by uid 99); 23 Sep 2006 07:35:46 -0000 Received: from idunn.apache.osuosl.org (HELO idunn.apache.osuosl.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 23 Sep 2006 00:35:46 -0700 Authentication-Results: idunn.apache.osuosl.org yaguilar@example.com; spf=permerror X-ASF-Spam-Status: No, hits=-9.4 required=5.0 tests=ALL_TRUSTED,NO_REAL_NAME Received-SPF: error (idunn.apache.osuosl.org: domain apache.org from 83.161.120.155 cause and error) Received: from [83.161.120.155] ([83.161.120.155:58467] helo=eris.apache.org) by idunn.apache.osuosl.org (ecelerity 83.161.120.155 r(12930)) with ESMTP id 6E/61-27820-2D3E4154 for <yaguilar@example.com>; Sat, 23 Sep 2006 00:35:46 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 3074A1A981A; Sat, 23 Sep 2006 00:35:44 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r449201 - /incubator/openejb/trunk/openejb3/examples/helloworld-stateful-pojo/ Date: Sat, 23 Sep 2006 07:35:44 -0000 To: yaguilar@example.com From: yaguilar@example.com X-Mailer: svnmailer-1.1.0 Message-Id: <yaguilar@example.com> X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: jlaskowski Date: Sat Sep 23 00:35:43 2006 New Revision: 449201 URL: http://svn.apache.org/viewvc?view=rev&rev=449201 Log: svn:ignore set Modified: incubator/openejb/trunk/openejb3/examples/helloworld-stateful-pojo/ (props changed) Propchange: incubator/openejb/trunk/openejb3/examples/helloworld-stateful-pojo/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sat Sep 23 00:35:43 2006 @@ -0,0 +1,9 @@ +*.ipr +*.iml +*.iws +*~ +.project +.settings +.classpath +target + From openejb-commits-return-yaguilar@example.com Sat Sep 23 07:48:31 2006 Return-Path: <openejb-commits-return-yaguilar@example.com> Delivered-To: yaguilar@example.com Received: (qmail 78520 invoked from network); 23 Sep 2006 07:48:31 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 23 Sep 2006 07:48:31 -0000 Received: (qmail 12684 invoked by uid 500); 23 Sep 2006 07:48:30 -0000 Delivered-To: yaguilar@example.com Received: (qmail 12662 invoked by uid 500); 23 Sep 2006 07:48:30 -0000 Mailing-List: contact yaguilar@example.com; run by ezmlm Precedence: bulk List-Help: <mailto:yaguilar@example.com> List-Unsubscribe: <mailto:yaguilar@example.com> List-Post: <mailto:yaguilar@example.com> List-Id: <openejb-commits.incubator.apache.org> Reply-To: yaguilar@example.com Delivered-To: mailing list yaguilar@example.com Received: (qmail 12653 invoked by uid 99); 23 Sep 2006 07:48:30 -0000 Received: from idunn.apache.osuosl.org (HELO idunn.apache.osuosl.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 23 Sep 2006 00:48:30 -0700 Authentication-Results: idunn.apache.osuosl.org yaguilar@example.com; spf=permerror X-ASF-Spam-Status: No, hits=-9.4 required=5.0 tests=ALL_TRUSTED,NO_REAL_NAME Received-SPF: error (idunn.apache.osuosl.org: domain apache.org from 83.161.120.155 cause and error) Received: from [83.161.120.155] ([83.161.120.155:61084] helo=eris.apache.org) by idunn.apache.osuosl.org (ecelerity 83.161.120.155 r(12930)) with ESMTP id F0/C1-27820-EC6E4154 for <yaguilar@example.com>; Sat, 23 Sep 2006 00:48:30 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 13CF71A981A; Sat, 23 Sep 2006 00:48:28 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r449202 - /incubator/openejb/trunk/openejb3/container/openejb-persistence/src/test/java/org/openejb/persistence/OpenJpaProviderTest.java Date: Sat, 23 Sep 2006 07:48:27 -0000 To: yaguilar@example.com From: yaguilar@example.com X-Mailer: svnmailer-1.1.0 Message-Id: <yaguilar@example.com> X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: jlaskowski Date: Sat Sep 23 00:48:27 2006 New Revision: 449202 URL: http://svn.apache.org/viewvc?view=rev&rev=449202 Log: Set derby.system.home to target so derby.log is taken care of when m2 commands are executed, i.e. clean Modified: incubator/openejb/trunk/openejb3/container/openejb-persistence/src/test/java/org/openejb/persistence/OpenJpaProviderTest.java Modified: incubator/openejb/trunk/openejb3/container/openejb-persistence/src/test/java/org/openejb/persistence/OpenJpaProviderTest.java URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-persistence/src/test/java/org/openejb/persistence/OpenJpaProviderTest.java?view=diff&rev=449202&r1=449201&r2=449202 ============================================================================== --- incubator/openejb/trunk/openejb3/container/openejb-persistence/src/test/java/org/openejb/persistence/OpenJpaProviderTest.java (original) +++ incubator/openejb/trunk/openejb3/container/openejb-persistence/src/test/java/org/openejb/persistence/OpenJpaProviderTest.java Sat Sep 23 00:48:27 2006 @@ -29,6 +29,10 @@ public void testOpenJpaProvider() throws Exception { System.setProperty(javax.naming.Context.URL_PKG_PREFIXES, "org.openejb.persistence"); + // m2 executes tests in a module home directory (e.g. container/openejb-persistence) + // Derby creates derby.log file in derby.system.home + // @see http://publib.boulder.ibm.com/infocenter/cscv/v10r1/index.jsp?topic=/com.ibm.cloudscape.doc/cdevdvlp25889.html + System.setProperty("derby.system.home", "target"); PersistenceDeployer deployer = new PersistenceDeployer(new TestDataSourceResolver()); @@ -58,7 +62,7 @@ public DataSource getDataSource(String name) throws Exception { BasicDataSource ds = new BasicDataSource(); ds.setDriverClassName("org.apache.derby.jdbc.EmbeddedDriver"); - ds.setUrl("jdbc:derby:target/database/openjpa-test-database;create=true"); + ds.setUrl("jdbc:derby:database/openjpa-test-database;create=true"); ds.setMaxActive(100); ds.setMaxWait(10000); ds.setTestOnBorrow(true); From openejb-commits-return-yaguilar@example.com Sat Sep 23 07:52:32 2006 Return-Path: <openejb-commits-return-yaguilar@example.com> Delivered-To: yaguilar@example.com Received: (qmail 78818 invoked from network); 23 Sep 2006 07:52:31 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 23 Sep 2006 07:52:31 -0000 Received: (qmail 13055 invoked by uid 500); 23 Sep 2006 07:52:31 -0000 Delivered-To: yaguilar@example.com Received: (qmail 13037 invoked by uid 500); 23 Sep 2006 07:52:31 -0000 Mailing-List: contact yaguilar@example.com; run by ezmlm Precedence: bulk List-Help: <mailto:yaguilar@example.com> List-Unsubscribe: <mailto:yaguilar@example.com> List-Post: <mailto:yaguilar@example.com> List-Id: <openejb-commits.incubator.apache.org> Reply-To: yaguilar@example.com Delivered-To: mailing list yaguilar@example.com Received: (qmail 13028 invoked by uid 99); 23 Sep 2006 07:52:31 -0000 Received: from idunn.apache.osuosl.org (HELO idunn.apache.osuosl.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 23 Sep 2006 00:52:31 -0700 Authentication-Results: idunn.apache.osuosl.org yaguilar@example.com; spf=permerror X-ASF-Spam-Status: No, hits=-9.4 required=5.0 tests=ALL_TRUSTED,NO_REAL_NAME Received-SPF: error (idunn.apache.osuosl.org: domain apache.org from 83.161.120.155 cause and error) Received: from [83.161.120.155] ([83.161.120.155:65350] helo=eris.apache.org) by idunn.apache.osuosl.org (ecelerity 83.161.120.155 r(12930)) with ESMTP id 27/D1-27820-EB7E4154 for <yaguilar@example.com>; Sat, 23 Sep 2006 00:52:31 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id BB9821A981A; Sat, 23 Sep 2006 00:52:28 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r449203 - in /incubator/openejb/trunk/openejb3/container/openejb-persistence/src/test/java/org/openejb/persistence: FakeEntityManagerFactory.java PersistenceTest.java Date: Sat, 23 Sep 2006 07:52:28 -0000 To: yaguilar@example.com From: yaguilar@example.com X-Mailer: svnmailer-1.1.0 Message-Id: <yaguilar@example.com> X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: jlaskowski Date: Sat Sep 23 00:52:28 2006 New Revision: 449203 URL: http://svn.apache.org/viewvc?view=rev&rev=449203 Log: Organize imports and format source Modified: incubator/openejb/trunk/openejb3/container/openejb-persistence/src/test/java/org/openejb/persistence/FakeEntityManagerFactory.java incubator/openejb/trunk/openejb3/container/openejb-persistence/src/test/java/org/openejb/persistence/PersistenceTest.java Modified: incubator/openejb/trunk/openejb3/container/openejb-persistence/src/test/java/org/openejb/persistence/FakeEntityManagerFactory.java URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-persistence/src/test/java/org/openejb/persistence/FakeEntityManagerFactory.java?view=diff&rev=449203&r1=449202&r2=449203 ============================================================================== --- incubator/openejb/trunk/openejb3/container/openejb-persistence/src/test/java/org/openejb/persistence/FakeEntityManagerFactory.java (original) +++ incubator/openejb/trunk/openejb3/container/openejb-persistence/src/test/java/org/openejb/persistence/FakeEntityManagerFactory.java Sat Sep 23 00:52:28 2006 @@ -16,11 +16,11 @@ */ package org.openejb.persistence; +import java.util.Map; + import javax.persistence.EntityManager; import javax.persistence.EntityManagerFactory; -import javax.persistence.PersistenceContextType; import javax.persistence.spi.PersistenceUnitInfo; -import java.util.Map; public class FakeEntityManagerFactory implements EntityManagerFactory { Modified: incubator/openejb/trunk/openejb3/container/openejb-persistence/src/test/java/org/openejb/persistence/PersistenceTest.java URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-persistence/src/test/java/org/openejb/persistence/PersistenceTest.java?view=diff&rev=449203&r1=449202&r2=449203 ============================================================================== --- incubator/openejb/trunk/openejb3/container/openejb-persistence/src/test/java/org/openejb/persistence/PersistenceTest.java (original) +++ incubator/openejb/trunk/openejb3/container/openejb-persistence/src/test/java/org/openejb/persistence/PersistenceTest.java Sat Sep 23 00:52:28 2006 @@ -44,6 +44,7 @@ private String previousFactory = null; public void testNothing() {} + public void _testDeployer() throws Exception { String jndiPrefix = "java:openejb/PersistenceFactories"; try { @@ -81,7 +82,7 @@ } ctx = (Context) ctxObj; } catch (NameNotFoundException e) { - //Name was not found, so add a new subcontext + // Name was not found, so add a new subcontext ctx = ctx.createSubcontext(composite.get(i)); } } @@ -96,8 +97,7 @@ if (!(em instanceof FakeEntityManager)) fail("EntityManager is not a FakeEntityManager!"); - PersistenceUnitInfo pu = ((FakeEntityManagerFactory) emf) - .getPersistenceUnitInfo(); + PersistenceUnitInfo pu = ((FakeEntityManagerFactory) emf).getPersistenceUnitInfo(); assertNotNull(pu); Properties props = pu.getProperties(); @@ -113,12 +113,10 @@ List<String> managedClasses = pu.getManagedClassNames(); assertTrue(managedClasses.contains("org.openejb.persistence.TestClass")); - assertTrue(managedClasses - .contains("org.openejb.persistence.TestClass2")); + assertTrue(managedClasses.contains("org.openejb.persistence.TestClass2")); } - private void cleanupJNDI(String jndi) throws Exception { CompositeName composite = new CompositeName(jndi); for (int i = composite.size(); i > 0; i--) { @@ -127,8 +125,7 @@ if (value instanceof Context) { Object parent = ctx; if (i > 1) - parent = ctx.lookup(composite.getPrefix(i - 1) - .toString()); + parent = ctx.lookup(composite.getPrefix(i - 1).toString()); ((Context) parent).destroySubcontext(composite.get(i - 1)); } else ctx.unbind(composite.getPrefix(i).toString()); @@ -145,7 +142,8 @@ // Set up a fake JNDI instance Hashtable<String, String> env = new Hashtable<String, String>(); env.put(Context.INITIAL_CONTEXT_FACTORY, "org.openejb.persistence.JNDIContextFactory"); - previousFactory = System.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.openejb.persistence.JNDIContextFactory"); + previousFactory = System.setProperty(Context.INITIAL_CONTEXT_FACTORY, + "org.openejb.persistence.JNDIContextFactory"); ctx = new InitialContext(env); @@ -156,10 +154,9 @@ protected void tearDown() throws Exception { super.tearDown(); - cleanupJNDI("jdbc/MyDataSource"); + cleanupJNDI(DATASOURCE_NAME); if (previousFactory != null) - System.setProperty(Context.INITIAL_CONTEXT_FACTORY, - previousFactory); + System.setProperty(Context.INITIAL_CONTEXT_FACTORY, previousFactory); else System.getProperties().remove(Context.INITIAL_CONTEXT_FACTORY); } From openejb-commits-return-yaguilar@example.com Sat Sep 23 09:55:39 2006 Return-Path: <openejb-commits-return-yaguilar@example.com> Delivered-To: yaguilar@example.com Received: (qmail 91955 invoked from network); 23 Sep 2006 09:55:38 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 23 Sep 2006 09:55:38 -0000 Received: (qmail 83648 invoked by uid 500); 23 Sep 2006 09:55:38 -0000 Delivered-To: yaguilar@example.com Received: (qmail 83604 invoked by uid 500); 23 Sep 2006 09:55:38 -0000 Mailing-List: contact yaguilar@example.com; run by ezmlm Precedence: bulk List-Help: <mailto:yaguilar@example.com> List-Unsubscribe: <mailto:yaguilar@example.com> List-Post: <mailto:yaguilar@example.com> List-Id: <openejb-commits.incubator.apache.org> Reply-To: yaguilar@example.com Delivered-To: mailing list yaguilar@example.com Received: (qmail 83595 invoked by uid 99); 23 Sep 2006 09:55:38 -0000 Received: from idunn.apache.osuosl.org (HELO idunn.apache.osuosl.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 23 Sep 2006 02:55:38 -0700 Authentication-Results: idunn.apache.osuosl.org yaguilar@example.com; spf=permerror X-ASF-Spam-Status: No, hits=-9.4 required=5.0 tests=ALL_TRUSTED,NO_REAL_NAME Received-SPF: error (idunn.apache.osuosl.org: domain apache.org from 83.161.120.155 cause and error) Received: from [83.161.120.155] ([83.161.120.155:50132] helo=eris.apache.org) by idunn.apache.osuosl.org (ecelerity 83.161.120.155 r(12930)) with ESMTP id E1/26-27820-89405154 for <yaguilar@example.com>; Sat, 23 Sep 2006 02:55:36 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 1C0811A981A; Sat, 23 Sep 2006 02:55:34 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r449211 - in /incubator/openejb/trunk/openejb3: container/openejb-core/src/main/java/org/openejb/util/ container/openejb-core/src/main/resources/META-INF/org.openejb/ openejb-itests/src/main/java/org/openejb/test/stateful/ openejb-itests/sr... Date: Sat, 23 Sep 2006 09:55:33 -0000 To: yaguilar@example.com From: yaguilar@example.com X-Mailer: svnmailer-1.1.0 Message-Id: <yaguilar@example.com> X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: jlaskowski Date: Sat Sep 23 02:55:32 2006 New Revision: 449211 URL: http://svn.apache.org/viewvc?view=rev&rev=449211 Log: OPENEJB-172 - iTest: StatefulLocalJndiTests Added: incubator/openejb/trunk/openejb3/openejb-itests/src/main/java/org/openejb/test/stateless/BasicStatelessLocalTestClient.java - copied, changed from r449182, incubator/openejb/trunk/openejb3/openejb-itests/src/main/java/org/openejb/test/stateless/BasicStatelessTestLocalClient.java Removed: incubator/openejb/trunk/openejb3/openejb-itests/src/main/java/org/openejb/test/stateless/BasicStatelessTestLocalClient.java Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/openejb/util/Index.java incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.openejb/spring.xml incubator/openejb/trunk/openejb3/openejb-itests/src/main/java/org/openejb/test/stateful/BasicStatefulTestClient.java incubator/openejb/trunk/openejb3/openejb-itests/src/main/java/org/openejb/test/stateful/StatefulLocalTestSuite.java incubator/openejb/trunk/openejb3/openejb-itests/src/main/java/org/openejb/test/stateless/StatelessLocalTestSuite.java incubator/openejb/trunk/openejb3/openejb-itests/src/main/java/org/openejb/test/stateless/StatelessPojoLocalJndiTests.java incubator/openejb/trunk/openejb3/openejb-itests/src/main/java/org/openejb/test/stateless/StatelessTestSuite.java incubator/openejb/trunk/openejb3/openejb-itests/src/main/resources/META-INF/ejb-jar.xml Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/openejb/util/Index.java URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/openejb/util/Index.java?view=diff&rev=449211&r1=449210&r2=449211 ============================================================================== --- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/openejb/util/Index.java (original) +++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/openejb/util/Index.java Sat Sep 23 02:55:32 2006 @@ -123,7 +123,7 @@ public V put(K key, V value) { int i = indexOf((K) key); if (i < 0) { - throw new IllegalArgumentException("Index does not contain this key and new entries can not be added: " + (K) key); + throw new IllegalArgumentException("Index does not contain this key and new entries cannot be added: " + (K) key); } IndexEntry<K,V> entry = entries[i]; @@ -226,7 +226,7 @@ } public void remove() { - throw new UnsupportedOperationException("Index entries can not be removed"); + throw new UnsupportedOperationException("Index entries cannot be removed"); } }; } @@ -263,7 +263,7 @@ } public void remove() { - throw new UnsupportedOperationException("Index entries can not be removed"); + throw new UnsupportedOperationException("Index entries cannot be removed"); } } @@ -292,8 +292,8 @@ entries[index].setValue((V) o); } - public void add(Object o) { - throw new UnsupportedOperationException("Entries can not be added to a Index"); + public void add(E o) { + throw new UnsupportedOperationException("Entries cannot be added to a Index"); } } Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.openejb/spring.xml URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.openejb/spring.xml?view=diff&rev=449211&r1=449210&r2=449211 ============================================================================== --- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.openejb/spring.xml (original) +++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.openejb/spring.xml Sat Sep 23 02:55:32 2006 @@ -1,4 +1,24 @@ -<?xml version="1.0" encoding="UTF-8" ?> +<?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +--> + +<!-- $Rev$ $Date$ --> <!--<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">--> <beans xmlns:o="http://openejb.org/schemas/core"> @@ -442,6 +462,8 @@ <o:statefulDeployment id="client/tests/stateful/BasicStatefulPojoHome" homeInterface="org.openejb.test.stateful.BasicStatefulHome" remoteInterface="org.openejb.test.stateful.BasicStatefulObject" + localHomeInterface="org.openejb.test.stateful.BasicStatefulLocalHome" + localInterface="org.openejb.test.stateful.BasicStatefulLocalObject" beanClass="org.openejb.test.stateful.BasicStatefulPojoBean" jarPath="../../../../openejb-itests/target/classes/" classLoader="#classLoader" transactionManager="#transactionManager" assembly="#assembly"> Modified: incubator/openejb/trunk/openejb3/openejb-itests/src/main/java/org/openejb/test/stateful/BasicStatefulTestClient.java URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/openejb-itests/src/main/java/org/openejb/test/stateful/BasicStatefulTestClient.java?view=diff&rev=449211&r1=449210&r2=449211 ============================================================================== --- incubator/openejb/trunk/openejb3/openejb-itests/src/main/java/org/openejb/test/stateful/BasicStatefulTestClient.java (original) +++ incubator/openejb/trunk/openejb3/openejb-itests/src/main/java/org/openejb/test/stateful/BasicStatefulTestClient.java Sat Sep 23 02:55:32 2006 @@ -1,11 +1,29 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.openejb.test.stateful; /** * * @author <a href="mailto:yaguilar@example.com">David Blevins</a> * @author <a href="mailto:yaguilar@example.com">Richard Monson-Haefel</a> + * + * @version $Rev$ $Date$ */ -public abstract class BasicStatefulTestClient extends StatefulTestClient{ +public abstract class BasicStatefulTestClient extends StatefulTestClient { protected BasicStatefulHome ejbHome; protected BasicStatefulObject ejbObject; Modified: incubator/openejb/trunk/openejb3/openejb-itests/src/main/java/org/openejb/test/stateful/StatefulLocalTestSuite.java URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/openejb-itests/src/main/java/org/openejb/test/stateful/StatefulLocalTestSuite.java?view=diff&rev=449211&r1=449210&r2=449211 ============================================================================== --- incubator/openejb/trunk/openejb3/openejb-itests/src/main/java/org/openejb/test/stateful/StatefulLocalTestSuite.java (original) +++ incubator/openejb/trunk/openejb3/openejb-itests/src/main/java/org/openejb/test/stateful/StatefulLocalTestSuite.java Sat Sep 23 02:55:32 2006 @@ -1,18 +1,18 @@ /** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * - * Copyright 2006 The Apache Software Foundation + * http://www.apache.org/licenses/LICENSE-2.0 * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package org.openejb.test.stateful; @@ -20,9 +20,10 @@ import junit.framework.TestSuite; /** - * * @author <a href="mailto:yaguilar@example.com">David Blevins</a> * @author <a href="mailto:yaguilar@example.com">Richard Monson-Haefel</a> + * + * @version $Rev$ $Date$ */ public class StatefulLocalTestSuite extends junit.framework.TestCase{ @@ -33,7 +34,7 @@ public static Test suite() { TestSuite suite = new TestSuite(); suite.addTest(new StatefulJndiTests()); - suite.addTest(new StatefulPojoRemoteJndiTests()); + suite.addTest(new StatefulPojoLocalJndiTests()); suite.addTest(new StatefulHomeIntfcTests()); suite.addTest(new StatefulEjbHomeTests()); suite.addTest(new StatefulEjbObjectTests()); Copied: incubator/openejb/trunk/openejb3/openejb-itests/src/main/java/org/openejb/test/stateless/BasicStatelessLocalTestClient.java (from r449182, incubator/openejb/trunk/openejb3/openejb-itests/src/main/java/org/openejb/test/stateless/BasicStatelessTestLocalClient.java) URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/openejb-itests/src/main/java/org/openejb/test/stateless/BasicStatelessLocalTestClient.java?view=diff&rev=449211&p1=incubator/openejb/trunk/openejb3/openejb-itests/src/main/java/org/openejb/test/stateless/BasicStatelessTestLocalClient.java&r1=449182&p2=incubator/openejb/trunk/openejb3/openejb-itests/src/main/java/org/openejb/test/stateless/BasicStatelessLocalTestClient.java&r2=449211 ============================================================================== --- incubator/openejb/trunk/openejb3/openejb-itests/src/main/java/org/openejb/test/stateless/BasicStatelessTestLocalClient.java (original) +++ incubator/openejb/trunk/openejb3/openejb-itests/src/main/java/org/openejb/test/stateless/BasicStatelessLocalTestClient.java Sat Sep 23 02:55:32 2006 @@ -1,16 +1,34 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.openejb.test.stateless; /** - * * @author <a href="mailto:yaguilar@example.com">David Blevins</a> * @author <a href="mailto:yaguilar@example.com">Richard Monson-Haefel</a> + * @author <a href="mailto:yaguilar@example.com">Mohammad Nour El-Din</a> + * + * @version $Rev$ $Date$ */ -public abstract class BasicStatelessTestLocalClient extends StatelessTestClient { - +public abstract class BasicStatelessLocalTestClient extends StatelessTestClient { + protected BasicStatelessLocalHome ejbLocalHome; protected BasicStatelessLocalObject ejbLocalObject; - public BasicStatelessTestLocalClient(String name){ + public BasicStatelessLocalTestClient(String name){ super(name); } } Modified: incubator/openejb/trunk/openejb3/openejb-itests/src/main/java/org/openejb/test/stateless/StatelessLocalTestSuite.java URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/openejb-itests/src/main/java/org/openejb/test/stateless/StatelessLocalTestSuite.java?view=diff&rev=449211&r1=449210&r2=449211 ============================================================================== --- incubator/openejb/trunk/openejb3/openejb-itests/src/main/java/org/openejb/test/stateless/StatelessLocalTestSuite.java (original) +++ incubator/openejb/trunk/openejb3/openejb-itests/src/main/java/org/openejb/test/stateless/StatelessLocalTestSuite.java Sat Sep 23 02:55:32 2006 @@ -1,11 +1,29 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.openejb.test.stateless; import junit.framework.TestSuite; /** - * * @author <a href="mailto:yaguilar@example.com">David Blevins</a> * @author <a href="mailto:yaguilar@example.com">Richard Monson-Haefel</a> + * @author <a href="mailto:yaguilar@example.com">Mohammad Nour El-Din</a> + * + * @version $Rev$ $Date$ */ public class StatelessLocalTestSuite extends junit.framework.TestCase{ @@ -19,6 +37,7 @@ suite.addTest(new StatelessPojoRemoteJndiTests()); suite.addTest(new StatelessPojoLocalJndiTests()); suite.addTest(new StatelessHomeIntfcTests()); + suite.addTest(new StatelessPojoLocalHomeIntfcTests()); suite.addTest(new StatelessEjbHomeTests() ); suite.addTest(new StatelessEjbObjectTests()); suite.addTest(new StatelessRemoteIntfcTests()); Modified: incubator/openejb/trunk/openejb3/openejb-itests/src/main/java/org/openejb/test/stateless/StatelessPojoLocalJndiTests.java URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/openejb-itests/src/main/java/org/openejb/test/stateless/StatelessPojoLocalJndiTests.java?view=diff&rev=449211&r1=449210&r2=449211 ============================================================================== --- incubator/openejb/trunk/openejb3/openejb-itests/src/main/java/org/openejb/test/stateless/StatelessPojoLocalJndiTests.java (original) +++ incubator/openejb/trunk/openejb3/openejb-itests/src/main/java/org/openejb/test/stateless/StatelessPojoLocalJndiTests.java Sat Sep 23 02:55:32 2006 @@ -1,30 +1,32 @@ /** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * - * Copyright 2006 The Apache Software Foundation + * http://www.apache.org/licenses/LICENSE-2.0 * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package org.openejb.test.stateless; /** * @author <a href="mailto:yaguilar@example.com">David Blevins</a> * @author <a href="mailto:yaguilar@example.com">Richard Monson-Haefel</a> + * + * @version $Rev$ $Date$ */ -public class StatelessPojoLocalJndiTests extends BasicStatelessTestLocalClient { +public class StatelessPojoLocalJndiTests extends BasicStatelessLocalTestClient { public StatelessPojoLocalJndiTests(){ - super("JNDI."); + super("LocalJNDI."); } public void test01_initialContext(){ @@ -39,7 +41,7 @@ try{ // Here we use the Java casting as what is done while looking-up a local bean ejbLocalHome = (BasicStatelessLocalHome) initialContext.lookup("client/tests/stateless/BasicStatelessPojoHomeLocal"); - assertNotNull("The EJBHome is null", ejbLocalHome); + assertNotNull("The EJBLocalHome is null", ejbLocalHome); } catch (Exception e){ fail("Received Exception "+e.getClass()+ " : "+e.getMessage()); } Modified: incubator/openejb/trunk/openejb3/openejb-itests/src/main/java/org/openejb/test/stateless/StatelessTestSuite.java URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/openejb-itests/src/main/java/org/openejb/test/stateless/StatelessTestSuite.java?view=diff&rev=449211&r1=449210&r2=449211 ============================================================================== --- incubator/openejb/trunk/openejb3/openejb-itests/src/main/java/org/openejb/test/stateless/StatelessTestSuite.java (original) +++ incubator/openejb/trunk/openejb3/openejb-itests/src/main/java/org/openejb/test/stateless/StatelessTestSuite.java Sat Sep 23 02:55:32 2006 @@ -1,11 +1,28 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.openejb.test.stateless; import junit.framework.TestSuite; /** - * * @author <a href="mailto:yaguilar@example.com">David Blevins</a> * @author <a href="mailto:yaguilar@example.com">Richard Monson-Haefel</a> + * + * @version $Rev$ $Date$ */ public class StatelessTestSuite extends junit.framework.TestCase{ @@ -18,6 +35,7 @@ suite.addTest(new StatelessJndiTests()); suite.addTest(new StatelessPojoRemoteJndiTests()); suite.addTest(new StatelessHomeIntfcTests()); + suite.addTest(new StatelessPojoHomeIntfcTests()); suite.addTest(new StatelessEjbHomeTests() ); suite.addTest(new StatelessEjbObjectTests()); suite.addTest(new StatelessRemoteIntfcTests()); Modified: incubator/openejb/trunk/openejb3/openejb-itests/src/main/resources/META-INF/ejb-jar.xml URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/openejb-itests/src/main/resources/META-INF/ejb-jar.xml?view=diff&rev=449211&r1=449210&r2=449211 ============================================================================== --- incubator/openejb/trunk/openejb3/openejb-itests/src/main/resources/META-INF/ejb-jar.xml (original) +++ incubator/openejb/trunk/openejb3/openejb-itests/src/main/resources/META-INF/ejb-jar.xml Sat Sep 23 02:55:32 2006 @@ -1,4 +1,25 @@ -<?xml version="1.0" encoding="US-ASCII"?> +<?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +--> + +<!-- $Rev$ $Date$ --> + <ejb-jar xmlns="http://java.sun.com/xml/ns/javaee" version="3.0" metadata-complete="true"> <description> This ejb-jar file contains assembled enterprise beans that are @@ -37,9 +58,7 @@ <reentrant>False</reentrant> <primkey-field>primaryKey</primkey-field> <resource-ref> - <description> - This is a reference to a JDBC database. - </description> + <description>This is a reference to a JDBC database.</description> <res-ref-name>jdbc/basic/entityDatabase</res-ref-name> <res-type>javax.sql.DataSource</res-type> <res-auth>Container</res-auth> @@ -227,19 +246,21 @@ </security-role-ref> </session> - <!-- + <!-- ######################################################## ID: client/tests/stateful/BasicStatefulPojoHome ######################################################## --> <session> - <description>A basic stateful session pojo bean with contianer-managed - transaction demarcation. + <description> + A basic stateful session pojo bean with container-managed transaction demarcation. </description> <ejb-name>BasicStatefulPojoBean</ejb-name> <home>org.openejb.test.stateful.BasicStatefulHome</home> <remote>org.openejb.test.stateful.BasicStatefulObject</remote> + <local-home>org.openejb.test.stateful.BasicStatefulLocalHome</local-home> + <local>org.openejb.test.stateful.BasicStatefulLocalObject</local> <ejb-class>org.openejb.test.stateful.BasicStatefulPojoBean</ejb-class> <session-type>Stateful</session-type> <transaction-type>Container</transaction-type> @@ -247,8 +268,8 @@ <role-name>TheMan</role-name> <role-link>Executive</role-link> </security-role-ref> - </session> - + </session> + <!-- ######################################################## ID: client/tests/stateful/BeanManagedBasicStatefulHome From openejb-commits-return-yaguilar@example.com Sat Sep 23 10:11:23 2006 Return-Path: <openejb-commits-return-yaguilar@example.com> Delivered-To: yaguilar@example.com Received: (qmail 93653 invoked from network); 23 Sep 2006 10:11:22 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 23 Sep 2006 10:11:22 -0000 Received: (qmail 88267 invoked by uid 500); 23 Sep 2006 10:11:22 -0000 Delivered-To: yaguilar@example.com Received: (qmail 88199 invoked by uid 500); 23 Sep 2006 10:11:22 -0000 Mailing-List: contact yaguilar@example.com; run by ezmlm Precedence: bulk List-Help: <mailto:yaguilar@example.com> List-Unsubscribe: <mailto:yaguilar@example.com> List-Post: <mailto:yaguilar@example.com> List-Id: <openejb-commits.incubator.apache.org> Reply-To: yaguilar@example.com Delivered-To: mailing list yaguilar@example.com Received: (qmail 88182 invoked by uid 99); 23 Sep 2006 10:11:21 -0000 Received: from idunn.apache.osuosl.org (HELO idunn.apache.osuosl.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 23 Sep 2006 03:11:21 -0700 Authentication-Results: idunn.apache.osuosl.org yaguilar@example.com; spf=permerror X-ASF-Spam-Status: No, hits=-9.4 required=5.0 tests=ALL_TRUSTED,NO_REAL_NAME Received-SPF: error (idunn.apache.osuosl.org: domain apache.org from 83.161.120.155 cause and error) Received: from [83.161.120.155] ([83.161.120.155:53898] helo=eris.apache.org) by idunn.apache.osuosl.org (ecelerity 83.161.120.155 r(12930)) with ESMTP id ED/76-27820-34805154 for <yaguilar@example.com>; Sat, 23 Sep 2006 03:11:16 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 62E781A9823; Sat, 23 Sep 2006 03:11:13 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r449212 [4/6] - in /incubator/openejb/trunk/openejb3: ./ assembly/ assembly/openejb-itests-webapp/ assembly/openejb-itests-webapp/src/main/assembly/ assembly/openejb-itests-webapp/src/main/webapp/META-INF/ assembly/openejb-itests-webapp/src... Date: Sat, 23 Sep 2006 10:11:03 -0000 To: yaguilar@example.com From: yaguilar@example.com X-Mailer: svnmailer-1.1.0 Message-Id: <yaguilar@example.com> X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Propchange: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/openejb/entity/cmp/SqlPrimaryKeyGenerator.java ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords Sat Sep 23 03:10:30 2006 @@ -1 +1 @@ -Author Date Id Revision +Date Rev Author Id Revision HeadURL Propchange: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/openejb/entity/cmp/TranqlCmpField.java ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords Sat Sep 23 03:10:30 2006 @@ -1 +1 @@ -Author Date Id Revision +Date Rev Author Id Revision HeadURL Propchange: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/openejb/entity/cmp/TranqlCollectionValuedQuery.java ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords Sat Sep 23 03:10:30 2006 @@ -1 +1 @@ -Author Date Id Revision +Date Rev Author Id Revision HeadURL Propchange: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/openejb/entity/cmp/TranqlCommandBuilder.java ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords Sat Sep 23 03:10:30 2006 @@ -1 +1 @@ -Author Date Id Revision +Date Rev Author Id Revision HeadURL Propchange: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/openejb/entity/cmp/TranqlEJBProxyFactory.java ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords Sat Sep 23 03:10:30 2006 @@ -1 +1 @@ -Author Date Id Revision +Date Rev Author Id Revision HeadURL Propchange: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/openejb/entity/cmp/TranqlEjbCmpEngine.java ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords Sat Sep 23 03:10:30 2006 @@ -1 +1 @@ -Author Date Id Revision +Date Rev Author Id Revision HeadURL Propchange: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/openejb/entity/cmp/TranqlEnumerationValuedQuery.java ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords Sat Sep 23 03:10:30 2006 @@ -1 +1 @@ -Author Date Id Revision +Date Rev Author Id Revision HeadURL Propchange: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/openejb/entity/cmp/TranqlModuleCmpEngine.java ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords Sat Sep 23 03:10:30 2006 @@ -1 +1 @@ -Author Date Id Revision +Date Rev Author Id Revision HeadURL Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/openejb/entity/cmp/TranqlQuery.java URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/openejb/entity/cmp/TranqlQuery.java?view=diff&rev=449212&r1=449211&r2=449212 ============================================================================== --- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/openejb/entity/cmp/TranqlQuery.java (original) +++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/openejb/entity/cmp/TranqlQuery.java Sat Sep 23 03:10:30 2006 @@ -40,7 +40,7 @@ * * Copyright 2005 (C) The OpenEJB Group. All Rights Reserved. * - * $Id: TranqlEjbCmpEngine.java 2465 2006-02-19 06:35:14Z gdamour $ + * $Id$ */ package org.openejb.entity.cmp; @@ -48,7 +48,7 @@ /** - * @version $Revision: 2465 $ $Date: 2006-02-19 17:35:14 +1100 (Sun, 19 Feb 2006) $ + * @version $Revision$ $Date$ */ public class TranqlQuery implements Query { private final org.tranql.dynamicquery.Query query; Propchange: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/openejb/entity/cmp/TranqlQuery.java ------------------------------------------------------------------------------ svn:keywords = Date Rev Author Id Revision HeadURL Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/openejb/entity/cmp/TranqlQueryManager.java URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/openejb/entity/cmp/TranqlQueryManager.java?view=diff&rev=449212&r1=449211&r2=449212 ============================================================================== --- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/openejb/entity/cmp/TranqlQueryManager.java (original) +++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/openejb/entity/cmp/TranqlQueryManager.java Sat Sep 23 03:10:30 2006 @@ -40,7 +40,7 @@ * * Copyright 2005 (C) The OpenEJB Group. All Rights Reserved. * - * $Id: TranqlEjbCmpEngine.java 2465 2006-02-19 06:35:14Z gdamour $ + * $Id$ */ package org.openejb.entity.cmp; @@ -50,7 +50,7 @@ import org.tranql.sql.SQLSchema; /** - * @version $Revision: 2465 $ $Date: 2006-02-19 17:35:14 +1100 (Sun, 19 Feb 2006) $ + * @version $Revision$ $Date$ */ public class TranqlQueryManager implements QueryManager { private final org.tranql.dynamicquery.QueryManager queryManager; Propchange: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/openejb/entity/cmp/TranqlQueryManager.java ------------------------------------------------------------------------------ svn:keywords = Date Rev Author Id Revision HeadURL Propchange: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/openejb/entity/cmp/TranqlSchemaBuilder.java ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords Sat Sep 23 03:10:30 2006 @@ -1 +1 @@ -Author Date Id Revision +Date Rev Author Id Revision HeadURL Propchange: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/openejb/entity/cmp/TranqlSelectQuery.java ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords Sat Sep 23 03:10:30 2006 @@ -1 +1 @@ -Author Date Id Revision +Date Rev Author Id Revision HeadURL Propchange: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/openejb/entity/cmp/TranqlSetValuedQuery.java ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords Sat Sep 23 03:10:30 2006 @@ -1 +1 @@ -Author Date Id Revision +Date Rev Author Id Revision HeadURL Propchange: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/openejb/entity/cmp/TranqlSingleValuedQuery.java ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords Sat Sep 23 03:10:30 2006 @@ -1 +1 @@ -Author Date Id Revision +Date Rev Author Id Revision HeadURL Propchange: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/openejb/entity/cmp/pkgenerator/AutoIncrementTablePrimaryKeyGeneratorWrapper.java ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords Sat Sep 23 03:10:30 2006 @@ -1 +1 @@ -Author Date Id Revision +Date Rev Author Id Revision HeadURL Propchange: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/openejb/entity/cmp/pkgenerator/SQLPrimaryKeyGeneratorWrapper.java ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords Sat Sep 23 03:10:30 2006 @@ -1 +1 @@ -Author Date Id Revision +Date Rev Author Id Revision HeadURL Propchange: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/openejb/entity/cmp/pkgenerator/SequenceTablePrimaryKeyGeneratorWrapper.java ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords Sat Sep 23 03:10:30 2006 @@ -1 +1 @@ -Author Date Id Revision +Date Rev Author Id Revision HeadURL Propchange: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/openejb/naming/ComponentContextInterceptor.java ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords Sat Sep 23 03:10:30 2006 @@ -1 +1 @@ -Author Date Id Revision +Date Rev Author Id Revision HeadURL Propchange: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/openejb/naming/ConnectionFactoryReference.java ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords Sat Sep 23 03:10:30 2006 @@ -1 +1 @@ -Author Date Id Revision +Date Rev Author Id Revision HeadURL Propchange: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/openejb/naming/GlobalInitialContextFactory.java ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords Sat Sep 23 03:10:30 2006 @@ -1 +1 @@ -Author Date Id Revision +Date Rev Author Id Revision HeadURL Propchange: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/openejb/naming/IvmContext.java ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords Sat Sep 23 03:10:30 2006 @@ -1 +1 @@ -Author Date Id Revision +Date Rev Author Id Revision HeadURL Propchange: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/openejb/naming/LinkedReference.java ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords Sat Sep 23 03:10:30 2006 @@ -1 +1 @@ -Author Date Id Revision +Date Rev Author Id Revision HeadURL Propchange: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/openejb/naming/Reference.java ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords Sat Sep 23 03:10:30 2006 @@ -1 +1 @@ -Author Date Id Revision +Date Rev Author Id Revision HeadURL Propchange: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/openejb/proxy/BaseEJB.java ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords Sat Sep 23 03:10:30 2006 @@ -1 +1 @@ -Author Date Id Revision +Date Rev Author Id Revision HeadURL Propchange: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/openejb/proxy/CglibEJBProxyFactory.java ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords Sat Sep 23 03:10:30 2006 @@ -1 +1 @@ -Author Date Id Revision +Date Rev Author Id Revision HeadURL Propchange: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/openejb/proxy/ContainerHandler.java ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords Sat Sep 23 03:10:30 2006 @@ -1 +1 @@ -Author Date Id Revision +Date Rev Author Id Revision HeadURL Propchange: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/openejb/proxy/EJBHomeImpl.java ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords Sat Sep 23 03:10:30 2006 @@ -1 +1 @@ -Author Date Id Revision +Date Rev Author Id Revision HeadURL Propchange: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/openejb/proxy/EJBInterceptor.java ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords Sat Sep 23 03:10:30 2006 @@ -1 +1 @@ -Author Date Id Revision +Date Rev Author Id Revision HeadURL Propchange: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/openejb/proxy/EJBLocalHomeImpl.java ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords Sat Sep 23 03:10:30 2006 @@ -1 +1 @@ -Author Date Id Revision +Date Rev Author Id Revision HeadURL Propchange: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/openejb/proxy/EJBLocalObjectImpl.java ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords Sat Sep 23 03:10:30 2006 @@ -1 +1 @@ -Author Date Id Revision +Date Rev Author Id Revision HeadURL Propchange: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/openejb/proxy/EJBMetaDataImpl.java ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords Sat Sep 23 03:10:30 2006 @@ -1 +1 @@ -Author Date Id Revision +Date Rev Author Id Revision HeadURL Propchange: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/openejb/proxy/EJBMethodInterceptor.java ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords Sat Sep 23 03:10:30 2006 @@ -1 +1 @@ -Author Date Id Revision +Date Rev Author Id Revision HeadURL Propchange: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/openejb/proxy/EJBObjectImpl.java ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords Sat Sep 23 03:10:30 2006 @@ -1 +1 @@ -Author Date Id Revision +Date Rev Author Id Revision HeadURL Propchange: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/openejb/proxy/EJBProxyFactory.java ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords Sat Sep 23 03:10:30 2006 @@ -1 +1 @@ -Author Date Id Revision +Date Rev Author Id Revision HeadURL Propchange: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/openejb/proxy/EJBProxyHelper.java ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords Sat Sep 23 03:10:30 2006 @@ -1 +1 @@ -Author Date Id Revision +Date Rev Author Id Revision HeadURL Propchange: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/openejb/proxy/EJBProxyReference.java ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords Sat Sep 23 03:10:30 2006 @@ -1 +1 @@ -Author Date Id Revision +Date Rev Author Id Revision HeadURL Propchange: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/openejb/proxy/EntityEJBHome.java ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords Sat Sep 23 03:10:30 2006 @@ -1 +1 @@ -Author Date Id Revision +Date Rev Author Id Revision HeadURL Propchange: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/openejb/proxy/EntityEJBLocalHome.java ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords Sat Sep 23 03:10:30 2006 @@ -1 +1 @@ -Author Date Id Revision +Date Rev Author Id Revision HeadURL Propchange: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/openejb/proxy/EntityEJBLocalObject.java ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords Sat Sep 23 03:10:30 2006 @@ -1 +1 @@ -Author Date Id Revision +Date Rev Author Id Revision HeadURL Propchange: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/openejb/proxy/EntityEJBObject.java ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords Sat Sep 23 03:10:30 2006 @@ -1 +1 @@ -Author Date Id Revision +Date Rev Author Id Revision HeadURL Propchange: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/openejb/proxy/HandleImpl.java ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords Sat Sep 23 03:10:30 2006 @@ -1 +1 @@ -Author Date
{'source': 'Apache Software Foundation Public Mail Archives'}