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:24:59 UTC
svn commit: r808052 - in /myfaces/extensions/scripting/trunk:
core/src/main/java/org/apache/myfaces/scripting/core/util/
core/src/main/java/org/apache/myfaces/scripting/servlet/ examples/
examples/src/main/webapp/ examples/src/main/webapp/WEB-INF/ exam...
Author: werpu
Date: Wed Aug 26 15:24:57 2009
New Revision: 808052
URL: http://svn.apache.org/viewvc?rev=808052&view=rev
Log:
ongoing integration works
the reloading is currently broken cannot be fixed for today
https://issues.apache.org/jira/browse/EXTSCRIPT-5
Added:
myfaces/extensions/scripting/trunk/examples/src/main/webapp/WEB-INF/java/
myfaces/extensions/scripting/trunk/examples/src/main/webapp/WEB-INF/java/org/
myfaces/extensions/scripting/trunk/examples/src/main/webapp/WEB-INF/java/org/apache/
myfaces/extensions/scripting/trunk/examples/src/main/webapp/WEB-INF/java/org/apache/myfaces/
myfaces/extensions/scripting/trunk/examples/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/
myfaces/extensions/scripting/trunk/examples/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/test/
myfaces/extensions/scripting/trunk/examples/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/test/TestBean.java (with props)
Modified:
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/pom.xml
myfaces/extensions/scripting/trunk/examples/src/main/webapp/WEB-INF/faces-config.xml
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/examples/src/main/webapp/WEB-INF/web.xml
myfaces/extensions/scripting/trunk/examples/src/main/webapp/helloWorld.xhtml
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=808052&r1=808051&r2=808052&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:24:57 2009
@@ -70,7 +70,7 @@
public Class loadScriptingClassFromName(String className) {
//we try to load from the chain, we cannot determine the engine type upfront here
Class retVal = this._groovyWeaver.loadScriptingClassFromName(className);
- if (retVal != null) {
+ if (retVal == null) {
return this._javaWeaver.loadScriptingClassFromName(className);
}
return retVal;
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=808052&r1=808051&r2=808052&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:24:57 2009
@@ -62,6 +62,7 @@
//TODO still needed?
if (!contextRoot.endsWith("/") && !contextRoot.endsWith("\\"))
contextRoot += "/";
+ //TODO end?
scriptingRoot = contextRoot;
setupScriptingPatsh(servletContext, groovyWeaver, CUSTOM_JAVA_LOADER_PATHS);
Modified: myfaces/extensions/scripting/trunk/examples/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/pom.xml?rev=808052&r1=808051&r2=808052&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/pom.xml (original)
+++ myfaces/extensions/scripting/trunk/examples/pom.xml Wed Aug 26 15:24:57 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>
Modified: myfaces/extensions/scripting/trunk/examples/src/main/webapp/WEB-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/src/main/webapp/WEB-INF/faces-config.xml?rev=808052&r1=808051&r2=808052&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/src/main/webapp/WEB-INF/faces-config.xml (original)
+++ myfaces/extensions/scripting/trunk/examples/src/main/webapp/WEB-INF/faces-config.xml Wed Aug 26 15:24:57 2009
@@ -34,6 +34,13 @@
<managed-bean-class>org.apache.myfaces.groovyloader.test.TestBean</managed-bean-class>
<managed-bean-scope>request</managed-bean-scope>
</managed-bean>
+
+ <managed-bean>
+ <managed-bean-name>javatestbean</managed-bean-name>
+ <managed-bean-class>org.apache.myfaces.javaloader.test.TestBean</managed-bean-class>
+ <managed-bean-scope>request</managed-bean-scope>
+ </managed-bean>
+
<managed-bean>
<managed-bean-name>blogView</managed-bean-name>
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=808052&r1=808051&r2=808052&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:24:57 2009
@@ -45,6 +45,6 @@
public String getXxx() {
- "xxx Simple text you can change me on the fly"
+ "ss 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=808052&r1=808051&r2=808052&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:24:57 2009
@@ -30,7 +30,9 @@
public void encodeBegin(FacesContext facesContext, UIComponent uiComponent) {
facesContext.responseWriter.write """
- <h1> Hello from a groovy JSF components renderer </h1>
+ <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>
Added: myfaces/extensions/scripting/trunk/examples/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/test/TestBean.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/test/TestBean.java?rev=808052&view=auto
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/test/TestBean.java (added)
+++ myfaces/extensions/scripting/trunk/examples/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/test/TestBean.java Wed Aug 26 15:24:57 2009
@@ -0,0 +1,15 @@
+package org.apache.myfaces.javaloader.test;
+
+
+public class TestBean {
+ String sayHello = "hello world";
+
+ public String getSayHello() {
+ return sayHello;
+ }
+
+ public void setSayHello(String hello) {
+ this.sayHello = hello;
+ }
+
+}
\ No newline at end of file
Propchange: myfaces/extensions/scripting/trunk/examples/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/test/TestBean.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/extensions/scripting/trunk/examples/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/test/TestBean.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: myfaces/extensions/scripting/trunk/examples/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/src/main/webapp/WEB-INF/web.xml?rev=808052&r1=808051&r2=808052&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/src/main/webapp/WEB-INF/web.xml (original)
+++ myfaces/extensions/scripting/trunk/examples/src/main/webapp/WEB-INF/web.xml Wed Aug 26 15:24:57 2009
@@ -45,14 +45,21 @@
<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>/home/werpu/development/workspace/scriptingextensions/examples/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>/home/werpu/development/workspace/scriptingextensions/examples/src/main/webapp/WEB-INF/java</param-value>
+ </context-param>
+
<context-param>
<description>State saving method: "client" or "server" (= default)
Modified: myfaces/extensions/scripting/trunk/examples/src/main/webapp/helloWorld.xhtml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/src/main/webapp/helloWorld.xhtml?rev=808052&r1=808051&r2=808052&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/src/main/webapp/helloWorld.xhtml (original)
+++ myfaces/extensions/scripting/trunk/examples/src/main/webapp/helloWorld.xhtml Wed Aug 26 15:24:57 2009
@@ -23,6 +23,7 @@
<grv:testcomponent />
<h:message id="message1" for="input1" />
<h:outputFormat value="#{testbean.xxx}"/>
+
<h:commandButton value="Press me dynamic" action="#{testbean.doit}"/>
</h:panelGrid>