Return-Path: Delivered-To: apmail-jakarta-commons-dev-archive@www.apache.org Received: (qmail 92426 invoked from network); 3 Oct 2006 18:13:45 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 3 Oct 2006 18:13:44 -0000 Received: (qmail 37139 invoked by uid 500); 3 Oct 2006 18:13:41 -0000 Delivered-To: apmail-jakarta-commons-dev-archive@jakarta.apache.org Received: (qmail 37052 invoked by uid 500); 3 Oct 2006 18:13:41 -0000 Mailing-List: contact commons-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Help: List-Post: List-Id: "Jakarta Commons Developers List" Reply-To: "Jakarta Commons Developers List" Delivered-To: mailing list commons-dev@jakarta.apache.org Received: (qmail 37041 invoked by uid 500); 3 Oct 2006 18:13:41 -0000 Received: (qmail 37038 invoked by uid 99); 3 Oct 2006 18:13:41 -0000 Received: from idunn.apache.osuosl.org (HELO idunn.apache.osuosl.org) (140.211.166.84) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 03 Oct 2006 11:13:41 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=5.0 tests=ALL_TRUSTED,NO_REAL_NAME Received: from [140.211.166.113] ([140.211.166.113:50484] helo=eris.apache.org) by idunn.apache.osuosl.org (ecelerity 2.1.1.8 r(12930)) with ESMTP id BD/87-08153-358A2254 for ; Tue, 03 Oct 2006 11:13:40 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id C6A8E1A981A; Tue, 3 Oct 2006 11:13:37 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r452588 - in /jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs: ./ impl/ provider/ provider/local/ provider/smb/ provider/url/ Date: Tue, 03 Oct 2006 18:13:37 -0000 To: commons-cvs@jakarta.apache.org From: imario@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20061003181337.C6A8E1A981A@eris.apache.org> X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: imario Date: Tue Oct 3 11:13:36 2006 New Revision: 452588 URL: http://svn.apache.org/viewvc?view=rev&rev=452588 Log: VFS-42: allow to create a "friendly uri" which is one without the password. Instead the system will render "*****" if the original filename contained a password. Modified: jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/FileName.java jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/impl/VirtualFileName.java jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/AbstractFileName.java jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/GenericFileName.java jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/LayeredFileName.java jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/URLFileName.java jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/local/LocalFileName.java jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/local/WindowsFileName.java jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/smb/SmbFileName.java jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/url/UrlFileName.java Modified: jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/FileName.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/FileName.java?view=diff&rev=452588&r1=452587&r2=452588 ============================================================================== --- jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/FileName.java (original) +++ jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/FileName.java Tue Oct 3 11:13:36 2006 @@ -183,4 +183,10 @@ * @return {@link FileType#FOLDER} or {@link FileType#FILE} */ public FileType getType(); + + /** + * returns a "friendly path", this is a path without a password.
+ * This path can not be used to resolve the path again + */ + public String getFriendlyURI(); } Modified: jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/impl/VirtualFileName.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/impl/VirtualFileName.java?view=diff&rev=452588&r1=452587&r2=452588 ============================================================================== --- jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/impl/VirtualFileName.java (original) +++ jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/impl/VirtualFileName.java Tue Oct 3 11:13:36 2006 @@ -37,7 +37,7 @@ return new VirtualFileName(getScheme(), absPath, type); } - protected void appendRootUri(StringBuffer buffer) + protected void appendRootUri(StringBuffer buffer, boolean addPassword) { buffer.append(getScheme()); } Modified: jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/AbstractFileName.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/AbstractFileName.java?view=diff&rev=452588&r1=452587&r2=452588 ============================================================================== --- jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/AbstractFileName.java (original) +++ jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/AbstractFileName.java Tue Oct 3 11:13:36 2006 @@ -124,7 +124,7 @@ * Builds the root URI for this file name. Note that the root URI must not * end with a separator character. */ - protected abstract void appendRootUri(StringBuffer buffer); + protected abstract void appendRootUri(StringBuffer buffer, boolean addPassword); /** * Returns the base name of the file. @@ -236,7 +236,7 @@ protected String createURI() { final StringBuffer buffer = new StringBuffer(); - appendRootUri(buffer); + appendRootUri(buffer, true); buffer.append(getPath()); return buffer.toString(); } @@ -309,7 +309,7 @@ if (rootUri == null) { final StringBuffer buffer = new StringBuffer(); - appendRootUri(buffer); + appendRootUri(buffer, true); buffer.append(SEPARATOR_CHAR); rootUri = buffer.toString().intern(); } @@ -487,5 +487,16 @@ } return true; + } + + /** + * returns a "friendly path", this is a path without a password. + */ + public String getFriendlyURI() + { + final StringBuffer buffer = new StringBuffer(); + appendRootUri(buffer, false); + buffer.append(getPath()); + return buffer.toString(); } } Modified: jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/GenericFileName.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/GenericFileName.java?view=diff&rev=452588&r1=452587&r2=452588 ============================================================================== --- jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/GenericFileName.java (original) +++ jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/GenericFileName.java Tue Oct 3 11:13:36 2006 @@ -117,11 +117,11 @@ /** * Builds the root URI for this file name. */ - protected void appendRootUri(final StringBuffer buffer) + protected void appendRootUri(final StringBuffer buffer, boolean addPassword) { buffer.append(getScheme()); buffer.append("://"); - appendCredentials(buffer); + appendCredentials(buffer, addPassword); buffer.append(hostName); if (port != getDefaultPort()) { @@ -133,7 +133,7 @@ /** * append the user credentials */ - protected void appendCredentials(StringBuffer buffer) + protected void appendCredentials(StringBuffer buffer, boolean addPassword) { if (userName != null && userName.length() != 0) { @@ -141,7 +141,14 @@ if (password != null && password.length() != 0) { buffer.append(':'); - UriParser.appendEncoded(buffer, password, PASSWORD_RESERVED); + if (addPassword) + { + UriParser.appendEncoded(buffer, password, PASSWORD_RESERVED); + } + else + { + buffer.append("*****"); + } } buffer.append('@'); } Modified: jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/LayeredFileName.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/LayeredFileName.java?view=diff&rev=452588&r1=452587&r2=452588 ============================================================================== --- jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/LayeredFileName.java (original) +++ jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/LayeredFileName.java Tue Oct 3 11:13:36 2006 @@ -50,7 +50,7 @@ return new LayeredFileName(getScheme(), getOuterName(), path, type); } - protected void appendRootUri(StringBuffer buffer) + protected void appendRootUri(StringBuffer buffer, boolean addPassword) { buffer.append(getScheme()); buffer.append(":"); Modified: jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/URLFileName.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/URLFileName.java?view=diff&rev=452588&r1=452587&r2=452588 ============================================================================== --- jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/URLFileName.java (original) +++ jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/URLFileName.java Tue Oct 3 11:13:36 2006 @@ -118,7 +118,7 @@ public String getURIEncoded(String charset) throws FileSystemException, URIException { StringBuffer sb = new StringBuffer(80); - appendRootUri(sb); + appendRootUri(sb, true); sb.append(getPathQueryEncoded(charset)); return sb.toString(); } Modified: jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/local/LocalFileName.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/local/LocalFileName.java?view=diff&rev=452588&r1=452587&r2=452588 ============================================================================== --- jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/local/LocalFileName.java (original) +++ jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/local/LocalFileName.java Tue Oct 3 11:13:36 2006 @@ -57,7 +57,7 @@ /** * Builds the root URI for this file name. */ - protected void appendRootUri(final StringBuffer buffer) + protected void appendRootUri(final StringBuffer buffer, boolean addPassword) { buffer.append(getScheme()); buffer.append("://"); Modified: jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/local/WindowsFileName.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/local/WindowsFileName.java?view=diff&rev=452588&r1=452587&r2=452588 ============================================================================== --- jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/local/WindowsFileName.java (original) +++ jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/local/WindowsFileName.java Tue Oct 3 11:13:36 2006 @@ -45,7 +45,7 @@ /** * Builds the root URI for this file name. */ - protected void appendRootUri(final StringBuffer buffer) + protected void appendRootUri(final StringBuffer buffer, boolean addPassword) { buffer.append(getScheme()); buffer.append("://"); Modified: jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/smb/SmbFileName.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/smb/SmbFileName.java?view=diff&rev=452588&r1=452587&r2=452588 ============================================================================== --- jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/smb/SmbFileName.java (original) +++ jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/smb/SmbFileName.java Tue Oct 3 11:13:36 2006 @@ -62,9 +62,9 @@ /** * Builds the root URI for this file name. */ - protected void appendRootUri(final StringBuffer buffer) + protected void appendRootUri(final StringBuffer buffer, boolean addPassword) { - super.appendRootUri(buffer); + super.appendRootUri(buffer, addPassword); buffer.append('/'); buffer.append(share); } @@ -72,7 +72,7 @@ /** * put domain before username if both are set */ - protected void appendCredentials(StringBuffer buffer) + protected void appendCredentials(StringBuffer buffer, boolean addPassword) { if (getDomain() != null && getDomain().length() != 0 && getUserName() != null && getUserName().length() != 0) @@ -80,7 +80,7 @@ buffer.append(getDomain()); buffer.append("\\"); } - super.appendCredentials(buffer); + super.appendCredentials(buffer, addPassword); } /** Modified: jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/url/UrlFileName.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/url/UrlFileName.java?view=diff&rev=452588&r1=452587&r2=452588 ============================================================================== --- jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/url/UrlFileName.java (original) +++ jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/url/UrlFileName.java Tue Oct 3 11:13:36 2006 @@ -17,11 +17,11 @@ super(scheme, hostName, port, defaultPort, userName, password, path, type, queryString); } - protected void appendRootUri(final StringBuffer buffer) + protected void appendRootUri(final StringBuffer buffer, boolean addPassword) { if (getHostName() != null && !"".equals(getHostName())) { - super.appendRootUri(buffer); + super.appendRootUri(buffer, addPassword); return; } --------------------------------------------------------------------- To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org For additional commands, e-mail: commons-dev-help@jakarta.apache.org