You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by gp...@apache.org on 2010/09/17 13:20:28 UTC

svn commit: r998074 - in /myfaces/extensions/cdi/trunk: examples/jsf-examples/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/examples/codi/jsf12/scripting/ jse-modules/scripting-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/scr...

Author: gpetracek
Date: Fri Sep 17 11:20:27 2010
New Revision: 998074

URL: http://svn.apache.org/viewvc?rev=998074&view=rev
Log:
EXTCDI-54 and EXTCDI-56 minor refactoring and optional support for external expressions

Modified:
    myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/examples/codi/jsf12/scripting/ServerSideScriptingBean.java
    myfaces/extensions/cdi/trunk/jse-modules/scripting-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/scripting/impl/util/ScriptingUtils.java

Modified: myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/examples/codi/jsf12/scripting/ServerSideScriptingBean.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/examples/codi/jsf12/scripting/ServerSideScriptingBean.java?rev=998074&r1=998073&r2=998074&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/examples/codi/jsf12/scripting/ServerSideScriptingBean.java (original)
+++ myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/examples/codi/jsf12/scripting/ServerSideScriptingBean.java Fri Sep 17 11:20:27 2010
@@ -52,11 +52,11 @@ public class ServerSideScriptingBean
     @ScriptLanguage(JavaScript.class)
     private ScriptEngine scriptEngine;
 
-    Double result1;
-    Double result2;
-    Double result3;
-    Double dynResult;
-    Double manualResult;
+    private Double result1;
+    private Double result2;
+    private Double result3;
+    private Double dynResult;
+    private Double manualResult;
 
     @PostConstruct
     protected void init()

Modified: myfaces/extensions/cdi/trunk/jse-modules/scripting-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/scripting/impl/util/ScriptingUtils.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jse-modules/scripting-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/scripting/impl/util/ScriptingUtils.java?rev=998074&r1=998073&r2=998074&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jse-modules/scripting-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/scripting/impl/util/ScriptingUtils.java (original)
+++ myfaces/extensions/cdi/trunk/jse-modules/scripting-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/scripting/impl/util/ScriptingUtils.java Fri Sep 17 11:20:27 2010
@@ -56,7 +56,7 @@ public class ScriptingUtils
     public static ExternalExpressionInterpreter resolveExternalExpressionInterpreter()
     {
         ExternalExpressionInterpreter externalExpressionInterpreter =
-                CodiUtils.getOrCreateScopedInstanceOfBeanByClass(ExternalExpressionInterpreter.class);
+                CodiUtils.getOrCreateScopedInstanceOfBeanByClass(ExternalExpressionInterpreter.class, true);
 
         return externalExpressionInterpreter != null ?
                 externalExpressionInterpreter :