svn commit: r920781 - in /myfaces/extensions/scripting/trunk: core/core/src/main/java/org/apache/myfaces/scripting/api/ core/core/src/main/java/org/apache/myfaces/scripting/sandbox/loader/ examples/myfaces20-example/src/main/java/org/apache/myfaces/oth...

[we...@apache.org]

Author: werpu
Date: Tue Mar  9 10:37:21 2010
New Revision: 920781

URL: http://svn.apache.org/viewvc?rev=920781&view=rev
Log:
https://issues.apache.org/jira/browse/EXTSCRIPT-89

fixed an issue caused by a bug in the jdk replaceAll routine which escapes one level too much than it was defined for

Modified:
    myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/Configuration.java
    myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/sandbox/loader/ReloadingClassLoader.java
    myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/java/org/apache/myfaces/otherEngines/TestBeanImpl.java

Modified: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/Configuration.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/Configuration.java?rev=920781&r1=920780&r2=920781&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/Configuration.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/Configuration.java Tue Mar  9 10:37:21 2010
@@ -89,7 +89,7 @@ public class Configuration {
         List<String> retVal = new ArrayList(_packageWhiteList.size() * origSourceDirs.size() + origSourceDirs.size());
 
         for (String whitelisted : _packageWhiteList) {
-            whitelisted = whitelisted.replaceAll("\\.", File.separator);
+            whitelisted = whitelisted.replaceAll("\\.", FileUtils.getFileSeparatorForRegex());
             for (String sourceDir : origSourceDirs) {
                 String newSourceDir = sourceDir + File.separator + whitelisted;
                 if ((new File(newSourceDir)).exists()) {

Modified: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/sandbox/loader/ReloadingClassLoader.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/sandbox/loader/ReloadingClassLoader.java?rev=920781&r1=920780&r2=920781&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/sandbox/loader/ReloadingClassLoader.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/sandbox/loader/ReloadingClassLoader.java Tue Mar  9 10:37:21 2010
@@ -18,6 +18,7 @@
  */
 package org.apache.myfaces.scripting.sandbox.loader;
 
+import org.apache.myfaces.scripting.core.util.FileUtils;
 import org.apache.myfaces.scripting.sandbox.loader.support.ClassFileLoader;
 import org.apache.myfaces.scripting.sandbox.loader.support.OverridingClassLoader;
 import org.apache.myfaces.scripting.sandbox.loader.support.ThrowAwayClassLoader;
@@ -52,13 +53,8 @@ public class ReloadingClassLoader extend
      * The system-dependent default name-separator character. Note that it's safe to
      * use this version of the file separator in regex methods, like replaceAll().
      */
-    private static String FILE_SEPARATOR = File.separator;
-
-    static {
-        if ("\\".equals(FILE_SEPARATOR)) {
-            FILE_SEPARATOR = "\\\\";
-        }
-    }
+    private static String FILE_SEPARATOR = FileUtils.getFileSeparatorForRegex();
+   
 
     /**
      * The logger instance for this class.

Modified: myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/java/org/apache/myfaces/otherEngines/TestBeanImpl.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/java/org/apache/myfaces/otherEngines/TestBeanImpl.java?rev=920781&r1=920780&r2=920781&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/java/org/apache/myfaces/otherEngines/TestBeanImpl.java (original)
+++ myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/java/org/apache/myfaces/otherEngines/TestBeanImpl.java Tue Mar  9 10:37:21 2010
@@ -1,5 +1,7 @@
 package org.apache.myfaces.otherEngines;
 
+import org.apache.myfaces.scripting.core.util.FileUtils;
+
 import javax.faces.FacesException;
 import javax.faces.bean.ManagedBean;
 import javax.faces.bean.RequestScoped;
@@ -17,7 +19,7 @@ public class TestBeanImpl implements Tes
         try {
             String resourceRoot = this.getClass().getClassLoader().getResource("./").getFile();
             //dirty and only works if you run it in maven jetty:run but for the demo this is ok
-            String resource = resourceRoot+"../../../../src/main/java/"+"org.apache.myfaces.otherEngines".replaceAll("\\.", File.separator)+File.separator+"TestBean.js";
+            String resource = resourceRoot+"../../../../src/main/java/"+"org.apache.myfaces.otherEngines".replaceAll("\\.", FileUtils.getFileSeparatorForRegex())+File.separator+"TestBean.js";
             _delegate = (TestBean) JavascriptProxyFactory.newInstance(TestBean.class, "TestBean", new File(resource));
         } catch (ScriptException e) {
             throw new FacesException(e);