Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 59620 invoked from network); 14 Nov 2006 07:26:04 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 14 Nov 2006 07:26:04 -0000 Received: (qmail 4119 invoked by uid 500); 14 Nov 2006 07:26:14 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 3981 invoked by uid 500); 14 Nov 2006 07:26:14 -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 3968 invoked by uid 99); 14 Nov 2006 07:26:14 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 13 Nov 2006 23:26:14 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 13 Nov 2006 23:26:03 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id B9D761A984D; Mon, 13 Nov 2006 23:25:32 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r474682 - /geronimo/server/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/securitymanager/realm/SecurityRealmPortlet.java Date: Tue, 14 Nov 2006 07:25:32 -0000 To: scm@geronimo.apache.org From: vamsic007@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20061114072532.B9D761A984D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: vamsic007 Date: Mon Nov 13 23:25:31 2006 New Revision: 474682 URL: http://svn.apache.org/viewvc?view=rev&rev=474682 Log: GERONIMO-2284 Console DB/JMS and Security Realm naming inconsistent. * Changes groupId from "console" to "console.realm" * replaces any slashes in the artifactId with "%2F" Modified: geronimo/server/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/securitymanager/realm/SecurityRealmPortlet.java Modified: geronimo/server/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/securitymanager/realm/SecurityRealmPortlet.java URL: http://svn.apache.org/viewvc/geronimo/server/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/securitymanager/realm/SecurityRealmPortlet.java?view=diff&rev=474682&r1=474681&r2=474682 ============================================================================== --- geronimo/server/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/securitymanager/realm/SecurityRealmPortlet.java (original) +++ geronimo/server/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/securitymanager/realm/SecurityRealmPortlet.java Mon Nov 13 23:25:31 2006 @@ -337,8 +337,14 @@ ModuleType root = doc.addNewModule(); EnvironmentType environment = root.addNewEnvironment(); ArtifactType configId = environment.addNewModuleId(); - configId.setGroupId("console"); - configId.setArtifactId("realm-" + data.getName()); + configId.setGroupId("console.realm"); + String artifactId = data.getName(); + if(artifactId.indexOf('/') != -1) { + // slash in artifact-id results in invalid configuration-id and leads to deployment errors. + // Note: 0x002F = '/' + artifactId = artifactId.replaceAll("/", "%2F"); + } + configId.setArtifactId(artifactId); configId.setVersion("1.0"); configId.setType("car");