myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From we...@apache.org
Subject svn commit: r1343562 - in /myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src: main/java/org/apache/myfaces/extensions/scripting/core/monitor/ test/java/org/apache/myfaces/extensions/scripting/core/context/
Date Tue, 29 May 2012 07:09:32 GMT
Author: werpu
Date: Tue May 29 07:09:32 2012
New Revision: 1343562

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

Fix for the issue, it was the usual regexp problem in windows as it seems
additional windows testing will be performed later this week before
finalizing the next release.

Modified:
    myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/core/monitor/ClassResource.java
    myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/extensions/scripting/core/context/InitialFullScanTest.java

Modified: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/core/monitor/ClassResource.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/core/monitor/ClassResource.java?rev=1343562&r1=1343561&r2=1343562&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/core/monitor/ClassResource.java
(original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/core/monitor/ClassResource.java
Tue May 29 07:09:32 2012
@@ -23,6 +23,7 @@ import org.apache.myfaces.extensions.scr
 import org.apache.myfaces.extensions.scripting.core.api.WeavingContext;
 import org.apache.myfaces.extensions.scripting.core.api.eventhandling.events.TaintedEvent;
 import org.apache.myfaces.extensions.scripting.core.common.util.ClassUtils;
+import org.apache.myfaces.extensions.scripting.core.common.util.FileUtils;
 
 import java.io.File;
 import java.util.Collection;
@@ -126,7 +127,7 @@ public class ClassResource extends Watch
     {
         String targetDir = WeavingContext.getInstance().getConfiguration().getCompileTarget().getAbsolutePath();
         String className = ClassUtils.relativeFileToClassName(getSourceFile());
-        className = targetDir + File.separator + className.replaceAll("\\.", File.separator)
+ ".class";
+        className = targetDir + File.separator + className.replaceAll("\\.", FileUtils.getFileSeparatorForRegex())
+ ".class";
         File targetClass = new File(className);
         return !targetClass.exists() || targetClass.lastModified() < _sourceFile.lastModified();
     }

Modified: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/extensions/scripting/core/context/InitialFullScanTest.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/extensions/scripting/core/context/InitialFullScanTest.java?rev=1343562&r1=1343561&r2=1343562&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/extensions/scripting/core/context/InitialFullScanTest.java
(original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/extensions/scripting/core/context/InitialFullScanTest.java
Tue May 29 07:09:32 2012
@@ -19,6 +19,7 @@
 
 package org.apache.myfaces.extensions.scripting.core.context;
 
+import org.apache.myfaces.extensions.scripting.core.common.util.FileUtils;
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
@@ -61,7 +62,7 @@ public class InitialFullScanTest
                 ScriptingEngine scalaEngine = factory.getEngine(ScriptingConst.ENGINE_TYPE_JSF_SCALA);
 
                 ClassLoader loader = this.getClass().getClassLoader();
-                String canonicalPackageName = this.getClass().getPackage().getName().replaceAll("\\.",
File.separator);                Enumeration<URL> enumeration = loader.getResources(canonicalPackageName);
+                String canonicalPackageName = this.getClass().getPackage().getName().replaceAll("\\.",
FileUtils.getFileSeparatorForRegex());                Enumeration<URL> enumeration =
loader.getResources(canonicalPackageName);
                 javaEngine.getSourcePaths().clear();
                 groovyEngine.getSourcePaths().clear();
                 //TODO source not binary dirs



Mime
View raw message