Author: simoneg
Date: Thu Dec 10 12:07:57 2009
New Revision: 889226
URL: http://svn.apache.org/viewvc?rev=889226&view=rev
Log:
LABS-380 : fix for ":" in windows
Modified:
labs/magma/trunk/foundation-website/src/main/java/org/apache/magma/website/utils/OnDemandBinder.java
labs/magma/trunk/website-file/src/main/java/org/apache/magma/website/htmlpieces/MagFileHtml.java
labs/magma/trunk/website-image/src/main/java/org/apache/magma/website/htmlpieces/MagImageHtml.java
Modified:
labs/magma/trunk/foundation-website/src/main/java/org/apache/magma/website/utils/OnDemandBinder.java
URL:
http://svn.apache.org/viewvc/labs/magma/trunk/foundation-website/src/main/java/org/apache/magma/website/utils/OnDemandBinder.java?rev=889226&r1=889225&r2=889226&view=diff
==============================================================================
---
labs/magma/trunk/foundation-website/src/main/java/org/apache/magma/website/utils/OnDemandBinder.java
(original)
+++
labs/magma/trunk/foundation-website/src/main/java/org/apache/magma/website/utils/OnDemandBinder.java
Thu Dec 10 12:07:57 2009
@@ -107,7 +107,7 @@
String origname =
items[i].getName();
origname =
origname.replaceAll("\\\\", "/");
String[] split =
origname.split("/");
- vals[i] = "FILE " +
split[split.length - 1] + ":" + f.getAbsolutePath();
+ vals[i] = "FILE " +
split[split.length - 1] + "|" + f.getAbsolutePath();
}
}
params.put(entry.getKey(), vals);
Modified:
labs/magma/trunk/website-file/src/main/java/org/apache/magma/website/htmlpieces/MagFileHtml.java
URL:
http://svn.apache.org/viewvc/labs/magma/trunk/website-file/src/main/java/org/apache/magma/website/htmlpieces/MagFileHtml.java?rev=889226&r1=889225&r2=889226&view=diff
==============================================================================
---
labs/magma/trunk/website-file/src/main/java/org/apache/magma/website/htmlpieces/MagFileHtml.java
(original)
+++
labs/magma/trunk/website-file/src/main/java/org/apache/magma/website/htmlpieces/MagFileHtml.java
Thu Dec 10 12:07:57 2009
@@ -64,7 +64,7 @@
if (string != null && string.length() > 0) {
if (string.startsWith("FILE ")) {
string = string.substring(5);
- String[] split = string.split(":");
+ String[] split = string.split("|");
File temp = new File(split[1]);
MagFile mf = new MagFile(temp, split[0]);
return mf;
Modified:
labs/magma/trunk/website-image/src/main/java/org/apache/magma/website/htmlpieces/MagImageHtml.java
URL:
http://svn.apache.org/viewvc/labs/magma/trunk/website-image/src/main/java/org/apache/magma/website/htmlpieces/MagImageHtml.java?rev=889226&r1=889225&r2=889226&view=diff
==============================================================================
---
labs/magma/trunk/website-image/src/main/java/org/apache/magma/website/htmlpieces/MagImageHtml.java
(original)
+++
labs/magma/trunk/website-image/src/main/java/org/apache/magma/website/htmlpieces/MagImageHtml.java
Thu Dec 10 12:07:57 2009
@@ -64,7 +64,7 @@
if (string != null && string.length() > 0) {
if (string.startsWith("FILE ")) {
string = string.substring(5);
- String[] split = string.split(":");
+ String[] split = string.split("|");
File temp = new File(split[1]);
MagImage mf = new MagImage(temp, split[0]);
return mf;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
