cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vgritse...@apache.org
Subject svn commit: r170997 - /cocoon/trunk/src/java/org/apache/cocoon/Cocoon.java
Date Thu, 19 May 2005 20:58:01 GMT
Author: vgritsenko
Date: Thu May 19 13:58:00 2005
New Revision: 170997

URL: http://svn.apache.org/viewcvs?rev=170997&view=rev
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=170997&r1=170996&r2=170997&view=diff
==============================================================================
--- 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 = null;
         String userRoles = conf.getAttribute("user-roles", "");
         if (!"".equals(userRoles)) {
-            Configuration roleConfig;
+            Configuration roles;
             try {
                 org.apache.cocoon.environment.Context context =
                     (org.apache.cocoon.environment.Context) this.context.get(Constants.CONTEXT_ENVIRONMENT_CONTEXT);
@@ -270,16 +270,16 @@
                     throw new ConfigurationException("User-roles configuration '"+userRoles+"'
cannot be found.");
                 }
                 is = new InputSource(new BufferedInputStream(url.openStream()));
-                is.setSystemId(this.configurationFile.getURI());
-                roleConfig = builder.build(is);
+                is.setSystemId(url.toString());
+                roles = builder.build(is);
             } catch (Exception e) {
                 throw new ConfigurationException("Error trying to load user-roles configuration",
e);
             }
 
             RoleManager urm = new RoleManager(drm);
             ContainerUtil.enableLogging(urm, this.rootLogger.getChildLogger("roles").getChildLogger("user"));
-            ContainerUtil.configure(urm, roleConfig);
-            roleConfig = null;
+            ContainerUtil.configure(urm, roles);
+            roles = null;
             drm = urm;
         }
 



Mime
View raw message