Return-Path: Delivered-To: apmail-cocoon-cvs-archive@www.apache.org Received: (qmail 24310 invoked from network); 19 May 2005 21:22:49 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 19 May 2005 21:22:48 -0000 Received: (qmail 14436 invoked by uid 500); 19 May 2005 21:00:19 -0000 Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org Received: (qmail 14382 invoked by uid 500); 19 May 2005 21:00:19 -0000 Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@cocoon.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@cocoon.apache.org Received: (qmail 14366 invoked by uid 99); 19 May 2005 21:00:19 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Thu, 19 May 2005 13:59:18 -0700 Received: (qmail 90177 invoked by uid 65534); 19 May 2005 20:58:01 -0000 Message-ID: <20050519205801.90176.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Subject: svn commit: r170997 - /cocoon/trunk/src/java/org/apache/cocoon/Cocoon.java Date: Thu, 19 May 2005 20:58:01 -0000 To: cvs@cocoon.apache.org From: vgritsenko@apache.org X-Mailer: svnmailer-1.0.0-dev X-Virus-Checked: Checked X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: vgritsenko Date: Thu May 19 13:58:00 2005 New Revision: 170997 URL: http://svn.apache.org/viewcvs?rev=3D170997&view=3Drev Log: fix bogus InputSource systemId Modified: cocoon/trunk/src/java/org/apache/cocoon/Cocoon.java Modified: cocoon/trunk/src/java/org/apache/cocoon/Cocoon.java URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/= Cocoon.java?rev=3D170997&r1=3D170996&r2=3D170997&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- cocoon/trunk/src/java/org/apache/cocoon/Cocoon.java (original) +++ cocoon/trunk/src/java/org/apache/cocoon/Cocoon.java Thu May 19 13:58:00= 2005 @@ -261,7 +261,7 @@ RoleManager drm =3D null; String userRoles =3D conf.getAttribute("user-roles", ""); if (!"".equals(userRoles)) { - Configuration roleConfig; + Configuration roles; try { org.apache.cocoon.environment.Context context =3D (org.apache.cocoon.environment.Context) this.context.g= et(Constants.CONTEXT_ENVIRONMENT_CONTEXT); @@ -270,16 +270,16 @@ throw new ConfigurationException("User-roles configura= tion '"+userRoles+"' cannot be found."); } is =3D new InputSource(new BufferedInputStream(url.openStr= eam())); - is.setSystemId(this.configurationFile.getURI()); - roleConfig =3D builder.build(is); + is.setSystemId(url.toString()); + roles =3D builder.build(is); } catch (Exception e) { throw new ConfigurationException("Error trying to load use= r-roles configuration", e); } =20 RoleManager urm =3D new RoleManager(drm); ContainerUtil.enableLogging(urm, this.rootLogger.getChildLogge= r("roles").getChildLogger("user")); - ContainerUtil.configure(urm, roleConfig); - roleConfig =3D null; + ContainerUtil.configure(urm, roles); + roles =3D null; drm =3D urm; } =20