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/02/16 17:42:26 UTC
svn commit: r910588 - in /myfaces/extensions/scripting/trunk:
core/core/src/main/java/org/apache/myfaces/scripting/api/
core/myfaces12-extensions/src/main/java/org/apache/myfaces/scripting/servlet/
core/myfaces2-extensions/src/main/java/org/apache/myfa...
Author: werpu
Date: Tue Feb 16 16:42:25 2010
New Revision: 910588
URL: http://svn.apache.org/viewvc?rev=910588&view=rev
Log:
https://issues.apache.org/jira/browse/EXTSCRIPT-65
adding new configuration entries for our new functionality which is needed for bigger systems
Modified:
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/Configuration.java
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/ScriptingConst.java
myfaces/extensions/scripting/trunk/core/myfaces12-extensions/src/main/java/org/apache/myfaces/scripting/servlet/StartupServletContextPluginChainLoader.java
myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/servlet/StartupServletContextPluginChainLoader.java
myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/faces-config.xml
Modified: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/Configuration.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/Configuration.java?rev=910588&r1=910587&r2=910588&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/Configuration.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/Configuration.java Tue Feb 16 16:42:25 2010
@@ -42,6 +42,12 @@
volatile File _compileTarget = FileUtils.getTempDir();
+ boolean _initialCompile = true;
+
+ List<String> _packageWhiteList = new LinkedList<String>();
+
+ List<String> _additionalClassPath = new LinkedList<String>();
+
/**
* we keep track of separate resource dirs
* for systems which can use resource loaders
@@ -75,4 +81,36 @@
public List<String> getResourceDirs() {
return _resourceDirs;
}
+
+ public boolean isInitialCompile() {
+ return _initialCompile;
+ }
+
+ public void setInitialCompile(boolean initialCompile) {
+ this._initialCompile = initialCompile;
+ }
+
+ public void addWhitelistPackage(String pkg) {
+ _packageWhiteList.add(pkg);
+ }
+
+ public List<String> getPackageWhiteList() {
+ return _packageWhiteList;
+ }
+
+ public void setPackageWhiteList(List<String> packageWhiteList) {
+ this._packageWhiteList = packageWhiteList;
+ }
+
+ public void addAdditionalClassPath(String path) {
+ _additionalClassPath.add(path);
+ }
+
+ public List<String> getAdditionalClassPath() {
+ return _additionalClassPath;
+ }
+
+ public void setAdditionalClassPath(List<String> additionalClassPath) {
+ this._additionalClassPath = additionalClassPath;
+ }
}
Modified: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/ScriptingConst.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/ScriptingConst.java?rev=910588&r1=910587&r2=910588&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/ScriptingConst.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/ScriptingConst.java Tue Feb 16 16:42:25 2010
@@ -30,6 +30,11 @@
public static final String SCRIPTING_GROOVFACTORY = "org.apache.myfaces.SCRIPTING_GROOVYFACTORY";
public static final String SCRIPTING_REQUSINGLETON = "org.apache.myfaces.SCRIPTING_REQUSINGLETON";
+ public static final String SCRIPTING_PACKAGE_WHITELIST = "org.apache.myfaces.SCRIPTING_PGK_WHITELIST";
+ public static final String SCRIPTING_ADDITIONAL_CLASSPATH = "org.apache.myfaces.SCRIPTING_ADDITIONAL_CLASSPATH";
+
+ public static final String CONTEXT_VALUE_DIVIDER = ",";
+
public static final String RELOAD_MAP = "reloadMap";
public static final String SESS_BEAN_REFRESH_TIMER = "sessbeanrefrsh";
Modified: myfaces/extensions/scripting/trunk/core/myfaces12-extensions/src/main/java/org/apache/myfaces/scripting/servlet/StartupServletContextPluginChainLoader.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/myfaces12-extensions/src/main/java/org/apache/myfaces/scripting/servlet/StartupServletContextPluginChainLoader.java?rev=910588&r1=910587&r2=910588&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/myfaces12-extensions/src/main/java/org/apache/myfaces/scripting/servlet/StartupServletContextPluginChainLoader.java (original)
+++ myfaces/extensions/scripting/trunk/core/myfaces12-extensions/src/main/java/org/apache/myfaces/scripting/servlet/StartupServletContextPluginChainLoader.java Tue Feb 16 16:42:25 2010
@@ -18,12 +18,12 @@
*/
package org.apache.myfaces.scripting.servlet;
-
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.myfaces.scripting.api.Configuration;
+import org.apache.myfaces.scripting.core.util.Strategy;
import org.apache.myfaces.webapp.StartupListener;
import org.apache.myfaces.scripting.core.util.ClassUtils;
import org.apache.myfaces.scripting.core.util.WeavingContext;
@@ -48,7 +48,6 @@
public class StartupServletContextPluginChainLoader implements StartupListener {
final Log log = LogFactory.getLog(this.getClass());
-
public void preInit(ServletContextEvent servletContextEvent) {
log.info("[EXT-SCRIPTING] Instantiating StartupServletContextPluginChainLoader");
@@ -66,7 +65,6 @@
initInitialCompileAndScan(weaver);
}
-
/**
* initiates the first compile and scan in the subsystem
*
@@ -126,15 +124,46 @@
* @param servletContext the applications servlet context
*/
private void initConfig(ServletContext servletContext) {
- Configuration conf = new Configuration();
+ final Configuration conf = new Configuration();
servletContext.setAttribute(ScriptingConst.CTX_CONFIGURATION, conf);
WeavingContext.setConfiguration(conf);
//we now add the resource loader path here
- String resourceDirs = servletContext.getInitParameter(ScriptingConst.INIT_PARAM_RESOURCE_PATH);
- if (!StringUtils.isBlank(resourceDirs)) {
- String[] splittedResourceDirs = resourceDirs.split(",");
- for (String resourceDir : splittedResourceDirs) {
- conf.addResourceDir(resourceDir);
+
+ /*
+ * we define a set of closures (inner classes) which make
+ * our code more reusable we define a strategy
+ * for each comma delimited set of values
+ */
+ Strategy addResourceDirStrategy = new Strategy() {
+ public void apply(Object element) {
+ conf.addResourceDir((String) element);
+ }
+ };
+ Strategy addAdditionalClassPathStrategy = new Strategy() {
+ public void apply(Object element) {
+ conf.addAdditionalClassPath((String) element);
+ }
+ };
+ Strategy addWhiteListPackageStrategy = new Strategy() {
+ public void apply(Object element) {
+ conf.addWhitelistPackage((String) element);
+ }
+ };
+
+ /**
+ * We now apply the values into our own lists
+ */
+ applyEntries(servletContext.getInitParameter(ScriptingConst.INIT_PARAM_RESOURCE_PATH), addResourceDirStrategy);
+ applyEntries(servletContext.getInitParameter(ScriptingConst.INIT_PARAM_RESOURCE_PATH), addAdditionalClassPathStrategy);
+ applyEntries(servletContext.getInitParameter(ScriptingConst.INIT_PARAM_RESOURCE_PATH), addWhiteListPackageStrategy);
+
+ }
+
+ private void applyEntries(String val, Strategy strategy) {
+ if (!StringUtils.isBlank(val)) {
+ String[] splittedVal = val.split(ScriptingConst.CONTEXT_VALUE_DIVIDER);
+ for (String singleVal : splittedVal) {
+ strategy.apply(singleVal);
}
}
}
Modified: myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/servlet/StartupServletContextPluginChainLoader.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/servlet/StartupServletContextPluginChainLoader.java?rev=910588&r1=910587&r2=910588&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/servlet/StartupServletContextPluginChainLoader.java (original)
+++ myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/servlet/StartupServletContextPluginChainLoader.java Tue Feb 16 16:42:25 2010
@@ -18,7 +18,6 @@
*/
package org.apache.myfaces.scripting.servlet;
-
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -26,6 +25,7 @@
import org.apache.myfaces.scripting.api.ScriptingConst;
import org.apache.myfaces.scripting.api.ScriptingWeaver;
import org.apache.myfaces.scripting.core.util.ClassUtils;
+import org.apache.myfaces.scripting.core.util.Strategy;
import org.apache.myfaces.scripting.core.util.WeavingContext;
import org.apache.myfaces.scripting.refresh.RefreshContext;
import org.apache.myfaces.webapp.StartupListener;
@@ -47,7 +47,6 @@
public class StartupServletContextPluginChainLoader implements StartupListener {
final Log log = LogFactory.getLog(this.getClass());
-
public void preInit(ServletContextEvent servletContextEvent) {
log.info("[EXT-SCRIPTING] Instantiating StartupServletContextPluginChainLoader");
@@ -65,7 +64,6 @@
initInitialCompileAndScan(weaver);
}
-
/**
* initiates the first compile and scan in the subsystem
*
@@ -125,15 +123,46 @@
* @param servletContext the applications servlet context
*/
private void initConfig(ServletContext servletContext) {
- Configuration conf = new Configuration();
+ final Configuration conf = new Configuration();
servletContext.setAttribute(ScriptingConst.CTX_CONFIGURATION, conf);
WeavingContext.setConfiguration(conf);
+ //we now add the resource loader path here
+
+ /*
+ * we define a set of closures (inner classes) which make
+ * our code more reusable we define a strategy
+ * for each comma delimited set of values
+ */
+ Strategy addResourceDirStrategy = new Strategy() {
+ public void apply(Object element) {
+ conf.addResourceDir((String) element);
+ }
+ };
+ Strategy addAdditionalClassPathStrategy = new Strategy() {
+ public void apply(Object element) {
+ conf.addAdditionalClassPath((String) element);
+ }
+ };
+ Strategy addWhiteListPackageStrategy = new Strategy() {
+ public void apply(Object element) {
+ conf.addWhitelistPackage((String) element);
+ }
+ };
+
+ /**
+ * We now apply the values into our own lists
+ */
+ applyEntries(servletContext.getInitParameter(ScriptingConst.INIT_PARAM_RESOURCE_PATH), addResourceDirStrategy);
+ applyEntries(servletContext.getInitParameter(ScriptingConst.INIT_PARAM_RESOURCE_PATH), addAdditionalClassPathStrategy);
+ applyEntries(servletContext.getInitParameter(ScriptingConst.INIT_PARAM_RESOURCE_PATH), addWhiteListPackageStrategy);
+
+ }
- String resourceDirs = servletContext.getInitParameter(ScriptingConst.INIT_PARAM_RESOURCE_PATH);
- if (!StringUtils.isBlank(resourceDirs)) {
- String[] splittedResourceDirs = resourceDirs.split(",");
- for (String resourceDir : splittedResourceDirs) {
- conf.addResourceDir(resourceDir);
+ private void applyEntries(String val, Strategy strategy) {
+ if (!StringUtils.isBlank(val)) {
+ String[] splittedVal = val.split(ScriptingConst.CONTEXT_VALUE_DIVIDER);
+ for (String singleVal : splittedVal) {
+ strategy.apply(singleVal);
}
}
}
Modified: myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/faces-config.xml?rev=910588&r1=910587&r2=910588&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/faces-config.xml (original)
+++ myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/faces-config.xml Tue Feb 16 16:42:25 2010
@@ -109,10 +109,6 @@
<component-class>org.apache.myfaces.groovyloader.test.TestComponent</component-class>
</component>
-
-
-
-
<render-kit>
<renderer>
<component-family>javax.faces.Input</component-family>