Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 89382 invoked from network); 23 Jan 2009 04:56:53 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 23 Jan 2009 04:56:53 -0000 Received: (qmail 57560 invoked by uid 500); 23 Jan 2009 00:56:53 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 57551 invoked by uid 500); 23 Jan 2009 00:56:53 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 57542 invoked by uid 99); 23 Jan 2009 00:56:53 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 22 Jan 2009 16:56:53 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 23 Jan 2009 00:56:53 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id C31A723888A0; Thu, 22 Jan 2009 16:56:32 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r736877 - in /geronimo/server/branches/2.1: plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/ testsupport/test-deployment-j2ee_1.4/test-ejb-j2ee_1.4/src/main/resources/META-INF/ Date: Fri, 23 Jan 2009 00:56:32 -0000 To: scm@geronimo.apache.org From: djencks@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090123005632.C31A723888A0@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: djencks Date: Thu Jan 22 16:56:32 2009 New Revision: 736877 URL: http://svn.apache.org/viewvc?rev=736877&view=rev Log: GERONIMO-4521 Prevent deployment of an ejb app with security constraints when there is no corresponding geronimo security configuration Modified: geronimo/server/branches/2.1/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbDeploymentBuilder.java geronimo/server/branches/2.1/testsupport/test-deployment-j2ee_1.4/test-ejb-j2ee_1.4/src/main/resources/META-INF/ejb-jar.xml Modified: geronimo/server/branches/2.1/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbDeploymentBuilder.java URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbDeploymentBuilder.java?rev=736877&r1=736876&r2=736877&view=diff ============================================================================== --- geronimo/server/branches/2.1/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbDeploymentBuilder.java (original) +++ geronimo/server/branches/2.1/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbDeploymentBuilder.java Thu Jan 22 16:56:32 2009 @@ -62,6 +62,8 @@ import org.apache.openejb.jee.SecurityIdentity; import org.apache.openejb.jee.SessionBean; import org.apache.openejb.jee.SessionType; +import org.apache.openejb.jee.AssemblyDescriptor; +import org.apache.openejb.jee.MethodPermission; import org.apache.openejb.jee.oejb3.EjbDeployment; import org.apache.xbean.finder.ClassFinder; import org.apache.xmlbeans.XmlObject; @@ -168,6 +170,10 @@ } public ComponentPermissions buildComponentPermissions() throws DeploymentException { + List methodPermissions = ejbModule.getEjbJar().getAssemblyDescriptor().getMethodPermission(); + if (earContext.getSecurityConfiguration() == null && methodPermissions.size() > 0) { + throw new DeploymentException("Ejb app has method permissions but no security configuration supplied in geronimo plan"); + } ComponentPermissions componentPermissions = new ComponentPermissions(new Permissions(), new Permissions(), new HashMap()); for (EnterpriseBean enterpriseBean : ejbModule.getEjbJar().getEnterpriseBeans()) { addSecurityData(enterpriseBean, componentPermissions); Modified: geronimo/server/branches/2.1/testsupport/test-deployment-j2ee_1.4/test-ejb-j2ee_1.4/src/main/resources/META-INF/ejb-jar.xml URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsupport/test-deployment-j2ee_1.4/test-ejb-j2ee_1.4/src/main/resources/META-INF/ejb-jar.xml?rev=736877&r1=736876&r2=736877&view=diff ============================================================================== --- geronimo/server/branches/2.1/testsupport/test-deployment-j2ee_1.4/test-ejb-j2ee_1.4/src/main/resources/META-INF/ejb-jar.xml (original) +++ geronimo/server/branches/2.1/testsupport/test-deployment-j2ee_1.4/test-ejb-j2ee_1.4/src/main/resources/META-INF/ejb-jar.xml Thu Jan 22 16:56:32 2009 @@ -79,6 +79,7 @@ + Transaction attributes for 'SimpleStatelessSession' methods