Return-Path: Delivered-To: apmail-struts-commits-archive@minotaur.apache.org Received: (qmail 74317 invoked from network); 20 Jan 2011 16:00:04 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 20 Jan 2011 16:00:04 -0000 Received: (qmail 18609 invoked by uid 500); 20 Jan 2011 16:00:04 -0000 Delivered-To: apmail-struts-commits-archive@struts.apache.org Received: (qmail 18406 invoked by uid 500); 20 Jan 2011 16:00:00 -0000 Mailing-List: contact commits-help@struts.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@struts.apache.org Delivered-To: mailing list commits@struts.apache.org Received: (qmail 18369 invoked by uid 99); 20 Jan 2011 16:00:00 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 20 Jan 2011 16:00:00 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 20 Jan 2011 15:59:59 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 615B323889BF; Thu, 20 Jan 2011 15:59:39 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1061358 - /struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/URLUtil.java Date: Thu, 20 Jan 2011 15:59:39 -0000 To: commits@struts.apache.org From: lukaszlenart@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110120155939.615B323889BF@eris.apache.org> Author: lukaszlenart Date: Thu Jan 20 15:59:39 2011 New Revision: 1061358 URL: http://svn.apache.org/viewvc?rev=1061358&view=rev Log: Solves WW-3507 - adds additional check for jboss.vfs.forceVfsJar parameter to treat vfsfile:// as a file in a Jar Modified: struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/URLUtil.java Modified: struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/URLUtil.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/URLUtil.java?rev=1061358&r1=1061357&r2=1061358&view=diff ============================================================================== --- struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/URLUtil.java (original) +++ struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/URLUtil.java Thu Jan 20 15:59:39 2011 @@ -30,6 +30,7 @@ public class URLUtil { */ public static final String JBOSS5_VFSZIP = "vfszip"; public static final String JBOSS5_VFSMEMORY = "vfsmemory"; + public static final String JBOSS5_VFSFILE = "vfsfile"; private static final Pattern JAR_PATTERN = Pattern.compile("^(jar:|wsjar:|zip:|vfsfile:|code-source:)?(file:)?(.*?)(\\!/|.jar/)(.*)"); private static final int JAR_FILE_PATH = 3; @@ -99,7 +100,8 @@ public class URLUtil { */ public static boolean isJBoss5Url(URL fileUrl) { final String protocol = fileUrl.getProtocol(); - return JBOSS5_VFSZIP.equals(protocol) || JBOSS5_VFSMEMORY.equals(fileUrl.getProtocol()); + return JBOSS5_VFSZIP.equals(protocol) || JBOSS5_VFSMEMORY.equals(fileUrl.getProtocol()) + || ("true".equals(System.getProperty("jboss.vfs.forceVfsJar")) && JBOSS5_VFSFILE.equals(fileUrl.getProtocol())); } }