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 2010/01/26 20:18:39 UTC
svn commit: r903375 - in /myfaces/extensions/scripting/trunk/examples:
myfaces12-example/src/main/webapp/WEB-INF/
myfaces20-example/src/main/webapp/WEB-INF/
myfaces20-example/src/main/webapp/WEB-INF/groovy/org/apache/myfaces/groovyloader/blog/
myfaces2...
Author: werpu
Date: Tue Jan 26 19:18:38 2010
New Revision: 903375
URL: http://svn.apache.org/viewvc?rev=903375&view=rev
Log:
save state of affairs before server commit
Added:
myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/JSFUtilJava.java (contents, props changed)
- copied, changed from r903374, myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/JSFUtil.java
Removed:
myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/JSFUtil.java
Modified:
myfaces/extensions/scripting/trunk/examples/myfaces12-example/src/main/webapp/WEB-INF/web.xml
myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/groovy/org/apache/myfaces/groovyloader/blog/JSFUtil.groovy
myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/Blog.java
myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/componentTest/JavaTestComponent.java
myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/componentTest/JavaTestRenderer1.java
myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/componentTest/JavaTestRenderer2.java
myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/web.xml
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=903375&r1=903374&r2=903375&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 Jan 26 19:18:38 2010
@@ -45,7 +45,7 @@
<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
@@ -83,7 +83,7 @@
<param-value>org.apache.myfaces.scripting.facelet.ReroutingResourceResolver</param-value>
</context-param>
-
+ -->
<!--
<context-param>
<description>Additional comma separated loader paths to allow direct editing on the sources directory instead
Modified: myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/groovy/org/apache/myfaces/groovyloader/blog/JSFUtil.groovy
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/groovy/org/apache/myfaces/groovyloader/blog/JSFUtil.groovy?rev=903375&r1=903374&r2=903375&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/groovy/org/apache/myfaces/groovyloader/blog/JSFUtil.groovy (original)
+++ myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/groovy/org/apache/myfaces/groovyloader/blog/JSFUtil.groovy Tue Jan 26 19:18:38 2010
@@ -26,9 +26,7 @@
* Utils class to keep the code clean and mean
*/
public class JSFUtil {
-
-
public static Object resolveVariable(String beanName) {
Log log = LogFactory.getLog(JSFUtil.class)
log.info("ElResolver Instance:" + FacesContext.getCurrentInstance().getELContext().getELResolver().toString())
Modified: myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/Blog.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/Blog.java?rev=903375&r1=903374&r2=903375&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/Blog.java (original)
+++ myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/Blog.java Tue Jan 26 19:18:38 2010
@@ -20,9 +20,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
-
-import static org.apache.myfaces.javaloader.blog.JSFUtil.*;
+import static org.apache.myfaces.javaloader.blog.JSFUtilJava.*;
/**
* @author werpu2
@@ -59,7 +57,7 @@
public String addEntry2 () {
getLog().info("adding entry2");
- BlogService service = (BlogService) JSFUtil.resolveVariable("javaBlogService");
+ BlogService service = (BlogService) resolveVariable("javaBlogService");
if (service == null) {
Copied: myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/JSFUtilJava.java (from r903374, myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/JSFUtil.java)
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/JSFUtilJava.java?p2=myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/JSFUtilJava.java&p1=myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/JSFUtil.java&r1=903374&r2=903375&rev=903375&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/JSFUtil.java (original)
+++ myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/JSFUtilJava.java Tue Jan 26 19:18:38 2010
@@ -31,9 +31,11 @@
* <p/>
* A helper for JSF and introspection related tasks
*/
-public class JSFUtil {
+public class JSFUtilJava {
- public JSFUtil() {
+
+
+ public JSFUtilJava() {
}
/**
@@ -43,7 +45,8 @@
* @return
*/
public static Object resolveVariable(String beanName) {
- Log log = LogFactory.getLog(JSFUtil.class);
+
+ Log log = LogFactory.getLog(JSFUtilJava.class);
Object facesContext = FacesContext.getCurrentInstance();
Object elContext = executeMethod(facesContext, "getELContext");
@@ -58,6 +61,7 @@
+
*/
//we use the introspection calls here to achieve our goal that way
//we can shift the dependency resolution from compile time to runtime
Propchange: myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/JSFUtilJava.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/JSFUtilJava.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/componentTest/JavaTestComponent.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/componentTest/JavaTestComponent.java?rev=903375&r1=903374&r2=903375&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/componentTest/JavaTestComponent.java (original)
+++ myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/componentTest/JavaTestComponent.java Tue Jan 26 19:18:38 2010
@@ -106,8 +106,7 @@
public class JavaTestComponent extends UIInput implements Markable {
String _testAttr;
-
-
+
enum PropertyKeys {
inc, testAttr, testAttr2, testAttr3, testAttr4
}
Modified: myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/componentTest/JavaTestRenderer1.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/componentTest/JavaTestRenderer1.java?rev=903375&r1=903374&r2=903375&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/componentTest/JavaTestRenderer1.java (original)
+++ myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/componentTest/JavaTestRenderer1.java Tue Jan 26 19:18:38 2010
@@ -42,18 +42,15 @@
* class to the other
*/
@FacesRenderer(componentFamily = "javax.faces.Input", rendererType = "at.irian.JavaTestRenderer")
-public class JavaTestRenderer1 extends HtmlTextRendererBase {
+ public class JavaTestRenderer1 extends HtmlTextRendererBase {
static Log log = LogFactory.getLog(JavaTestRenderer1.class);
-
- private static final String MSG2 = "aaaa Hello world from Renderer 1";
+ private static final String MSG2 = "Hello world from Renderer 1";
public void encodeBegin(FacesContext context, UIComponent component) throws IOException {
super.encodeBegin(context, component);
JavaTestComponent myComponent = (JavaTestComponent) component;
-
-
ResponseWriter writer = context.getResponseWriter();
test(myComponent, writer);
Modified: myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/componentTest/JavaTestRenderer2.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/componentTest/JavaTestRenderer2.java?rev=903375&r1=903374&r2=903375&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/componentTest/JavaTestRenderer2.java (original)
+++ myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/componentTest/JavaTestRenderer2.java Tue Jan 26 19:18:38 2010
@@ -33,7 +33,7 @@
*/
public class JavaTestRenderer2 extends HtmlTextareaRendererBase {
- private static final String MSG = "aaa Hello world from Renderer 2";
+ private static final String MSG = "Hello world from Renderer 2";
private static final String MSG2 = " hello world second var";
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=903375&r1=903374&r2=903375&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 Jan 26 19:18:38 2010
@@ -23,7 +23,6 @@
<description>MyProject web.xml</description>
-
<context-param>
<description>
Initializes the plugins for our groovy handlers
@@ -31,7 +30,8 @@
<param-name>org.apache.myfaces.FACES_INIT_PLUGINS</param-name>
<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
@@ -69,7 +69,7 @@
<param-name>facelets.RESOURCE_RESOLVER</param-name>
<param-value>org.apache.myfaces.scripting.facelet.ReroutingResourceResolver</param-value>
</context-param>
-
+ -->
<!--
<context-param>
<description>Additional comma separated loader paths to allow direct editing on the sources directory instead