Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 9186 invoked from network); 5 Nov 2010 09:24:16 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 5 Nov 2010 09:24:16 -0000 Received: (qmail 30406 invoked by uid 500); 5 Nov 2010 09:24:47 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 30278 invoked by uid 500); 5 Nov 2010 09:24:45 -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 30270 invoked by uid 99); 5 Nov 2010 09:24:45 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 05 Nov 2010 09:24:45 +0000 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, 05 Nov 2010 09:24:42 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 7AA9923888EA; Fri, 5 Nov 2010 09:23:28 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1031487 - /geronimo/server/branches/2.1/plugins/j2ee/geronimo-j2ee-schema/src/main/java/org/apache/geronimo/schema/SchemaConversionUtils.java Date: Fri, 05 Nov 2010 09:23:28 -0000 To: scm@geronimo.apache.org From: rwonly@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20101105092328.7AA9923888EA@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rwonly Date: Fri Nov 5 09:23:28 2010 New Revision: 1031487 URL: http://svn.apache.org/viewvc?rev=1031487&view=rev Log: GERONIMO-5672 Overriding an env-entry in geronimo-web.xml fails with a DeploymentException (Thanks Viola for the patch!) Modified: geronimo/server/branches/2.1/plugins/j2ee/geronimo-j2ee-schema/src/main/java/org/apache/geronimo/schema/SchemaConversionUtils.java Modified: geronimo/server/branches/2.1/plugins/j2ee/geronimo-j2ee-schema/src/main/java/org/apache/geronimo/schema/SchemaConversionUtils.java URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/j2ee/geronimo-j2ee-schema/src/main/java/org/apache/geronimo/schema/SchemaConversionUtils.java?rev=1031487&r1=1031486&r2=1031487&view=diff ============================================================================== --- geronimo/server/branches/2.1/plugins/j2ee/geronimo-j2ee-schema/src/main/java/org/apache/geronimo/schema/SchemaConversionUtils.java (original) +++ geronimo/server/branches/2.1/plugins/j2ee/geronimo-j2ee-schema/src/main/java/org/apache/geronimo/schema/SchemaConversionUtils.java Fri Nov 5 09:23:28 2010 @@ -56,6 +56,7 @@ public class SchemaConversionUtils { GERONIMO_SCHEMA_CONVERSIONS.put("workmanager", new NamespaceElementConverter(GERONIMO_NAMING_NAMESPACE)); GERONIMO_SCHEMA_CONVERSIONS.put("resource-adapter", new NamespaceElementConverter(GERONIMO_NAMING_NAMESPACE)); GERONIMO_SCHEMA_CONVERSIONS.put("web-container", new NamespaceElementConverter(GERONIMO_NAMING_NAMESPACE)); + GERONIMO_SCHEMA_CONVERSIONS.put("env-entry", new NamespaceElementConverter(GERONIMO_NAMING_NAMESPACE)); GERONIMO_SCHEMA_CONVERSIONS.put("security", new SecurityElementConverter()); GERONIMO_SCHEMA_CONVERSIONS.put("default-subject", new NamespaceElementConverter(GERONIMO_SECURITY_NAMESPACE));