Author: shuber
Date: Fri Sep 7 14:51:42 2007
New Revision: 18397
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18397&repname=
=3Djahia
Log:
1. This patch corrects a problem when uploading a file with Internet Explor=
er on a Jahia server running under Linux or Solaris. It corrects the incorr=
ect naming of the file that then starts with C__Documents_and_Settings_ . N=
ote: that this patch doesn't correct previously uploaded files. These files=
will have to be corrected manually.
This was fixed for POST-10
2. Also included in this patch is a correction of the file repository to po=
int to maven.jahia.org/maven which is the new location
3. Commons IO was upgraded to version 1.3.1 for this patch to work correctl=
y.
Modified:
branches/JAHIA-ACG-BRANCH/core/project.properties
branches/JAHIA-ACG-BRANCH/core/project.xml
branches/JAHIA-ACG-BRANCH/core/src/java/org/jahia/engines/filemanager/D=
AVFilemanager_Engine.java
Modified: branches/JAHIA-ACG-BRANCH/core/project.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-ACG-BR=
ANCH/core/project.properties&rev=3D18397&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-ACG-BRANCH/core/project.properties (original)
+++ branches/JAHIA-ACG-BRANCH/core/project.properties Fri Sep 7 14:51:42 2=
007
@@ -21,7 +21,7 @@
# Set to true if you want to exclude some libraries from packaging, which =
will usually be then inserted as shared libraries.
maven.jahiawar.usesharedlibs=3Dtrue
=
-maven.repo.remote =3D http://maven.jahia.org, http://mirrors.ibiblio.org/p=
ub/mirrors/maven, http://mirrors.ibiblio.org/pub/mirrors/maven2, http://www=
.bluesunrise.com/maven/, http://www.ibiblio.org/maven/, http://www.day.com/=
maven/
+maven.repo.remote =3D http://maven.jahia.org/maven, http://mirrors.ibiblio=
.org/pub/mirrors/maven, http://mirrors.ibiblio.org/pub/mirrors/maven2, http=
://www.bluesunrise.com/maven/, http://www.ibiblio.org/maven/, http://www.da=
y.com/maven/
=
#####################################################
# jar override
Modified: branches/JAHIA-ACG-BRANCH/core/project.xml
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-ACG-BR=
ANCH/core/project.xml&rev=3D18397&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-ACG-BRANCH/core/project.xml (original)
+++ branches/JAHIA-ACG-BRANCH/core/project.xml Fri Sep 7 14:51:42 2007
@@ -189,7 +189,7 @@
</dependency>
<dependency>
<id>commons-io</id>
- <version>1.0</version>
+ <version>1.3.1</version>
<properties>
<war.bundle>true</war.bundle>
</properties>
Modified: branches/JAHIA-ACG-BRANCH/core/src/java/org/jahia/engines/fileman=
ager/DAVFilemanager_Engine.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-ACG-BR=
ANCH/core/src/java/org/jahia/engines/filemanager/DAVFilemanager_Engine.java=
&rev=3D18397&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-ACG-BRANCH/core/src/java/org/jahia/engines/filemanager/D=
AVFilemanager_Engine.java (original)
+++ branches/JAHIA-ACG-BRANCH/core/src/java/org/jahia/engines/filemanager/D=
AVFilemanager_Engine.java Fri Sep 7 14:51:42 2007
@@ -25,6 +25,7 @@
=
import org.apache.regexp.RE;
import org.apache.slide.content.NodeProperty;
+import org.apache.commons.io.FilenameUtils;
import org.jahia.bin.Jahia;
import org.jahia.data.JahiaData;
import org.jahia.data.fields.JahiaField;
@@ -1771,13 +1772,7 @@
}
=
private String decodeStrangeBrowserEncoding(final String name) {
- final int index =3D name.lastIndexOf(File.separator);
- final String fileName;
- if (index > -1) {
- fileName =3D name.substring(index + 1);
- } else {
- fileName =3D name;
- }
+ final String fileName =3D FilenameUtils.getName(name);
final StringBuffer sb =3D new StringBuffer();
sb.append(fileName);
try {
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
