svn commit: r1447654 - /struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/fs/JBossFileManager.java
Author: lukaszlenart Date: Tue Feb 19 10:13:53 2013 New Revision: 1447654 URL: http://svn.apache.org/r1447654 Log: WW-3984 Adds additional logging to check what is wrong Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/fs/JBossFileManager.java Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/fs/JBossFileManager.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/fs/JBossFileManager.java?rev=1447654r1=1447653r2=1447654view=diff == --- struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/fs/JBossFileManager.java (original) +++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/fs/JBossFileManager.java Tue Feb 19 10:13:53 2013 @@ -73,6 +73,9 @@ public class JBossFileManager extends De LOG.debug(Creating revision for URL: + fileName); } URL normalizedUrl = normalizeToFileProtocol(fileUrl); +if (LOG.isDebugEnabled()) { +LOG.debug(Normalized URL for [#0] is [#1], fileName, normalizedUrl.toString()); +} Revision revision; if (file.equals(normalizedUrl.getProtocol())) { revision = FileRevision.build(normalizedUrl); @@ -133,6 +136,9 @@ public class JBossFileManager extends De protected URL getJBossPhysicalUrl(URL url) throws IOException { Object content = url.openConnection().getContent(); String classContent = content.getClass().toString(); +if (LOG.isDebugEnabled()) { +LOG.debug(Reading physical URL for [#0], url.toString()); +} if (classContent.startsWith(class org.jboss.vfs.VirtualFile)) { // JBoss 7 and probably 6 File physicalFile = readJBossPhysicalFile(content); return physicalFile.toURI().toURL();
svn commit: r1447689 - in /struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/fs: DefaultFileManager.java JarEntryRevision.java
Author: lukaszlenart Date: Tue Feb 19 11:45:45 2013 New Revision: 1447689 URL: http://svn.apache.org/r1447689 Log: WW-3984 Reverts some changes from previous commit Modified: struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/fs/DefaultFileManager.java struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/fs/JarEntryRevision.java Modified: struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/fs/DefaultFileManager.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/fs/DefaultFileManager.java?rev=1447689r1=1447688r2=1447689view=diff == --- struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/fs/DefaultFileManager.java (original) +++ struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/fs/DefaultFileManager.java Tue Feb 19 11:45:45 2013 @@ -94,7 +94,7 @@ public class DefaultFileManager implemen LOG.debug(Creating revision for URL: + fileName); } if (isJarURL(fileUrl)) { -revision = JarEntryRevision.build(normalizeToFileProtocol(fileUrl)); +revision = JarEntryRevision.build(normalizeToFileProtocol(fileUrl), this); } else { revision = FileRevision.build(fileUrl); } Modified: struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/fs/JarEntryRevision.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/fs/JarEntryRevision.java?rev=1447689r1=1447688r2=1447689view=diff == --- struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/fs/JarEntryRevision.java (original) +++ struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/fs/JarEntryRevision.java Tue Feb 19 11:45:45 2013 @@ -1,5 +1,6 @@ package com.opensymphony.xwork2.util.fs; +import com.opensymphony.xwork2.FileManager; import com.opensymphony.xwork2.util.logging.Logger; import com.opensymphony.xwork2.util.logging.LoggerFactory; import org.apache.commons.io.FileUtils; @@ -23,7 +24,7 @@ public class JarEntryRevision extends Re private String fileNameInJar; private long lastModified; -public static Revision build(URL fileUrl) { +public static Revision build(URL fileUrl, FileManager fileManager) { // File within a Jar // Find separator index of jar filename and filename within jar String jarFileName = ; @@ -44,9 +45,14 @@ public class JarEntryRevision extends Re int index = separatorIndex + JAR_FILE_NAME_SEPARATOR.length(); String fileNameInJar = fileName.substring(index).replaceAll(%20, ); -JarFile jarFile = new JarFile(FileUtils.toFile(fileUrl)); -ZipEntry entry = jarFile.getEntry(fileNameInJar); -return new JarEntryRevision(jarFileName, fileNameInJar, entry.getTime()); +URL url = fileManager.normalizeToFileProtocol(fileUrl); +if (url != null) { +JarFile jarFile = new JarFile(FileUtils.toFile(url)); +ZipEntry entry = jarFile.getEntry(fileNameInJar); +return new JarEntryRevision(jarFileName, fileNameInJar, entry.getTime()); +} else { +return null; +} } catch (Throwable e) { if (LOG.isWarnEnabled()) { LOG.warn(Could not create JarEntryRevision for [#0]!, e, jarFileName);
[CONF] Confluence Changes in the last 24 hours
This is a daily summary of all recent changes in Confluence. - Updated Spaces: - Apache Camel (https://cwiki.apache.org/confluence/display/CAMEL) Pages - Camel 3.0 - Ideas edited by davsclaus (02:35 PM) https://cwiki.apache.org/confluence/display/CAMEL/Camel+3.0+-+Ideas Camel 3.0 - Message Store created by christian.ohr (05:22 AM) https://cwiki.apache.org/confluence/display/CAMEL/Camel+3.0+-+Message+Store Stream caching edited by ay (10:10 AM) https://cwiki.apache.org/confluence/display/CAMEL/Stream+caching Apache Cloudstack (https://cwiki.apache.org/confluence/display/CLOUDSTACK) Pages - Twitter created by jzb (10:18 AM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/Twitter nTier Apps 2.0 Requirements edited by manans (09:22 PM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/nTier+Apps+2.0+Requirements Who uses Apache CloudStack? edited by kkitase (09:19 PM) https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=30744222 VM Snapshots Test Cases edited by sangeethah (09:16 PM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/VM+Snapshots+Test+Cases Switzerland created by p.baner...@anolim.com (06:00 PM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/Switzerland Draft - CloudStack Community Events Plan edited by p.baner...@anolim.com (06:04 PM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/Draft+-+CloudStack+Community+Events+Plan Mixed Zone Management Test Plan created by chandanp (05:19 PM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/Mixed+Zone+Management+Test+Plan Social Media Guidelines (Draft) created by jzb (03:45 PM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/Social+Media+Guidelines+%28Draft%29 CS bug tool created by rayees.namathponnan (02:46 PM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/CS+bug+tool Marketing edited by jzb (02:02 PM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/Marketing LB using External Provider for Shared Networks created by sadhu (01:48 PM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/LB+using+External+Provider+for+Shared+Networks LDAP created by sadhu (12:48 PM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/LDAP Managing the Apache CloudStack Web Site edited by jzb (12:51 PM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/Managing+the+Apache+CloudStack+Web+Site Configurable setting to use linked clones or full clones on VMware edited by prashantkm (09:36 AM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/Configurable+setting+to+use+linked+clones+or+full+clones++on+VMware Multiple IPs per NIC Test Plan created by swamy (07:38 AM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/Multiple+IPs+per+NIC+Test+Plan Apache CloudStack v 4.1 Documentation Plan edited by radhikap (05:01 AM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/Apache+CloudStack+v+4.1+Documentation+Plan Scaling up CPU and RAM for running VMs edited by prashantkm (12:56 AM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/Scaling+up+CPU+and+RAM+for+running+VMs Comments https://cwiki.apache.org/confluence/display/CLOUDSTACK/AWS-Style+Regions+Functional+Spec (1) Apache cTAKES (https://cwiki.apache.org/confluence/display/CTAKES) Pages - cTAKES 3.0 Developer Guide edited by bleeker (06:13 PM) https://cwiki.apache.org/confluence/display/CTAKES/cTAKES+3.0+Developer+Guide cTAKES 3.0 User Guide edited by bleeker (02:45 PM) https://cwiki.apache.org/confluence/display/CTAKES/cTAKES+3.0+User+Guide cTAKES 3.0 - Relation Extractor edited by james-masanz (12:05 PM) https://cwiki.apache.org/confluence/display/CTAKES/cTAKES+3.0+-+Relation+Extractor Apache Kafka (https://cwiki.apache.org/confluence/display/KAFKA) Pages - Kafka data structures in Zookeeper edited by swapnilghike (09:03 PM) https://cwiki.apache.org/confluence/display/KAFKA/Kafka+data+structures+in+Zookeeper Comments https://cwiki.apache.org/confluence/display/KAFKA/Kafka+data+structures+in+Zookeeper (1) Apache OpenOffice Community (https://cwiki.apache.org/confluence/display/OOOUSERS) Pages - AOO4 - Websites Translation created by smansour (10:49 PM) https://cwiki.apache.org/confluence/display/OOOUSERS/AOO4+-+Websites+Translation Bugzilla Taxonomy edited by regina (07:27 PM) https://cwiki.apache.org/confluence/display/OOOUSERS/Bugzilla+Taxonomy AOO4 - Websites edited by smansour (11:04 AM) https://cwiki.apache.org/confluence/display/OOOUSERS/AOO4+-+Websites Comments