Return-Path: Delivered-To: apmail-logging-general-archive@www.apache.org Received: (qmail 32242 invoked from network); 10 Aug 2007 05:44:08 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 10 Aug 2007 05:44:08 -0000 Received: (qmail 26761 invoked by uid 500); 10 Aug 2007 05:44:07 -0000 Delivered-To: apmail-logging-general-archive@logging.apache.org Received: (qmail 26722 invoked by uid 500); 10 Aug 2007 05:44:07 -0000 Mailing-List: contact general-help@logging.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: "Logging General" List-Id: Delivered-To: mailing list general@logging.apache.org Received: (qmail 26711 invoked by uid 99); 10 Aug 2007 05:44:06 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 09 Aug 2007 22:44:06 -0700 X-ASF-Spam-Status: No, hits=-98.0 required=10.0 tests=ALL_TRUSTED,URIBL_BLACK 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; Fri, 10 Aug 2007 05:44:05 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 4F61B1A981A; Thu, 9 Aug 2007 22:43:42 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r564471 - in /logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw: FileLoadAction.java LogUI.java NoReceiversWarningPanel.java help/HelpManager.java plugins/PluginClassLoaderFactory.java Date: Fri, 10 Aug 2007 05:43:42 -0000 To: general@logging.apache.org From: sdeboy@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070810054342.4F61B1A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: sdeboy Date: Thu Aug 9 22:43:40 2007 New Revision: 564471 URL: http://svn.apache.org/viewvc?view=rev&rev=564471 Log: Imlemented fix for http://issues.apache.org/bugzilla/show_bug.cgi?id=41132 - Chainsaw cannot open log files if file name contains illegal URL characters like '#' (applied patch provided by Kamalakar) Modified: logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/FileLoadAction.java logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/LogUI.java logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/NoReceiversWarningPanel.java logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/help/HelpManager.java logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/plugins/PluginClassLoaderFactory.java Modified: logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/FileLoadAction.java URL: http://svn.apache.org/viewvc/logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/FileLoadAction.java?view=diff&rev=564471&r1=564470&r2=564471 ============================================================================== --- logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/FileLoadAction.java (original) +++ logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/FileLoadAction.java Thu Aug 9 22:43:40 2007 @@ -108,7 +108,7 @@ File selectedFile = chooser.getSelectedFile(); try { - url = selectedFile.toURL(); + url = selectedFile.toURI().toURL(); name = selectedFile.getName(); } catch (Exception ex) { // TODO: handle exception Modified: logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/LogUI.java URL: http://svn.apache.org/viewvc/logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/LogUI.java?view=diff&rev=564471&r1=564470&r2=564471 ============================================================================== --- logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/LogUI.java (original) +++ logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/LogUI.java Thu Aug 9 22:43:40 2007 @@ -441,7 +441,7 @@ try { getStatusBar().setMessage("Loading " + file.getAbsolutePath() + "..."); FileLoadAction.importURL(handler, decoder, file - .getName(), file.toURL()); + .getName(), file.toURI().toURL()); } catch (Exception e) { String errorMsg = "Failed to import a file"; logger.error(errorMsg, e); Modified: logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/NoReceiversWarningPanel.java URL: http://svn.apache.org/viewvc/logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/NoReceiversWarningPanel.java?view=diff&rev=564471&r1=564470&r2=564471 ============================================================================== --- logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/NoReceiversWarningPanel.java (original) +++ logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/NoReceiversWarningPanel.java Thu Aug 9 22:43:40 2007 @@ -481,7 +481,7 @@ return null; } - return chooser.getSelectedFile().toURL(); + return chooser.getSelectedFile().toURI().toURL(); } /** Modified: logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/help/HelpManager.java URL: http://svn.apache.org/viewvc/logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/help/HelpManager.java?view=diff&rev=564471&r1=564470&r2=564471 ============================================================================== --- logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/help/HelpManager.java (original) +++ logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/help/HelpManager.java Thu Aug 9 22:43:40 2007 @@ -61,7 +61,7 @@ }else if(new File("docs/api").exists()) { File dir = new File("docs/api"); logger.info("Detected Local JavaDocs at " + dir.toString()); - helpLocator.installLocator(dir.toURL()); + helpLocator.installLocator(dir.toURI().toURL()); } else { logger.warn("Could not find any local JavaDocs, you might want to consider running 'ant javadoc'. The release version will be able to access Javadocs from the Apache website."); } Modified: logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/plugins/PluginClassLoaderFactory.java URL: http://svn.apache.org/viewvc/logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/plugins/PluginClassLoaderFactory.java?view=diff&rev=564471&r1=564470&r2=564471 ============================================================================== --- logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/plugins/PluginClassLoaderFactory.java (original) +++ logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/plugins/PluginClassLoaderFactory.java Thu Aug 9 22:43:40 2007 @@ -72,7 +72,7 @@ List list = new ArrayList(); // add the plugin directory as a resource loading path try { - list.add(pluginDirectory.toURL()); + list.add(pluginDirectory.toURI().toURL()); } catch (Exception e) { throw new RuntimeException(e.getMessage()); } @@ -81,7 +81,7 @@ String name = strings[i]; File file = new File(pluginDirectory, name); try { - list.add(file.toURL()); + list.add(file.toURI().toURL()); logger.info("Added " + file.getAbsolutePath() + " to Plugin class loader list"); } catch (Exception e) {