You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by we...@apache.org on 2009/08/26 17:41:15 UTC
svn commit: r808060 - in /myfaces/extensions/scripting/trunk:
core/src/main/groovy/org/apache/myfaces/groovyloader/core/
core/src/main/java/org/apache/myfaces/scripting/core/util/
core/src/main/java/org/apache/myfaces/scripting/servlet/ examples/src/ma...
Author: werpu
Date: Wed Aug 26 15:41:15 2009
New Revision: 808060
URL: http://svn.apache.org/viewvc?rev=808060&view=rev
Log:
project semi working again, renderer reload is broken for now
but I will investigate that later
https://issues.apache.org/jira/browse/EXTSCRIPT-5
Modified:
myfaces/extensions/scripting/trunk/core/src/main/groovy/org/apache/myfaces/groovyloader/core/GroovyWeaver.groovy
myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/scripting/core/util/ScriptingWeaverHolder.java
myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/scripting/servlet/CustomChainLoader.java
myfaces/extensions/scripting/trunk/examples/src/main/webapp/WEB-INF/groovy/org/apache/myfaces/groovyloader/test/TestBean.groovy
myfaces/extensions/scripting/trunk/examples/src/main/webapp/WEB-INF/groovy/org/apache/myfaces/groovyloader/test/TestRenderer.groovy
myfaces/extensions/scripting/trunk/spring-example/pom.xml
Modified: myfaces/extensions/scripting/trunk/core/src/main/groovy/org/apache/myfaces/groovyloader/core/GroovyWeaver.groovy
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/src/main/groovy/org/apache/myfaces/groovyloader/core/GroovyWeaver.groovy?rev=808060&r1=808059&r2=808060&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/src/main/groovy/org/apache/myfaces/groovyloader/core/GroovyWeaver.groovy (original)
+++ myfaces/extensions/scripting/trunk/core/src/main/groovy/org/apache/myfaces/groovyloader/core/GroovyWeaver.groovy Wed Aug 26 15:41:15 2009
@@ -193,6 +193,7 @@
//TODO this code can probably be replaced by the functionality
//already given in the Groovy classloader, this needs further testing
for (String pathEntry in scriptPath) {
+ log.info("search for:"+pathEntry + groovyClass);
File classFile = new File(pathEntry + groovyClass);
if (classFile.exists()) /*we check the groovy subdir for our class*/
Modified: myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/scripting/core/util/ScriptingWeaverHolder.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/scripting/core/util/ScriptingWeaverHolder.java?rev=808060&r1=808059&r2=808060&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/scripting/core/util/ScriptingWeaverHolder.java (original)
+++ myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/scripting/core/util/ScriptingWeaverHolder.java Wed Aug 26 15:41:15 2009
@@ -50,8 +50,9 @@
switch (objectType) {
case ScriptingConst.ENGINE_TYPE_GROOVY:
return this._groovyWeaver.reloadScriptingInstance(o);
- default: //java
+ case ScriptingConst.ENGINE_TYPE_JAVA: //java
return this._javaWeaver.reloadScriptingInstance(o);
+ default: return o;
}
}
@@ -61,8 +62,9 @@
switch (objectType) {
case ScriptingConst.ENGINE_TYPE_GROOVY:
return this._groovyWeaver.reloadScriptingClass(aclass);
- default: //java
+ case ScriptingConst.ENGINE_TYPE_JAVA: //java
return this._javaWeaver.reloadScriptingClass(aclass);
+ default: return aclass;
}
}
Modified: myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/scripting/servlet/CustomChainLoader.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/scripting/servlet/CustomChainLoader.java?rev=808060&r1=808059&r2=808060&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/scripting/servlet/CustomChainLoader.java (original)
+++ myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/scripting/servlet/CustomChainLoader.java Wed Aug 26 15:41:15 2009
@@ -65,7 +65,7 @@
//TODO end?
scriptingRoot = contextRoot;
- setupScriptingPatsh(servletContext, groovyWeaver, CUSTOM_JAVA_LOADER_PATHS);
+ setupScriptingPatsh(servletContext, groovyWeaver, CUSTOM_LOADER_PATHS);
contextRoot = servletContext.getRealPath(JAVA_SOURCE_ROOT);
contextRoot = contextRoot.trim();
Modified: myfaces/extensions/scripting/trunk/examples/src/main/webapp/WEB-INF/groovy/org/apache/myfaces/groovyloader/test/TestBean.groovy
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/src/main/webapp/WEB-INF/groovy/org/apache/myfaces/groovyloader/test/TestBean.groovy?rev=808060&r1=808059&r2=808060&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/src/main/webapp/WEB-INF/groovy/org/apache/myfaces/groovyloader/test/TestBean.groovy (original)
+++ myfaces/extensions/scripting/trunk/examples/src/main/webapp/WEB-INF/groovy/org/apache/myfaces/groovyloader/test/TestBean.groovy Wed Aug 26 15:41:15 2009
@@ -45,6 +45,6 @@
public String getXxx() {
- "ss Simple text you can change me on the fly"
+ "Simple text you can change me on the fly"
}
}
\ No newline at end of file
Modified: myfaces/extensions/scripting/trunk/examples/src/main/webapp/WEB-INF/groovy/org/apache/myfaces/groovyloader/test/TestRenderer.groovy
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/src/main/webapp/WEB-INF/groovy/org/apache/myfaces/groovyloader/test/TestRenderer.groovy?rev=808060&r1=808059&r2=808060&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/src/main/webapp/WEB-INF/groovy/org/apache/myfaces/groovyloader/test/TestRenderer.groovy (original)
+++ myfaces/extensions/scripting/trunk/examples/src/main/webapp/WEB-INF/groovy/org/apache/myfaces/groovyloader/test/TestRenderer.groovy Wed Aug 26 15:41:15 2009
@@ -30,8 +30,6 @@
public void encodeBegin(FacesContext facesContext, UIComponent uiComponent) {
facesContext.responseWriter.write """
- <h1> Warning the project is under reconstruction reloading is not working currently </h1>
-
<h1>Hello from a groovy JSF components renderer </h1>
<p> you can find my sources under WEB-INF/groovy/... </p>
Modified: myfaces/extensions/scripting/trunk/spring-example/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/spring-example/pom.xml?rev=808060&r1=808059&r2=808060&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/spring-example/pom.xml (original)
+++ myfaces/extensions/scripting/trunk/spring-example/pom.xml Wed Aug 26 15:41:15 2009
@@ -41,8 +41,8 @@
<version>1.5.6</version>
</dependency>
<dependency>
- <groupId>org.apache.myfaces.extended</groupId>
- <artifactId>myfaces-groovy-core</artifactId>
+ <groupId>org.apache.myfaces.extension-scripting</groupId>
+ <artifactId>core</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>