You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ja...@apache.org on 2009/12/15 19:30:07 UTC
svn commit: r890931 - in /myfaces/extensions/scripting/trunk: core/core/
core/core/src/main/java/org/apache/myfaces/scripting/api/
core/core/src/main/java/org/apache/myfaces/scripting/core/util/
core/core/src/main/java/org/apache/myfaces/scripting/load...
Author: jankeesvanandel
Date: Tue Dec 15 18:30:06 2009
New Revision: 890931
URL: http://svn.apache.org/viewvc?rev=890931&view=rev
Log:
EXTSCRIPT-27 myfaces 1.2. example doesn't run on Windoze...
Modified:
myfaces/extensions/scripting/trunk/core/core/pom.xml
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/BaseWeaver.java
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/util/ClassUtils.java
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/util/FileUtils.java
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/java/RecompiledClassLoader.java
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/java/jdk5/CompilerFacade.java
myfaces/extensions/scripting/trunk/examples/myfaces12-example/pom.xml
myfaces/extensions/scripting/trunk/examples/myfaces12-example/src/main/webapp/WEB-INF/web.xml
myfaces/extensions/scripting/trunk/examples/myfaces20-example/pom.xml
myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/web.xml
myfaces/extensions/scripting/trunk/examples/spring-example/pom.xml
myfaces/extensions/scripting/trunk/examples/spring-example/src/main/webapp/WEB-INF/web.xml
Modified: myfaces/extensions/scripting/trunk/core/core/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/pom.xml?rev=890931&r1=890930&r2=890931&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/pom.xml (original)
+++ myfaces/extensions/scripting/trunk/core/core/pom.xml Tue Dec 15 18:30:06 2009
@@ -6,7 +6,6 @@
<packaging>jar</packaging>
<name>groovy core</name>
-
<description>
groovy myfaces core lib
</description>
Modified: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/BaseWeaver.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/BaseWeaver.java?rev=890931&r1=890930&r2=890931&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/BaseWeaver.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/BaseWeaver.java Tue Dec 15 18:30:06 2009
@@ -1,19 +1,18 @@
package org.apache.myfaces.scripting.api;
-import org.apache.myfaces.scripting.api.ScriptingWeaver;
-import org.apache.myfaces.scripting.api.ScriptingConst;
-import org.apache.myfaces.scripting.refresh.ReloadingMetadata;
-import org.apache.myfaces.scripting.core.reloading.GlobalReloadingStrategy;
-import org.apache.myfaces.scripting.core.util.WeavingContext;
-import org.apache.myfaces.scripting.core.util.ReflectUtil;
-import org.apache.myfaces.config.element.ManagedBean;
-import org.apache.myfaces.config.RuntimeConfig;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.myfaces.config.RuntimeConfig;
+import org.apache.myfaces.config.element.ManagedBean;
+import org.apache.myfaces.scripting.core.reloading.GlobalReloadingStrategy;
+import org.apache.myfaces.scripting.core.util.FileUtils;
+import org.apache.myfaces.scripting.core.util.ReflectUtil;
+import org.apache.myfaces.scripting.core.util.WeavingContext;
+import org.apache.myfaces.scripting.refresh.ReloadingMetadata;
import javax.faces.context.FacesContext;
-import java.util.*;
import java.io.File;
+import java.util.*;
/**
* @author Werner Punz
@@ -148,7 +147,8 @@
Map<String, ReloadingMetadata> classMap = getClassMap();
ReloadingMetadata metadata = classMap.get(className);
if (metadata == null) {
- String fileName = className.replaceAll("\\.", File.separator) + getFileEnding();
+ String separator = FileUtils.getFileSeparatorForRegex();
+ String fileName = className.replaceAll("\\.", separator) + getFileEnding();
for (String pathEntry : getScriptPaths()) {
Modified: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/util/ClassUtils.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/util/ClassUtils.java?rev=890931&r1=890930&r2=890931&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/util/ClassUtils.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/util/ClassUtils.java Tue Dec 15 18:30:06 2009
@@ -21,8 +21,8 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.myfaces.shared_impl.util.ClassLoaderExtension;
import org.apache.myfaces.scripting.loaders.java.ScriptingClass;
+import org.apache.myfaces.shared_impl.util.ClassLoaderExtension;
import org.objectweb.asm.ClassReader;
import org.objectweb.asm.ClassVisitor;
import org.objectweb.asm.ClassWriter;
@@ -30,7 +30,6 @@
import org.objectweb.asm.tree.AnnotationNode;
import org.objectweb.asm.tree.ClassNode;
-
import java.io.*;
import java.util.LinkedList;
@@ -150,7 +149,9 @@
}
private static String classNameToRelativeFileName(String className) {
- return className.replaceAll("\\.", File.separator) + ".class";
+ String separator = FileUtils.getFileSeparatorForRegex();
+
+ return className.replaceAll("\\.", separator) + ".class";
}
public static String relativeFileToClassName(String relativeFileName) {
Modified: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/util/FileUtils.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/util/FileUtils.java?rev=890931&r1=890930&r2=890931&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/util/FileUtils.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/util/FileUtils.java Tue Dec 15 18:30:06 2009
@@ -32,8 +32,27 @@
public class FileUtils {
static double _tempMarker = Math.random();
+ /**
+ * Get the file separator for this platform.
+ * @return The file separator.
+ */
+ public static String getFileSeparator() {
+ return File.separator;
+ }
-
+ /**
+ * Get the file separator for this platform, properly escaped for usage in a regular expression.
+ * @return The file separator, escaped for in a regex.
+ */
+ public static String getFileSeparatorForRegex() {
+ String sep = getFileSeparator();
+
+ if ("\\".equals(sep)) {
+ sep = "\\\\";
+ }
+
+ return sep;
+ }
public static File getTempDir() {
File tempDir = null;
Modified: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/java/RecompiledClassLoader.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/java/RecompiledClassLoader.java?rev=890931&r1=890930&r2=890931&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/java/RecompiledClassLoader.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/java/RecompiledClassLoader.java Tue Dec 15 18:30:06 2009
@@ -21,9 +21,7 @@
import org.apache.myfaces.scripting.core.util.ClassUtils;
import org.apache.myfaces.scripting.core.util.FileUtils;
import org.apache.myfaces.scripting.core.util.WeavingContext;
-import org.apache.myfaces.scripting.refresh.FileChangedDaemon;
import org.apache.myfaces.scripting.refresh.ReloadingMetadata;
-import org.apache.myfaces.scripting.api.ScriptingConst;
import java.io.File;
import java.io.FileInputStream;
@@ -126,7 +124,8 @@
reloadingMetaData.setAClass(retVal);
//find the source for the given class and then
//store the filename
- String fileName = className.replaceAll("\\.", File.separator)+".java";
+ String separator = FileUtils.getFileSeparatorForRegex();
+ String fileName = className.replaceAll("\\.", separator)+".java";
reloadingMetaData.setFileName(sourceRoot+File.separator+fileName);
reloadingMetaData.setSourcePath("");
Modified: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/java/jdk5/CompilerFacade.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/java/jdk5/CompilerFacade.java?rev=890931&r1=890930&r2=890931&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/java/jdk5/CompilerFacade.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/java/jdk5/CompilerFacade.java Tue Dec 15 18:30:06 2009
@@ -22,6 +22,7 @@
import org.apache.commons.logging.LogFactory;
import org.apache.myfaces.scripting.api.DynamicCompiler;
import org.apache.myfaces.scripting.core.util.ClassUtils;
+import org.apache.myfaces.scripting.core.util.FileUtils;
import org.apache.myfaces.scripting.loaders.java.RecompiledClassLoader;
import java.io.File;
@@ -76,7 +77,8 @@
public Class compileFile(String sourceRoot, String classPath, String filePath) throws ClassNotFoundException {
- String className = filePath.replaceAll(File.separator, ".");
+ String separator = FileUtils.getFileSeparatorForRegex();
+ String className = filePath.replaceAll(separator, ".");
className = ClassUtils.relativeFileToClassName(className);
try {
Modified: myfaces/extensions/scripting/trunk/examples/myfaces12-example/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/myfaces12-example/pom.xml?rev=890931&r1=890930&r2=890931&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/myfaces12-example/pom.xml (original)
+++ myfaces/extensions/scripting/trunk/examples/myfaces12-example/pom.xml Tue Dec 15 18:30:06 2009
@@ -9,7 +9,7 @@
<groupId>org.apache.myfaces.extension-scripting</groupId>
<artifactId>myfaces12-example</artifactId>
<packaging>war</packaging>
- <name>A custom project using myfaces</name>
+ <name>A custom project using myfaces 1.2</name>
<version>1.0-SNAPSHOT</version>
<url>http://www.apache.org</url>
@@ -64,11 +64,6 @@
</dependency>
<dependency>
- <groupId>org.apache.myfaces.extension-scripting</groupId>
- <artifactId>core-java6</artifactId>
- <version>1.0-SNAPSHOT</version>
- </dependency>
- <dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
<version>1.2.8</version>
@@ -86,7 +81,6 @@
<version>1.0</version>
</dependency>
-
<dependency>
<groupId>com.sun.facelets</groupId>
<artifactId>jsf-facelets</artifactId>
Modified: myfaces/extensions/scripting/trunk/examples/myfaces12-example/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/myfaces12-example/src/main/webapp/WEB-INF/web.xml?rev=890931&r1=890930&r2=890931&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/myfaces12-example/src/main/webapp/WEB-INF/web.xml (original)
+++ myfaces/extensions/scripting/trunk/examples/myfaces12-example/src/main/webapp/WEB-INF/web.xml Tue Dec 15 18:30:06 2009
@@ -52,8 +52,7 @@
of the deployment dir
</description>
<param-name>org.apache.myfaces.scripting.groovy.LOADER_PATHS</param-name>
- <param-value>/Users/werpu2/development/workspace/extensions-scripting3/examples/myfaces12-example/src/main/webapp/WEB-INF/groovy
- </param-value>
+ <param-value>D:/dev/work/ideaprojects/threads/extscript/examples/myfaces12-example/src/main/webapp/WEB-INF/groovy</param-value>
</context-param>
@@ -62,8 +61,7 @@
of the deployment dir
</description>
<param-name>org.apache.myfaces.scripting.java.LOADER_PATHS</param-name>
- <param-value>/Users/werpu2/development/workspace/extensions-scripting3/examples/myfaces12-example/src/main/webapp/WEB-INF/java
- </param-value>
+ <param-value>D:/dev/work/ideaprojects/threads/extscript/examples/myfaces12-example/src/main/webapp/WEB-INF/java</param-value>
</context-param>
@@ -243,11 +241,11 @@
</filter>
<filter>
- <filter-name>scritpingFilter</filter-name>
+ <filter-name>scriptingFilter</filter-name>
<filter-class>org.apache.myfaces.scripting.servlet.ScriptingServletFilter</filter-class>
</filter>
<filter-mapping>
- <filter-name>scritpingFilter</filter-name>
+ <filter-name>scriptingFilter</filter-name>
<url-pattern>/*</url-pattern>
<dispatcher>REQUEST</dispatcher>
<dispatcher>FORWARD</dispatcher>
@@ -265,10 +263,9 @@
</filter-mapping>
<!-- Listener, to allow Jetty serving MyFaces apps -->
- <!-- <listener>
- <listener-class>org.apache.myfaces.webapp.StartupServletContextListener</listener-class>
- </listener>
- -->
+ <listener>
+ <listener-class>org.apache.myfaces.webapp.StartupServletContextListener</listener-class>
+ </listener>
<!-- Faces Servlet -->
<servlet>
Modified: myfaces/extensions/scripting/trunk/examples/myfaces20-example/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/myfaces20-example/pom.xml?rev=890931&r1=890930&r2=890931&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/myfaces20-example/pom.xml (original)
+++ myfaces/extensions/scripting/trunk/examples/myfaces20-example/pom.xml Tue Dec 15 18:30:06 2009
@@ -9,7 +9,7 @@
<groupId>org.apache.myfaces.extension-scripting</groupId>
<artifactId>myfaces20-example</artifactId>
<packaging>war</packaging>
- <name>A custom project using myfaces</name>
+ <name>A custom project using myfaces 2.0</name>
<version>1.0-SNAPSHOT</version>
<url>http://www.apache.org</url>
Modified: myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/web.xml?rev=890931&r1=890930&r2=890931&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/web.xml (original)
+++ myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/web.xml Tue Dec 15 18:30:06 2009
@@ -39,8 +39,7 @@
of the deployment dir
</description>
<param-name>org.apache.myfaces.scripting.groovy.LOADER_PATHS</param-name>
- <param-value>/Users/werpu2/development/workspace/extensions-scripting3/examples/myfaces20-example/src/main/webapp/WEB-INF/groovy
- </param-value>
+ <param-value>D:/dev/work/ideaprojects/threads/extscript/examples/myfaces20-example/src/main/webapp/WEB-INF/groovy</param-value>
</context-param>
@@ -49,8 +48,7 @@
of the deployment dir
</description>
<param-name>org.apache.myfaces.scripting.java.LOADER_PATHS</param-name>
- <param-value>/Users/werpu2/development/workspace/extensions-scripting3/examples/myfaces20-example/src/main/webapp/WEB-INF/java
- </param-value>
+ <param-value>D:/dev/work/ideaprojects/threads/extscript/examples/myfaces20-example/src/main/webapp/WEB-INF/java</param-value>
</context-param>
@@ -69,11 +67,11 @@
<filter>
- <filter-name>scritpingFilter</filter-name>
+ <filter-name>scriptingFilter</filter-name>
<filter-class>org.apache.myfaces.scripting.servlet.ScriptingServletFilter</filter-class>
</filter>
<filter-mapping>
- <filter-name>scritpingFilter</filter-name>
+ <filter-name>scriptingFilter</filter-name>
<url-pattern>/*</url-pattern>
<dispatcher>REQUEST</dispatcher>
<dispatcher>FORWARD</dispatcher>
@@ -82,10 +80,9 @@
</filter-mapping>
<!-- Listener, to allow Jetty serving MyFaces apps -->
- <!-- <listener>
- <listener-class>org.apache.myfaces.webapp.StartupServletContextListener</listener-class>
- </listener>
- -->
+ <listener>
+ <listener-class>org.apache.myfaces.webapp.StartupServletContextListener</listener-class>
+ </listener>
<!-- Faces Servlet -->
<servlet>
Modified: myfaces/extensions/scripting/trunk/examples/spring-example/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/spring-example/pom.xml?rev=890931&r1=890930&r2=890931&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/spring-example/pom.xml (original)
+++ myfaces/extensions/scripting/trunk/examples/spring-example/pom.xml Tue Dec 15 18:30:06 2009
@@ -9,7 +9,7 @@
<groupId>org.apache.myfaces.extension-scripting</groupId>
<artifactId>spring-example</artifactId>
<packaging>war</packaging>
- <name>A custom project using myfaces</name>
+ <name>A custom project using myfaces and spring</name>
<version>1.0-SNAPSHOT</version>
<url>http://www.apache.org</url>
@@ -40,21 +40,35 @@
<artifactId>groovy-all</artifactId>
<version>1.5.6</version>
</dependency>
+
<dependency>
<groupId>org.apache.myfaces.extension-scripting</groupId>
<artifactId>core</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
+ <groupId>org.apache.myfaces.extension-scripting</groupId>
+ <artifactId>core-java6</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+
+
+ <dependency>
+ <groupId>org.apache.myfaces.extension-scripting</groupId>
+ <artifactId>myfaces12-extensions</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
- <version>1.2.8-SNAPSHOT</version>
+ <version>1.2.8</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-impl</artifactId>
- <version>1.2.8-SNAPSHOT</version>
+ <version>1.2.8</version>
<scope>compile</scope>
</dependency>
<dependency>
Modified: myfaces/extensions/scripting/trunk/examples/spring-example/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/spring-example/src/main/webapp/WEB-INF/web.xml?rev=890931&r1=890930&r2=890931&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/spring-example/src/main/webapp/WEB-INF/web.xml (original)
+++ myfaces/extensions/scripting/trunk/examples/spring-example/src/main/webapp/WEB-INF/web.xml Tue Dec 15 18:30:06 2009
@@ -56,14 +56,19 @@
<param-value>org.apache.myfaces.scripting.servlet.StartupServletContextPluginChainLoader</param-value>
</context-param>
- <!--
<context-param>
<description>Additional comma separated loader paths to allow direct editing on the sources directory instead
of the deployment dir</description>
<param-name>org.apache.myfaces.scripting.groovy.LOADER_PATHS</param-name>
- <param-value>/home/werpu/development/workspace/myfaces-groovy/examples/src/main/webapp/WEB-INF/groovy</param-value>
+ <param-value>D:/dev/work/ideaprojects/threads/extscript/examples/spring-example/src/main/webapp/WEB-INF/groovy</param-value>
+ </context-param>
+
+ <context-param>
+ <description>Additional comma separated loader paths to allow direct editing on the sources directory instead
+ of the deployment dir</description>
+ <param-name>org.apache.myfaces.scripting.java.LOADER_PATHS</param-name>
+ <param-value>D:/dev/work/ideaprojects/threads/extscript/examples/spring-example/src/main/webapp/WEB-INF/java</param-value>
</context-param>
- -->
<context-param>
<description>State saving method: "client" or "server" (= default)
@@ -243,11 +248,11 @@
</filter>
<filter>
- <filter-name>scritpingFilter</filter-name>
+ <filter-name>scriptingFilter</filter-name>
<filter-class>org.apache.myfaces.scripting.servlet.ScriptingServletFilter</filter-class>
</filter>
<filter-mapping>
- <filter-name>scritpingFilter</filter-name>
+ <filter-name>scriptingFilter</filter-name>
<url-pattern>/*</url-pattern>
<dispatcher>REQUEST</dispatcher>
<dispatcher>FORWARD</dispatcher>
@@ -265,10 +270,9 @@
</filter-mapping>
<!-- Listener, to allow Jetty serving MyFaces apps -->
- <!-- <listener>
- <listener-class>org.apache.myfaces.webapp.StartupServletContextListener</listener-class>
- </listener>
- -->
+ <listener>
+ <listener-class>org.apache.myfaces.webapp.StartupServletContextListener</listener-class>
+ </listener>
<!-- Faces Servlet -->