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/03/03 16:45:24 UTC
svn commit: r918525 [1/2] - in /myfaces/extensions/scripting/trunk:
core/core-java6/src/main/java/org/apache/myfaces/scripting/loaders/java/jsr199/
core/core-java6/src/test/java/org/apache/myfaces/javaloader/core/compilerTest/
core/core/src/main/java/o...
Author: werpu
Date: Wed Mar 3 15:45:22 2010
New Revision: 918525
URL: http://svn.apache.org/viewvc?rev=918525&view=rev
Log:
https://issues.apache.org/jira/browse/EXTSCRIPT-81
https://issues.apache.org/jira/browse/EXTSCRIPT-83
we moved the detection code from the bean handler now into the el resolver to manage more complex el based relationships between beans which we could not detect on class level, we also improved the filtering system a little bit to reserve a full
JSF namespace to be able to trigger the filters independend of the compiler used
The bean handler has been reduced significantly in size as well
Added:
myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/elResolverTest/
myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/elResolverTest/BeanFactory.java (with props)
myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/elResolverTest/MyBean.java (with props)
myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/elResolverTest/Receiver.java (with props)
myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/elResolverTest/SecondaryBean.java (with props)
myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/complexBean.xhtml
Modified:
myfaces/extensions/scripting/trunk/core/core-java6/src/main/java/org/apache/myfaces/scripting/loaders/java/jsr199/JSR199Compiler.java
myfaces/extensions/scripting/trunk/core/core-java6/src/test/java/org/apache/myfaces/javaloader/core/compilerTest/TestCompilerAPI.java
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/BaseWeaver.java
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/MyFacesBeanHandler.java
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/ScriptingConst.java
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/components/CompilerComponent.java
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/components/CompilerComponentRenderer.java
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/CoreWeaver.java
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/DummyWeaver.java
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/dependencyScan/core/ClassScanUtils.java
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/dependencyScan/filter/ScanIdentifierFilter.java
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/dependencyScan/filter/StandardNamespaceFilter.java
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/dependencyScan/registry/DependencyRegistryImpl.java
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/groovy/DynamicClassIdentifier.java
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/groovy/GroovyDependencyScanner.java
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/groovy/GroovyScriptingWeaver.java
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/groovy/compiler/GroovyCompiler.java
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/groovy/compiler/GroovyCompilerFacade.java
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/java/DynamicClassIdentifier.java
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/java/JavaDependencyScanner.java
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/java/JavaScriptingWeaver.java
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/java/compiler/CompilerFacade.java
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/java/compiler/JavacCompiler.java
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/refresh/RefreshContext.java
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/refresh/ReloadingMetadata.java
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/sandbox/compiler/GroovyCompiler.java
myfaces/extensions/scripting/trunk/core/core/src/test/java/org/apache/myfaces/extensions/scripting/dependencyScan/DependencyScannerTest.java
myfaces/extensions/scripting/trunk/core/core/src/test/java/org/apache/myfaces/extensions/scripting/dependencyScan/FilterTest.java
myfaces/extensions/scripting/trunk/core/core/src/test/java/org/apache/myfaces/extensions/scripting/groovyCompiler/GroovyCompilerTest.java
myfaces/extensions/scripting/trunk/core/core/src/test/java/org/apache/myfaces/scripting/core/compilerTest/TestCompilerAPI.java
myfaces/extensions/scripting/trunk/core/core/src/test/java/org/apache/myfaces/scripting/core/refreshContext/RefreshContextTest.java
myfaces/extensions/scripting/trunk/core/myfaces12-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/ELResolverProxy.java
myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/ELResolverProxy.java
myfaces/extensions/scripting/trunk/examples/myfaces20-example/pom.xml
myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/faces-config.xml
myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/template.xhtml
Modified: myfaces/extensions/scripting/trunk/core/core-java6/src/main/java/org/apache/myfaces/scripting/loaders/java/jsr199/JSR199Compiler.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core-java6/src/main/java/org/apache/myfaces/scripting/loaders/java/jsr199/JSR199Compiler.java?rev=918525&r1=918524&r2=918525&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core-java6/src/main/java/org/apache/myfaces/scripting/loaders/java/jsr199/JSR199Compiler.java (original)
+++ myfaces/extensions/scripting/trunk/core/core-java6/src/main/java/org/apache/myfaces/scripting/loaders/java/jsr199/JSR199Compiler.java Wed Mar 3 15:45:22 2010
@@ -98,7 +98,7 @@
} catch (ClassNotFoundException e) {
throw new CompilationException(e);
}
- return WeavingContext.getCompilationResult(ScriptingConst.ENGINE_TYPE_JAVA);
+ return WeavingContext.getCompilationResult(ScriptingConst.ENGINE_TYPE_JSF_JAVA);
}
@@ -121,7 +121,7 @@
getLog().info("[EXT-SCRIPTING] Doing a full recompile");
- List<File> sourceFiles = FileUtils.fetchSourceFiles(WeavingContext.getConfiguration().getWhitelistedSourceDirs(ScriptingConst.ENGINE_TYPE_JAVA), CompilerConst.JAVA_WILDCARD);
+ List<File> sourceFiles = FileUtils.fetchSourceFiles(WeavingContext.getConfiguration().getWhitelistedSourceDirs(ScriptingConst.ENGINE_TYPE_JSF_JAVA), CompilerConst.JAVA_WILDCARD);
Iterable<? extends JavaFileObject> fileObjects = fileManager.getJavaFileObjects(sourceFiles.toArray(new File[sourceFiles.size()]));
String[] options = new String[]{CompilerConst.JC_CLASSPATH, fileManager.getClassPath(), CompilerConst.JC_TARGET_PATH, WeavingContext.getConfiguration().getCompileTarget().getAbsolutePath(), CompilerConst.JC_SOURCEPATH, sourceRoot.getAbsolutePath(), CompilerConst.JC_DEBUG};
javaCompiler.getTask(null, fileManager, diagnosticCollector, Arrays.asList(options), null, fileObjects).call();
@@ -130,7 +130,7 @@
} catch (ClassNotFoundException e) {
throw new CompilationException(e);
}
- return WeavingContext.getCompilationResult(ScriptingConst.ENGINE_TYPE_JAVA);
+ return WeavingContext.getCompilationResult(ScriptingConst.ENGINE_TYPE_JSF_JAVA);
}
/**
@@ -153,11 +153,11 @@
result.getErrors().add(new CompilationResult.CompilationMessage(diagnostic.getLineNumber(), diagnostic.getMessage(Locale.getDefault())));
errors.append(error);
}
- WeavingContext.setCompilationResult(ScriptingConst.ENGINE_TYPE_JAVA, result);
+ WeavingContext.setCompilationResult(ScriptingConst.ENGINE_TYPE_JSF_JAVA, result);
throw new ClassNotFoundException("Compile error of java file:" + errors.toString());
} else {
- WeavingContext.setCompilationResult(ScriptingConst.ENGINE_TYPE_JAVA, new CompilationResult(""));
+ WeavingContext.setCompilationResult(ScriptingConst.ENGINE_TYPE_JSF_JAVA, new CompilationResult(""));
}
}
Modified: myfaces/extensions/scripting/trunk/core/core-java6/src/test/java/org/apache/myfaces/javaloader/core/compilerTest/TestCompilerAPI.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core-java6/src/test/java/org/apache/myfaces/javaloader/core/compilerTest/TestCompilerAPI.java?rev=918525&r1=918524&r2=918525&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core-java6/src/test/java/org/apache/myfaces/javaloader/core/compilerTest/TestCompilerAPI.java (original)
+++ myfaces/extensions/scripting/trunk/core/core-java6/src/test/java/org/apache/myfaces/javaloader/core/compilerTest/TestCompilerAPI.java Wed Mar 3 15:45:22 2010
@@ -23,7 +23,6 @@
import org.apache.myfaces.scripting.api.Configuration;
import org.apache.myfaces.scripting.api.DynamicCompiler;
import org.apache.myfaces.scripting.api.ScriptingConst;
-import org.apache.myfaces.scripting.core.util.ReflectUtil;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
@@ -73,7 +72,7 @@
root = new File(rootPath);
WeavingContext.setConfiguration(new Configuration());
- WeavingContext.getConfiguration().addSourceDir(ScriptingConst.ENGINE_TYPE_JAVA, root.getAbsolutePath());
+ WeavingContext.getConfiguration().addSourceDir(ScriptingConst.ENGINE_TYPE_JSF_JAVA, root.getAbsolutePath());
}
private String getScriptingFacadeClass(boolean allowJSR199) {
@@ -93,7 +92,7 @@
@Test
public void testWhiteListedCompile() {
- //WeavingContext.getConfiguration().getWhitelistedSourceDirs(ScriptingConst.ENGINE_TYPE_JAVA).clear();
+ //WeavingContext.getConfiguration().getWhitelistedSourceDirs(ScriptingConst.ENGINE_TYPE_JSF_JAVA).clear();
WeavingContext.getConfiguration().addWhitelistPackage("compiler.myPackage");
try {
Modified: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/BaseWeaver.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/BaseWeaver.java?rev=918525&r1=918524&r2=918525&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/BaseWeaver.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/BaseWeaver.java Wed Mar 3 15:45:22 2010
@@ -71,7 +71,7 @@
Logger _log = Logger.getLogger(this.getClass().getName());
private String _fileEnding = null;
- private int _scriptingEngine = ScriptingConst.ENGINE_TYPE_NO_ENGINE;
+ private int _scriptingEngine = ScriptingConst.ENGINE_TYPE_JSF_NO_ENGINE;
public BaseWeaver() {
_reloadingStrategy = new GlobalReloadingStrategy(this);
@@ -411,7 +411,7 @@
//no refresh needed because this is done in the case of java already by
//the classloader
// if (retVal != null) {
- // refreshReloadingMetaData(sourceRoot, file, currentClassFile, retVal, ScriptingConst.ENGINE_TYPE_JAVA);
+ // refreshReloadingMetaData(sourceRoot, file, currentClassFile, retVal, ScriptingConst.ENGINE_TYPE_JSF_JAVA);
// }
/**
Modified: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/MyFacesBeanHandler.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/MyFacesBeanHandler.java?rev=918525&r1=918524&r2=918525&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/MyFacesBeanHandler.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/MyFacesBeanHandler.java Wed Mar 3 15:45:22 2010
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.apache.myfaces.scripting.api;
import org.apache.myfaces.config.RuntimeConfig;
@@ -5,6 +23,7 @@
import org.apache.myfaces.config.element.ManagedBean;
import org.apache.myfaces.config.element.MapEntries;
import org.apache.myfaces.config.impl.digester.elements.ManagedProperty;
+import org.apache.myfaces.scripting.core.dependencyScan.filter.StandardNamespaceFilter;
import org.apache.myfaces.scripting.core.util.ReflectUtil;
import org.apache.myfaces.scripting.core.util.WeavingContext;
import org.apache.myfaces.scripting.refresh.RefreshContext;
@@ -19,16 +38,6 @@
* Bean handler implementation
* which encapsulates the myfaces specific parts
* of the bean processing
- * <p/>
- * <p/>
- * TODO bug multiuser handling not yet working
- * due to tainted being reset for beans once the
- * first user has run through the refresh,
- * others do not drop their code...
- * <p/>
- * we need a bean taint history so that
- * users refreshing get a blend of all tainted classes
- * since their last local refresh
*/
public class MyFacesBeanHandler implements BeanHandler {
@@ -36,8 +45,12 @@
* scripting engine for this bean handler
*/
int _scriptingEngine;
- private static final String JAVA_POINT = "java.";
- private static final String JAVAX_POINT = "javax.";
+
+ /**
+ * standard filter used internally
+ * by various methods
+ */
+ private static StandardNamespaceFilter STD_NAMESPACE_FILTER = new StandardNamespaceFilter();
/**
* constructor
@@ -60,98 +73,8 @@
* types, this is a corner case but it still can happen)
*/
public void scanDependencies() {
- if (FacesContext.getCurrentInstance() == null) {
- return;
- }
- //TODO make this enabled also if the facesContext is not yet fully active
- Map<String, ManagedBean> mbeans = RuntimeConfig.getCurrentInstance(FacesContext.getCurrentInstance().getExternalContext()).getManagedBeans();
- Map<String, ManagedBean> mbeansSnapshotView;
-
- synchronized (RefreshContext.BEAN_SYNC_MONITOR) {
- mbeansSnapshotView = makeSnapshot(mbeans);
- }
-
- Collection<String> dynamicClasses = WeavingContext.getWeaver().loadPossibleDynamicClasses();
-
- for (Map.Entry<String, ManagedBean> entry : mbeansSnapshotView.entrySet()) {
- Object retVal = ReflectUtil.executeMethod(entry.getValue(), "getManagedProperties");
- Iterator it = null;
- if (retVal instanceof Collection) {
- //Myfaces 2.x
- it = ((Collection) retVal).iterator();
- } else {
- //older versions
- it = (Iterator) retVal;
- }
-
- //create dependency graph on IOC level, to cover areas where
- //the class dependency cannot work (object-object dependencies,
- // source->binary->source references on call level
- while (it.hasNext()) {
- ManagedProperty prop = (ManagedProperty) it.next();
- String propClass = prop.getPropertyClass();
- handleObjectDependency(dynamicClasses, entry.getValue().getManagedBeanClassName(), propClass);
- handleListEntries(dynamicClasses, entry);
- handleMapEntries(dynamicClasses, entry);
- }
- }
- }
-
- /**
- * check managed property maps
- * for dependencies into other beans
- *
- * @param dynamicClasses the set of known dynamic classes
- * @param entry the current managed bean descriptor
- */
- private void handleMapEntries(Collection<String> dynamicClasses, Map.Entry<String, ManagedBean> entry) {
- MapEntries entries = entry.getValue().getMapEntries();
- if (entries != null) {
- Iterator iter = entries.getMapEntries();
- while (iter.hasNext()) {
- Object value = ((Map.Entry) iter.next()).getValue();
- String valueClass = value.getClass().getName();
- if (valueClass.startsWith(JAVA_POINT) || valueClass.startsWith(JAVAX_POINT)) {
- continue;
- }
- handleObjectDependency(dynamicClasses, entry.getValue().getManagedBeanClassName(), valueClass);
- }
- }
- }
- /**
- * check list entries of the managed bean facility
- * for dependencies into other beans
- *
- * @param dynamicClasses the set of known dynamic classes to build the dependencies upon
- * @param entry the current managed bean descriptor
- */
- private void handleListEntries(Collection<String> dynamicClasses, Map.Entry<String, ManagedBean> entry) {
- ListEntries entries = entry.getValue().getListEntries();
- if (entries != null) {
- Iterator iter = entries.getListEntries();
- while (iter.hasNext()) {
- Object value = iter.next();
- String valueClass = value.getClass().getName();
- if (valueClass.startsWith(JAVA_POINT) || valueClass.startsWith(JAVAX_POINT)) {
- continue;
- }
- handleObjectDependency(dynamicClasses, entry.getValue().getManagedBeanClassName(), valueClass);
- }
- }
- }
- /**
- * handle an intra bean object to object dependency
- *
- * @param dynamicClasses the collection of known dynamic classes
- * @param beanClassName the managed bean class name
- * @param managedPropertyClassName the class name of the managed property
- */
- private void handleObjectDependency(Collection<String> dynamicClasses, String beanClassName, String managedPropertyClassName) {
- if (dynamicClasses.contains(managedPropertyClassName)) {
- WeavingContext.getFileChangedDaemon().getDependencyMap().addDependency(beanClassName, managedPropertyClassName);
- }
}
/**
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=918525&r1=918524&r2=918525&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 Wed Mar 3 15:45:22 2010
@@ -40,10 +40,10 @@
public static final int TAINT_INTERVAL = 2000;
- public static final int ENGINE_TYPE_ALL = -2;
- public static final int ENGINE_TYPE_NO_ENGINE = -1;
- public static final int ENGINE_TYPE_GROOVY = 0;
- public static final int ENGINE_TYPE_JAVA = 1;
+ public static final int ENGINE_TYPE_JSF_ALL = -2;
+ public static final int ENGINE_TYPE_JSF_NO_ENGINE = -1;
+ public static final int ENGINE_TYPE_JSF_GROOVY = 0;
+ public static final int ENGINE_TYPE_JSF_JAVA = 1;
public static final int ARTIFACT_TYPE_UNKNOWN = -1;
public static final int ARTIFACT_TYPE_MANAGEDBEAN = 1;
public static final int ARTIFACT_TYPE_MANAGEDPROPERTY = 2;
Modified: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/components/CompilerComponent.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/components/CompilerComponent.java?rev=918525&r1=918524&r2=918525&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/components/CompilerComponent.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/components/CompilerComponent.java Wed Mar 3 15:45:22 2010
@@ -79,16 +79,16 @@
public Integer getScriptingLanguageAsInt() {
if (StringUtils.isBlank(_scriptingLanguage)) {
- return ScriptingConst.ENGINE_TYPE_ALL;
+ return ScriptingConst.ENGINE_TYPE_JSF_ALL;
} else {
String scriptingLanguage = _scriptingLanguage.toLowerCase().trim();
if (scriptingLanguage.equals("java")) {
- return ScriptingConst.ENGINE_TYPE_JAVA;
+ return ScriptingConst.ENGINE_TYPE_JSF_JAVA;
} else if (_scriptingLanguage.toLowerCase().trim().equals("groovy")) {
- return ScriptingConst.ENGINE_TYPE_GROOVY;
+ return ScriptingConst.ENGINE_TYPE_JSF_GROOVY;
}
}
- return ScriptingConst.ENGINE_TYPE_NO_ENGINE;
+ return ScriptingConst.ENGINE_TYPE_JSF_NO_ENGINE;
}
public void setScriptingLanguage(String scriptingLanguage) {
Modified: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/components/CompilerComponentRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/components/CompilerComponentRenderer.java?rev=918525&r1=918524&r2=918525&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/components/CompilerComponentRenderer.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/components/CompilerComponentRenderer.java Wed Mar 3 15:45:22 2010
@@ -47,26 +47,26 @@
Integer scriptingLanguage = compilerComp.getScriptingLanguageAsInt();
CompilationResult result = null;
switch (scriptingLanguage) {
- case ScriptingConst.ENGINE_TYPE_JAVA:
- result = WeavingContext.getCompilationResult(ScriptingConst.ENGINE_TYPE_JAVA);
+ case ScriptingConst.ENGINE_TYPE_JSF_JAVA:
+ result = WeavingContext.getCompilationResult(ScriptingConst.ENGINE_TYPE_JSF_JAVA);
break;
- case ScriptingConst.ENGINE_TYPE_GROOVY:
- result = WeavingContext.getCompilationResult(ScriptingConst.ENGINE_TYPE_JAVA);
+ case ScriptingConst.ENGINE_TYPE_JSF_GROOVY:
+ result = WeavingContext.getCompilationResult(ScriptingConst.ENGINE_TYPE_JSF_JAVA);
break;
- case ScriptingConst.ENGINE_TYPE_ALL:
+ case ScriptingConst.ENGINE_TYPE_JSF_ALL:
result = new CompilationResult("");
- CompilationResult tempResult = WeavingContext.getCompilationResult(ScriptingConst.ENGINE_TYPE_JAVA);
+ CompilationResult tempResult = WeavingContext.getCompilationResult(ScriptingConst.ENGINE_TYPE_JSF_JAVA);
if (tempResult != null) {
copyCompilationResult(result, tempResult);
}
- tempResult = WeavingContext.getCompilationResult(ScriptingConst.ENGINE_TYPE_GROOVY);
+ tempResult = WeavingContext.getCompilationResult(ScriptingConst.ENGINE_TYPE_JSF_GROOVY);
if (tempResult != null) {
copyCompilationResult(result, tempResult);
}
break;
- case ScriptingConst.ENGINE_TYPE_NO_ENGINE:
+ case ScriptingConst.ENGINE_TYPE_JSF_NO_ENGINE:
Logger log = Logger.getLogger(this.getClass().getName());
log.warning("Warning engine not found");
break;
Modified: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/CoreWeaver.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/CoreWeaver.java?rev=918525&r1=918524&r2=918525&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/CoreWeaver.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/CoreWeaver.java Wed Mar 3 15:45:22 2010
@@ -81,7 +81,7 @@
}
public int getScriptingEngine() {
- return ScriptingConst.ENGINE_TYPE_ALL; //To change body of implemented methods use File | Settings | File Templates.
+ return ScriptingConst.ENGINE_TYPE_JSF_ALL; //To change body of implemented methods use File | Settings | File Templates.
}
public boolean isDynamic(Class clazz) {
Modified: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/DummyWeaver.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/DummyWeaver.java?rev=918525&r1=918524&r2=918525&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/DummyWeaver.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/DummyWeaver.java Wed Mar 3 15:45:22 2010
@@ -54,7 +54,7 @@
}
public int getScriptingEngine() {
- return ScriptingConst.ENGINE_TYPE_ALL;
+ return ScriptingConst.ENGINE_TYPE_JSF_ALL;
}
public boolean isDynamic(Class clazz) {
Modified: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/dependencyScan/core/ClassScanUtils.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/dependencyScan/core/ClassScanUtils.java?rev=918525&r1=918524&r2=918525&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/dependencyScan/core/ClassScanUtils.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/dependencyScan/core/ClassScanUtils.java Wed Mar 3 15:45:22 2010
@@ -53,7 +53,7 @@
* @param in the page or fully qualified classname
* @return true if it belongs to one of the standard namespaces, false if not
*/
- public static boolean isStandardNamespace(String in) {
+ public static final boolean isStandardNamespace(String in) {
//We don't use a regexp here, because an test has shown that direct startsWith is 5 times as fast as applying
//a precompiled regexp with match
@@ -89,7 +89,7 @@
* @return true if the namespace is within the boundaries of the whitelist false otherwise
*/
@SuppressWarnings("unused")
- public static boolean allowedNamespaces(String classOrPackage, String[] nameSpaces) {
+ public static final boolean allowedNamespaces(String classOrPackage, String[] nameSpaces) {
//ok this is probably the fastest way to iterate hence we use this old construct
//a direct or would be faster but we cannot do it here since we are not dynamic here
@@ -108,7 +108,7 @@
* @param internalClassName the internal class name
* @return the changed classname in its sourceform
*/
- public static String internalClassDescriptorToSource(String internalClassName) {
+ public static final String internalClassDescriptorToSource(String internalClassName) {
//we strip the meta information which is not needed
//aka start with ( strip all to )
@@ -146,7 +146,7 @@
* @param whiteList the whitelist of allowed dependencies
* @param parameters the list of dependencies which have to be added
*/
- public static void logParmList(Collection<String> dependencies, final Set<String> whiteList, final String... parameters) {
+ public static final void logParmList(Collection<String> dependencies, final Set<String> whiteList, final String... parameters) {
for (String singleParameter : parameters) {
if (singleParameter == null || singleParameter.trim().equals("") || isStandardNamespace(singleParameter)) continue;
Modified: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/dependencyScan/filter/ScanIdentifierFilter.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/dependencyScan/filter/ScanIdentifierFilter.java?rev=918525&r1=918524&r2=918525&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/dependencyScan/filter/ScanIdentifierFilter.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/dependencyScan/filter/ScanIdentifierFilter.java Wed Mar 3 15:45:22 2010
@@ -9,13 +9,18 @@
*/
public class ScanIdentifierFilter implements ClassFilter {
- private final int _engineType;
+ private final int [] _engineType;
- public ScanIdentifierFilter(int engineType) {
+ public ScanIdentifierFilter(int ... engineType) {
_engineType = engineType;
}
public boolean isAllowed(Integer identifier, String clazz) {
- return _engineType == identifier.intValue(); //To change body of implemented methods use File | Settings | File Templates.
+ int id = identifier.intValue();
+ for(int engineType: _engineType) {
+ boolean allowed = engineType == id;
+ if(allowed) return true;
+ }
+ return false;
}
}
Modified: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/dependencyScan/filter/StandardNamespaceFilter.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/dependencyScan/filter/StandardNamespaceFilter.java?rev=918525&r1=918524&r2=918525&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/dependencyScan/filter/StandardNamespaceFilter.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/dependencyScan/filter/StandardNamespaceFilter.java Wed Mar 3 15:45:22 2010
@@ -8,7 +8,7 @@
*/
public class StandardNamespaceFilter implements ClassFilter {
- public boolean isAllowed(Integer engineType, String clazz) {
+ public final boolean isAllowed(Integer engineType, String clazz) {
return !ClassScanUtils.isStandardNamespace(clazz);
}
}
Modified: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/dependencyScan/registry/DependencyRegistryImpl.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/dependencyScan/registry/DependencyRegistryImpl.java?rev=918525&r1=918524&r2=918525&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/dependencyScan/registry/DependencyRegistryImpl.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/dependencyScan/registry/DependencyRegistryImpl.java Wed Mar 3 15:45:22 2010
@@ -1,5 +1,6 @@
package org.apache.myfaces.scripting.core.dependencyScan.registry;
+import org.apache.myfaces.scripting.api.ScriptingConst;
import org.apache.myfaces.scripting.core.dependencyScan.api.ClassFilter;
import org.apache.myfaces.scripting.core.dependencyScan.core.ClassDependencies;
import org.apache.myfaces.scripting.core.dependencyScan.filter.ScanIdentifierFilter;
@@ -23,13 +24,13 @@
_dependencMap = dependencyMap;
_engineType = engineType;
- _filters.add(new ScanIdentifierFilter(_engineType));
+ _filters.add(new ScanIdentifierFilter(_engineType, ScriptingConst.ENGINE_TYPE_JSF_ALL, ScriptingConst.ENGINE_TYPE_JSF_NO_ENGINE));
_filters.add(new StandardNamespaceFilter());
}
public void clearFilters() {
_filters.clear();
- _filters.add(new ScanIdentifierFilter(_engineType));
+ _filters.add(new ScanIdentifierFilter(_engineType, ScriptingConst.ENGINE_TYPE_JSF_ALL, ScriptingConst.ENGINE_TYPE_JSF_NO_ENGINE));
_filters.add(new StandardNamespaceFilter());
}
Modified: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/groovy/DynamicClassIdentifier.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/groovy/DynamicClassIdentifier.java?rev=918525&r1=918524&r2=918525&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/groovy/DynamicClassIdentifier.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/groovy/DynamicClassIdentifier.java Wed Mar 3 15:45:22 2010
@@ -60,9 +60,9 @@
public int getEngineType(Class clazz) {
if (isDynamic(clazz)) {
- return ScriptingConst.ENGINE_TYPE_GROOVY;
+ return ScriptingConst.ENGINE_TYPE_JSF_GROOVY;
} else {
- return ScriptingConst.ENGINE_TYPE_NO_ENGINE;
+ return ScriptingConst.ENGINE_TYPE_JSF_NO_ENGINE;
}
}
}
Modified: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/groovy/GroovyDependencyScanner.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/groovy/GroovyDependencyScanner.java?rev=918525&r1=918524&r2=918525&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/groovy/GroovyDependencyScanner.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/groovy/GroovyDependencyScanner.java Wed Mar 3 15:45:22 2010
@@ -4,7 +4,6 @@
import org.apache.myfaces.scripting.api.ScriptingWeaver;
import org.apache.myfaces.scripting.core.util.WeavingContext;
import org.apache.myfaces.scripting.loaders.java.JavaDependencyScanner;
-import org.apache.myfaces.scripting.loaders.java.RecompiledClassLoader;
import org.apache.myfaces.scripting.loaders.java.ScannerClassloader;
/**
@@ -19,12 +18,12 @@
@Override
protected ClassLoader getClassLoader() {
//TODO move the temp dir handling into the configuration
- return new ScannerClassloader(Thread.currentThread().getContextClassLoader(), ScriptingConst.ENGINE_TYPE_GROOVY, ScriptingConst.FILE_EXTENSION_GROOVY, WeavingContext.getConfiguration().getCompileTarget());
+ return new ScannerClassloader(Thread.currentThread().getContextClassLoader(), ScriptingConst.ENGINE_TYPE_JSF_GROOVY, ScriptingConst.FILE_EXTENSION_GROOVY, WeavingContext.getConfiguration().getCompileTarget());
}
@Override
protected int getEngineType() {
- return ScriptingConst.ENGINE_TYPE_GROOVY;
+ return ScriptingConst.ENGINE_TYPE_JSF_GROOVY;
}
@Override
@@ -33,6 +32,6 @@
}
protected String getScanIdentifier() {
- return ScriptingConst.ENGINE_TYPE_GROOVY + "_Scan";
+ return ScriptingConst.ENGINE_TYPE_JSF_GROOVY + "_Scan";
}
}
Modified: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/groovy/GroovyScriptingWeaver.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/groovy/GroovyScriptingWeaver.java?rev=918525&r1=918524&r2=918525&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/groovy/GroovyScriptingWeaver.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/groovy/GroovyScriptingWeaver.java Wed Mar 3 15:45:22 2010
@@ -7,11 +7,7 @@
import org.apache.myfaces.scripting.core.util.ReflectUtil;
import org.apache.myfaces.extensions.scripting.loaders.groovy.compiler.GroovyCompilerFacade;
-import javax.faces.context.FacesContext;
import javax.servlet.ServletContext;
-import java.io.File;
-import java.util.Iterator;
-import java.util.Map;
/**
* A standard groovy weaver which isolates the weaving behavior
@@ -26,13 +22,13 @@
* @param servletContext
*/
public GroovyScriptingWeaver(ServletContext servletContext) {
- super(ScriptingConst.GROOVY_FILE_ENDING, ScriptingConst.ENGINE_TYPE_GROOVY);
+ super(ScriptingConst.GROOVY_FILE_ENDING, ScriptingConst.ENGINE_TYPE_JSF_GROOVY);
init();
}
public GroovyScriptingWeaver() {
- super(ScriptingConst.FILE_EXTENSION_GROOVY, ScriptingConst.ENGINE_TYPE_GROOVY);
+ super(ScriptingConst.FILE_EXTENSION_GROOVY, ScriptingConst.ENGINE_TYPE_JSF_GROOVY);
init();
}
Modified: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/groovy/compiler/GroovyCompiler.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/groovy/compiler/GroovyCompiler.java?rev=918525&r1=918524&r2=918525&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/groovy/compiler/GroovyCompiler.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/groovy/compiler/GroovyCompiler.java Wed Mar 3 15:45:22 2010
@@ -67,7 +67,7 @@
public CompilationResult compile(File sourcePath, File targetPath, ClassLoader classLoader) {
- List<File> sourceFiles = FileUtils.fetchSourceFiles(WeavingContext.getConfiguration().getWhitelistedSourceDirs(ScriptingConst.ENGINE_TYPE_GROOVY), "*.groovy");
+ List<File> sourceFiles = FileUtils.fetchSourceFiles(WeavingContext.getConfiguration().getWhitelistedSourceDirs(ScriptingConst.ENGINE_TYPE_JSF_GROOVY), "*.groovy");
StringWriter compilerOutput = new StringWriter();
@@ -85,7 +85,7 @@
compilationUnit.compile();
result = new CompilationResult(compilerOutput.toString());
- WeavingContext.setCompilationResult(ScriptingConst.ENGINE_TYPE_GROOVY, result);
+ WeavingContext.setCompilationResult(ScriptingConst.ENGINE_TYPE_JSF_GROOVY, result);
} catch (CompilationFailedException ex) {
// Register all collected error messages from the Groovy compiler
@@ -132,7 +132,7 @@
result = new CompilationResult(compilerOutput.toString());
- WeavingContext.setCompilationResult(ScriptingConst.ENGINE_TYPE_GROOVY, result);
+ WeavingContext.setCompilationResult(ScriptingConst.ENGINE_TYPE_JSF_GROOVY, result);
} catch (CompilationFailedException ex) {
// Register all collected error messages from the Groovy compiler
result = new CompilationResult(compilerOutput.toString());
Modified: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/groovy/compiler/GroovyCompilerFacade.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/groovy/compiler/GroovyCompilerFacade.java?rev=918525&r1=918524&r2=918525&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/groovy/compiler/GroovyCompilerFacade.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/groovy/compiler/GroovyCompilerFacade.java Wed Mar 3 15:45:22 2010
@@ -66,7 +66,7 @@
//displayMessages(result);
//if (!result.hasErrors()) {
- GroovyRecompiledClassloader classLoader = new GroovyRecompiledClassloader(ClassUtils.getContextClassLoader(), ScriptingConst.ENGINE_TYPE_GROOVY, ".groovy");
+ GroovyRecompiledClassloader classLoader = new GroovyRecompiledClassloader(ClassUtils.getContextClassLoader(), ScriptingConst.ENGINE_TYPE_JSF_GROOVY, ".groovy");
//fileManager.refreshClassloader();
ClassLoader oldClassLoader = Thread.currentThread().getContextClassLoader();
@@ -108,7 +108,7 @@
* @throws ClassNotFoundException
*/
public File compileAllFiles(String sourceRoot, String classPath) throws ClassNotFoundException {
- GroovyRecompiledClassloader classLoader = new GroovyRecompiledClassloader(ClassUtils.getContextClassLoader(), ScriptingConst.ENGINE_TYPE_GROOVY, ".groovy");
+ GroovyRecompiledClassloader classLoader = new GroovyRecompiledClassloader(ClassUtils.getContextClassLoader(), ScriptingConst.ENGINE_TYPE_JSF_GROOVY, ".groovy");
classLoader.setSourceRoot(sourceRoot);
CompilationResult result = compiler.compile(new File(sourceRoot), WeavingContext.getConfiguration().getCompileTarget(), classLoader);
@@ -123,6 +123,6 @@
for (CompilationResult.CompilationMessage error : result.getWarnings()) {
log.log(Level.WARNING, "[EXT-SCRIPTING] Groovy compiler warning: {0}", error.getMessage());
}
- WeavingContext.setCompilationResult(ScriptingConst.ENGINE_TYPE_GROOVY, result);
+ WeavingContext.setCompilationResult(ScriptingConst.ENGINE_TYPE_JSF_GROOVY, result);
}
}
Modified: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/java/DynamicClassIdentifier.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/java/DynamicClassIdentifier.java?rev=918525&r1=918524&r2=918525&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/java/DynamicClassIdentifier.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/java/DynamicClassIdentifier.java Wed Mar 3 15:45:22 2010
@@ -71,9 +71,9 @@
public int getEngineType(Class clazz) {
if (isDynamic(clazz)) {
- return ScriptingConst.ENGINE_TYPE_JAVA;
+ return ScriptingConst.ENGINE_TYPE_JSF_JAVA;
} else {
- return ScriptingConst.ENGINE_TYPE_NO_ENGINE;
+ return ScriptingConst.ENGINE_TYPE_JSF_NO_ENGINE;
}
}
}
Modified: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/java/JavaDependencyScanner.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/java/JavaDependencyScanner.java?rev=918525&r1=918524&r2=918525&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/java/JavaDependencyScanner.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/java/JavaDependencyScanner.java Wed Mar 3 15:45:22 2010
@@ -82,7 +82,7 @@
}
protected int getEngineType() {
- return ScriptingConst.ENGINE_TYPE_JAVA;
+ return ScriptingConst.ENGINE_TYPE_JSF_JAVA;
}
private void runScan(final Set<String> possibleDynamicClasses, final ClassLoader loader, String dynamicClass) {
Modified: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/java/JavaScriptingWeaver.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/java/JavaScriptingWeaver.java?rev=918525&r1=918524&r2=918525&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/java/JavaScriptingWeaver.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/java/JavaScriptingWeaver.java Wed Mar 3 15:45:22 2010
@@ -53,7 +53,7 @@
* @param servletContext
*/
public JavaScriptingWeaver(ServletContext servletContext) {
- super(ScriptingConst.JAVA_FILE_ENDING, ScriptingConst.ENGINE_TYPE_JAVA);
+ super(ScriptingConst.JAVA_FILE_ENDING, ScriptingConst.ENGINE_TYPE_JSF_JAVA);
init();
}
@@ -73,7 +73,7 @@
}
public JavaScriptingWeaver() {
- super(ScriptingConst.JAVA_FILE_ENDING, ScriptingConst.ENGINE_TYPE_JAVA);
+ super(ScriptingConst.JAVA_FILE_ENDING, ScriptingConst.ENGINE_TYPE_JSF_JAVA);
}
protected String getLoadingInfo(String file) {
Modified: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/java/compiler/CompilerFacade.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/java/compiler/CompilerFacade.java?rev=918525&r1=918524&r2=918525&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/java/compiler/CompilerFacade.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/java/compiler/CompilerFacade.java Wed Mar 3 15:45:22 2010
@@ -68,7 +68,7 @@
try {
//TODO do a full compile and block the compile for the rest of the request
//so that we do not run into endless compile cycles
- RecompiledClassLoader classLoader = new RecompiledClassLoader(ClassUtils.getContextClassLoader(), ScriptingConst.ENGINE_TYPE_JAVA, ".java");
+ RecompiledClassLoader classLoader = new RecompiledClassLoader(ClassUtils.getContextClassLoader(), ScriptingConst.ENGINE_TYPE_JSF_JAVA, ".java");
classLoader.setSourceRoot(sourceRoot);
CompilationResult result = compiler.compile(new File(sourceRoot), WeavingContext.getConfiguration().getCompileTarget(), classLoader);
displayMessages(result);
@@ -86,7 +86,7 @@
String separator = FileUtils.getFileSeparatorForRegex();
String className = filePath.replaceAll(separator, ".");
className = ClassUtils.relativeFileToClassName(className);
- RecompiledClassLoader classLoader = new RecompiledClassLoader(ClassUtils.getContextClassLoader(), ScriptingConst.ENGINE_TYPE_JAVA, ".java");
+ RecompiledClassLoader classLoader = new RecompiledClassLoader(ClassUtils.getContextClassLoader(), ScriptingConst.ENGINE_TYPE_JSF_JAVA, ".java");
ClassLoader oldClassLoader = Thread.currentThread().getContextClassLoader();
try {
classLoader.setSourceRoot(sourceRoot);
@@ -110,7 +110,7 @@
*/
public File compileAllFiles(String sourceRoot, String classPath) throws ClassNotFoundException {
try {
- RecompiledClassLoader classLoader = new RecompiledClassLoader(ClassUtils.getContextClassLoader(), ScriptingConst.ENGINE_TYPE_JAVA, ".java");
+ RecompiledClassLoader classLoader = new RecompiledClassLoader(ClassUtils.getContextClassLoader(), ScriptingConst.ENGINE_TYPE_JSF_JAVA, ".java");
CompilationResult result = compiler.compile(new File(sourceRoot), WeavingContext.getConfiguration().getCompileTarget(), classLoader);
Modified: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/java/compiler/JavacCompiler.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/java/compiler/JavacCompiler.java?rev=918525&r1=918524&r2=918525&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/java/compiler/JavacCompiler.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/java/compiler/JavacCompiler.java Wed Mar 3 15:45:22 2010
@@ -129,7 +129,7 @@
result.registerError(new CompilationResult.CompilationMessage(-1,
"Executing the javac compiler failed. The return code is '" + returnCode + "'." + compilerOutput.toString()));
}
- WeavingContext.setCompilationResult(ScriptingConst.ENGINE_TYPE_JAVA, result);
+ WeavingContext.setCompilationResult(ScriptingConst.ENGINE_TYPE_JSF_JAVA, result);
return result;
} catch (NoSuchMethodException ex) {
throw new CompilationException("The Javac compiler class '" + compilerClass + "' doesn't provide the method " +
@@ -177,7 +177,7 @@
result.registerError(new CompilationResult.CompilationMessage(-1,
"Executing the javac compiler failed. The return code is '" + returnCode + "'." + compilerOutput.toString()));
}
- WeavingContext.setCompilationResult(ScriptingConst.ENGINE_TYPE_JAVA, result);
+ WeavingContext.setCompilationResult(ScriptingConst.ENGINE_TYPE_JSF_JAVA, result);
return result;
} catch (NoSuchMethodException ex) {
throw new IllegalStateException("The Javac compiler class '" + compilerClass + "' doesn't provide the method " +
@@ -219,7 +219,7 @@
* @return an array of arguments that you have to pass to the Javac compiler
*/
protected String[] buildCompilerArgumentsWhitelisted(File sourcePath, File targetPath, ClassLoader loader) {
- List<File> sourceFiles = FileUtils.fetchSourceFiles(WeavingContext.getConfiguration().getWhitelistedSourceDirs(ScriptingConst.ENGINE_TYPE_JAVA), "*.java");
+ List<File> sourceFiles = FileUtils.fetchSourceFiles(WeavingContext.getConfiguration().getWhitelistedSourceDirs(ScriptingConst.ENGINE_TYPE_JSF_JAVA), "*.java");
List arguments = getDefaultArguments(sourcePath, targetPath, loader);
Modified: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/refresh/RefreshContext.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/refresh/RefreshContext.java?rev=918525&r1=918524&r2=918525&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/refresh/RefreshContext.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/refresh/RefreshContext.java Wed Mar 3 15:45:22 2010
@@ -24,6 +24,7 @@
import javax.faces.context.FacesContext;
import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicInteger;
/**
@@ -79,6 +80,7 @@
private MasterDependencyRegistry _dependencyRegistry = new MasterDependencyRegistry();
+
/**
* we keep a 10 minutes timeout period to keep the performance in place
*/
@@ -118,6 +120,8 @@
}
}
+
+
/**
* adds a new entry into our taint log
* which allows us to access tainting data
Modified: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/refresh/ReloadingMetadata.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/refresh/ReloadingMetadata.java?rev=918525&r1=918524&r2=918525&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/refresh/ReloadingMetadata.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/refresh/ReloadingMetadata.java Wed Mar 3 15:45:22 2010
@@ -42,7 +42,7 @@
volatile String sourcePath = "";
volatile Class aClass = null;
volatile long timestamp = 0l;
- volatile int scriptingEngine = ScriptingConst.ENGINE_TYPE_NO_ENGINE;
+ volatile int scriptingEngine = ScriptingConst.ENGINE_TYPE_JSF_NO_ENGINE;
public boolean isTainted() {
return tainted;
Modified: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/sandbox/compiler/GroovyCompiler.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/sandbox/compiler/GroovyCompiler.java?rev=918525&r1=918524&r2=918525&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/sandbox/compiler/GroovyCompiler.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/sandbox/compiler/GroovyCompiler.java Wed Mar 3 15:45:22 2010
@@ -66,7 +66,7 @@
public CompilationResult compile(File sourcePath, File targetPath, ClassLoader classLoader) {
- List<File> sourceFiles = FileUtils.fetchSourceFiles(WeavingContext.getConfiguration().getWhitelistedSourceDirs(ScriptingConst.ENGINE_TYPE_GROOVY), "*.groovy");
+ List<File> sourceFiles = FileUtils.fetchSourceFiles(WeavingContext.getConfiguration().getWhitelistedSourceDirs(ScriptingConst.ENGINE_TYPE_JSF_GROOVY), "*.groovy");
StringWriter compilerOutput = new StringWriter();
@@ -84,7 +84,7 @@
compilationUnit.compile();
result = new CompilationResult(compilerOutput.toString());
- WeavingContext.setCompilationResult(ScriptingConst.ENGINE_TYPE_GROOVY, result);
+ WeavingContext.setCompilationResult(ScriptingConst.ENGINE_TYPE_JSF_GROOVY, result);
} catch (CompilationFailedException ex) {
// Register all collected error messages from the Groovy compiler
@@ -129,7 +129,7 @@
result = new CompilationResult(compilerOutput.toString());
- WeavingContext.setCompilationResult(ScriptingConst.ENGINE_TYPE_GROOVY, result);
+ WeavingContext.setCompilationResult(ScriptingConst.ENGINE_TYPE_JSF_GROOVY, result);
} catch (CompilationFailedException ex) {
// Register all collected error messages from the Groovy compiler
result = new CompilationResult(compilerOutput.toString());
Modified: myfaces/extensions/scripting/trunk/core/core/src/test/java/org/apache/myfaces/extensions/scripting/dependencyScan/DependencyScannerTest.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/test/java/org/apache/myfaces/extensions/scripting/dependencyScan/DependencyScannerTest.java?rev=918525&r1=918524&r2=918525&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/test/java/org/apache/myfaces/extensions/scripting/dependencyScan/DependencyScannerTest.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/test/java/org/apache/myfaces/extensions/scripting/dependencyScan/DependencyScannerTest.java Wed Mar 3 15:45:22 2010
@@ -22,7 +22,6 @@
import org.apache.myfaces.scripting.core.dependencyScan.StandardDependencyScanner;
import org.apache.myfaces.scripting.core.dependencyScan.core.ClassDependencies;
import org.apache.myfaces.scripting.core.dependencyScan.filter.WhitelistFilter;
-import org.apache.myfaces.scripting.core.dependencyScan.registry.DependencyMapRegistrationStrategy;
import org.apache.myfaces.scripting.core.dependencyScan.registry.DependencyRegistryImpl;
import org.apache.myfaces.scripting.core.dependencyScan.registry.ExternalFilterDependencyRegistry;
import org.junit.Test;
@@ -57,10 +56,10 @@
@Test
public void testClassDependencies2() {
ClassDependencies dependencyMap = new ClassDependencies();
- ExternalFilterDependencyRegistry testRegistry = new DependencyRegistryImpl(ScriptingConst.ENGINE_TYPE_JAVA, dependencyMap);
+ ExternalFilterDependencyRegistry testRegistry = new DependencyRegistryImpl(ScriptingConst.ENGINE_TYPE_JSF_JAVA, dependencyMap);
testRegistry.addFilter(new WhitelistFilter(DUMMY, PROBE_NAMESPACE));
long before = System.currentTimeMillis();
- (new StandardDependencyScanner()).fetchDependencies(Thread.currentThread().getContextClassLoader(), ScriptingConst.ENGINE_TYPE_JAVA, PROBE1, testRegistry);
+ (new StandardDependencyScanner()).fetchDependencies(Thread.currentThread().getContextClassLoader(), ScriptingConst.ENGINE_TYPE_JSF_JAVA, PROBE1, testRegistry);
long after = System.currentTimeMillis();
log.info("Execution time registry based scan" + (after - before));
@@ -78,10 +77,10 @@
@Test
public void testGenerics() {
ClassDependencies dependencyMap = new ClassDependencies();
- ExternalFilterDependencyRegistry testRegistry = new DependencyRegistryImpl(ScriptingConst.ENGINE_TYPE_JAVA, dependencyMap);
+ ExternalFilterDependencyRegistry testRegistry = new DependencyRegistryImpl(ScriptingConst.ENGINE_TYPE_JSF_JAVA, dependencyMap);
testRegistry.addFilter(new WhitelistFilter(DUMMY, PROBE_NAMESPACE));
long before = System.currentTimeMillis();
- (new StandardDependencyScanner()).fetchDependencies(Thread.currentThread().getContextClassLoader(), ScriptingConst.ENGINE_TYPE_JAVA, GENERICS_PROBE, testRegistry);
+ (new StandardDependencyScanner()).fetchDependencies(Thread.currentThread().getContextClassLoader(), ScriptingConst.ENGINE_TYPE_JSF_JAVA, GENERICS_PROBE, testRegistry);
long after = System.currentTimeMillis();
log.info("Execution time registry based scan" + (after - before));
Modified: myfaces/extensions/scripting/trunk/core/core/src/test/java/org/apache/myfaces/extensions/scripting/dependencyScan/FilterTest.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/test/java/org/apache/myfaces/extensions/scripting/dependencyScan/FilterTest.java?rev=918525&r1=918524&r2=918525&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/test/java/org/apache/myfaces/extensions/scripting/dependencyScan/FilterTest.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/test/java/org/apache/myfaces/extensions/scripting/dependencyScan/FilterTest.java Wed Mar 3 15:45:22 2010
@@ -20,8 +20,8 @@
public void testStandardNamespace() {
StandardNamespaceFilter filter = new StandardNamespaceFilter();
- assertFalse("Standard namespace is not allowed", filter.isAllowed(ScriptingConst.ENGINE_TYPE_JAVA, "java.lang.String"));
- assertTrue("Non Standard namespace is not allowed", filter.isAllowed(ScriptingConst.ENGINE_TYPE_JAVA, "booga.looga"));
+ assertFalse("Standard namespace is not allowed", filter.isAllowed(ScriptingConst.ENGINE_TYPE_JSF_JAVA, "java.lang.String"));
+ assertTrue("Non Standard namespace is not allowed", filter.isAllowed(ScriptingConst.ENGINE_TYPE_JSF_JAVA, "booga.looga"));
}
@Test
@@ -31,13 +31,13 @@
whiteList.add("booga2");
WhitelistFilter filter = new WhitelistFilter(whiteList);
- assertTrue("Whitelist test 1", filter.isAllowed(ScriptingConst.ENGINE_TYPE_JAVA, "com.booga"));
- assertTrue("Whitelist test 2", filter.isAllowed(ScriptingConst.ENGINE_TYPE_JAVA, "com.booga.booga1"));
- assertTrue("Whitelist test 3", filter.isAllowed(ScriptingConst.ENGINE_TYPE_JAVA, "booga2"));
-
- assertFalse("Whitelist test 4", filter.isAllowed(ScriptingConst.ENGINE_TYPE_JAVA, "com.booga1"));
- assertFalse("Whitelist test 5", filter.isAllowed(ScriptingConst.ENGINE_TYPE_JAVA, "org.booga1"));
- assertFalse("Whitelist test 6", filter.isAllowed(ScriptingConst.ENGINE_TYPE_JAVA, "aaa"));
+ assertTrue("Whitelist test 1", filter.isAllowed(ScriptingConst.ENGINE_TYPE_JSF_JAVA, "com.booga"));
+ assertTrue("Whitelist test 2", filter.isAllowed(ScriptingConst.ENGINE_TYPE_JSF_JAVA, "com.booga.booga1"));
+ assertTrue("Whitelist test 3", filter.isAllowed(ScriptingConst.ENGINE_TYPE_JSF_JAVA, "booga2"));
+
+ assertFalse("Whitelist test 4", filter.isAllowed(ScriptingConst.ENGINE_TYPE_JSF_JAVA, "com.booga1"));
+ assertFalse("Whitelist test 5", filter.isAllowed(ScriptingConst.ENGINE_TYPE_JSF_JAVA, "org.booga1"));
+ assertFalse("Whitelist test 6", filter.isAllowed(ScriptingConst.ENGINE_TYPE_JSF_JAVA, "aaa"));
}
Modified: myfaces/extensions/scripting/trunk/core/core/src/test/java/org/apache/myfaces/extensions/scripting/groovyCompiler/GroovyCompilerTest.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/test/java/org/apache/myfaces/extensions/scripting/groovyCompiler/GroovyCompilerTest.java?rev=918525&r1=918524&r2=918525&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/test/java/org/apache/myfaces/extensions/scripting/groovyCompiler/GroovyCompilerTest.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/test/java/org/apache/myfaces/extensions/scripting/groovyCompiler/GroovyCompilerTest.java Wed Mar 3 15:45:22 2010
@@ -75,7 +75,7 @@
root = new File(rootPath);
WeavingContext.setConfiguration(new Configuration());
- WeavingContext.getConfiguration().addSourceDir(ScriptingConst.ENGINE_TYPE_GROOVY, root.getAbsolutePath());
+ WeavingContext.getConfiguration().addSourceDir(ScriptingConst.ENGINE_TYPE_JSF_GROOVY, root.getAbsolutePath());
}
@Test
Modified: myfaces/extensions/scripting/trunk/core/core/src/test/java/org/apache/myfaces/scripting/core/compilerTest/TestCompilerAPI.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/test/java/org/apache/myfaces/scripting/core/compilerTest/TestCompilerAPI.java?rev=918525&r1=918524&r2=918525&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/test/java/org/apache/myfaces/scripting/core/compilerTest/TestCompilerAPI.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/test/java/org/apache/myfaces/scripting/core/compilerTest/TestCompilerAPI.java Wed Mar 3 15:45:22 2010
@@ -69,7 +69,7 @@
root = new File(rootPath);
WeavingContext.setConfiguration(new Configuration());
- WeavingContext.getConfiguration().addSourceDir(ScriptingConst.ENGINE_TYPE_JAVA, root.getAbsolutePath());
+ WeavingContext.getConfiguration().addSourceDir(ScriptingConst.ENGINE_TYPE_JSF_JAVA, root.getAbsolutePath());
}
@Test
@@ -79,7 +79,7 @@
@Test
public void testWhiteListedCompile() {
- //WeavingContext.getConfiguration().getWhitelistedSourceDirs(ScriptingConst.ENGINE_TYPE_JAVA).clear();
+ //WeavingContext.getConfiguration().getWhitelistedSourceDirs(ScriptingConst.ENGINE_TYPE_JSF_JAVA).clear();
WeavingContext.getConfiguration().addWhitelistPackage("compiler.myPackage");
try {
Modified: myfaces/extensions/scripting/trunk/core/core/src/test/java/org/apache/myfaces/scripting/core/refreshContext/RefreshContextTest.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/test/java/org/apache/myfaces/scripting/core/refreshContext/RefreshContextTest.java?rev=918525&r1=918524&r2=918525&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/test/java/org/apache/myfaces/scripting/core/refreshContext/RefreshContextTest.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/test/java/org/apache/myfaces/scripting/core/refreshContext/RefreshContextTest.java Wed Mar 3 15:45:22 2010
@@ -68,7 +68,7 @@
root = new File(rootPath);
WeavingContext.setConfiguration(new Configuration());
- WeavingContext.getConfiguration().addSourceDir(ScriptingConst.ENGINE_TYPE_JAVA, root.getAbsolutePath());
+ WeavingContext.getConfiguration().addSourceDir(ScriptingConst.ENGINE_TYPE_JSF_JAVA, root.getAbsolutePath());
WeavingContext.setRefreshContext(new RefreshContext());
}
Modified: myfaces/extensions/scripting/trunk/core/myfaces12-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/ELResolverProxy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/myfaces12-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/ELResolverProxy.java?rev=918525&r1=918524&r2=918525&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/myfaces12-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/ELResolverProxy.java (original)
+++ myfaces/extensions/scripting/trunk/core/myfaces12-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/ELResolverProxy.java Wed Mar 3 15:45:22 2010
@@ -60,7 +60,7 @@
Object newRetVal = WeavingContext.getWeaver().reloadScriptingInstance(retVal, ScriptingConst.ARTIFACT_TYPE_MANAGEDBEAN); /*once it was tainted or loaded by
our classloader we have to recreate all the time to avoid classloader issues*/
if (newRetVal != retVal) {
- _delegate.setValue(elContext, base, property, newRetVal);
+ setValue(elContext, base, property, newRetVal);
}
return newRetVal;
}
@@ -77,8 +77,12 @@
return retVal;
}
- public void setValue(ELContext elContext, Object o, Object o1, Object o2) throws NullPointerException, PropertyNotFoundException, PropertyNotWritableException, ELException {
- _delegate.setValue(elContext, o, o1, o2);
+ public void setValue(ELContext elContext, Object base, Object property, Object newRetVal) throws NullPointerException, PropertyNotFoundException, PropertyNotWritableException, ELException {
+ //now to more complex relations...
+ if(base != null) {
+ WeavingContext.getRefreshContext().getDependencyRegistry().addDependency(ScriptingConst.ENGINE_TYPE_JSF_ALL, base.getClass().getName(), base.getClass().getName(), newRetVal.getClass().getName());
+ }
+ _delegate.setValue(elContext, base, property, newRetVal);
}
public boolean isReadOnly(ELContext elContext, Object o, Object o1) throws NullPointerException, PropertyNotFoundException, ELException {
Modified: myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/ELResolverProxy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/ELResolverProxy.java?rev=918525&r1=918524&r2=918525&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/ELResolverProxy.java (original)
+++ myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/ELResolverProxy.java Wed Mar 3 15:45:22 2010
@@ -46,11 +46,12 @@
public Object getValue(ELContext elContext, final Object base, final Object property) throws NullPointerException, PropertyNotFoundException, ELException {
Object retVal = _delegate.getValue(elContext, base, property);
-
+
Object newRetVal = null;
//TODO simplify this, we do not need it anymore since we do our base scan at the beginning
if (retVal != null && WeavingContext.isDynamic(retVal.getClass())) {
+ //special case late el expression resolution, not catachable on class level
if (retVal.getClass().getName().equals("BlogEntry")) {
System.out.println(Thread.currentThread().getContextClassLoader().getClass().toString());
@@ -58,7 +59,7 @@
newRetVal = WeavingContext.getWeaver().reloadScriptingInstance(retVal, ScriptingConst.ARTIFACT_TYPE_MANAGEDBEAN);
if (newRetVal != retVal) {
- _delegate.setValue(elContext, base, property, newRetVal);
+ setValue(elContext, base, property, newRetVal);
}
//in case we have an annotation change we have to deal with it differently
@@ -88,9 +89,9 @@
Map<String, org.apache.myfaces.config.element.ManagedBean> mbeans = config.getManagedBeans();
if (!mbeans.containsKey(property.toString())) {
if (log.isLoggable(Level.FINE)) {
- log.log(Level.FINE,"[EXT-SCRIPTING] ElResolverProxy.getValue old bean not existing we have to perform a full annotation scan");
+ log.log(Level.FINE, "[EXT-SCRIPTING] ElResolverProxy.getValue old bean not existing we have to perform a full annotation scan");
}
- _delegate.setValue(elContext, base, property, null);
+ setValue(elContext, base, property, null);
//we only trigger this if the bean was deregistered, we now can reregister it again
WeavingContext.getWeaver().fullClassScan();
@@ -111,8 +112,12 @@
return retVal;
}
- public void setValue(ELContext elContext, Object o, Object o1, Object o2) throws NullPointerException, PropertyNotFoundException, PropertyNotWritableException, ELException {
- _delegate.setValue(elContext, o, o1, o2);
+ public void setValue(ELContext elContext, Object base, Object property, Object value) throws NullPointerException, PropertyNotFoundException, PropertyNotWritableException, ELException {
+ //now to more complex relations...
+ if (base != null) {
+ WeavingContext.getRefreshContext().getDependencyRegistry().addDependency(ScriptingConst.ENGINE_TYPE_JSF_ALL, base.getClass().getName(), base.getClass().getName(), value.getClass().getName());
+ }
+ _delegate.setValue(elContext, base, property, value);
}
public boolean isReadOnly(ELContext elContext, Object o, Object o1) throws NullPointerException, PropertyNotFoundException, ELException {
Modified: myfaces/extensions/scripting/trunk/examples/myfaces20-example/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/myfaces20-example/pom.xml?rev=918525&r1=918524&r2=918525&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/myfaces20-example/pom.xml (original)
+++ myfaces/extensions/scripting/trunk/examples/myfaces20-example/pom.xml Wed Mar 3 15:45:22 2010
@@ -44,6 +44,7 @@
<version>1.5.6</version>
</dependency>
+
<dependency>
<groupId>org.apache.myfaces.extension-scripting</groupId>
<artifactId>extscript-core</artifactId>
@@ -62,7 +63,7 @@
<version>1.0-SNAPSHOT</version>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
<version>2.0.0-SNAPSHOT</version>
@@ -74,7 +75,9 @@
<version>2.0.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
- <dependency>
+
+
+ <dependency>
<groupId>javax.portlet</groupId>
<artifactId>portlet-api</artifactId>
<version>1.0</version>
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=918525&r1=918524&r2=918525&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 Wed Mar 3 15:45:22 2010
@@ -66,6 +66,9 @@
</application>
+
+
+
<lifecycle>
<phase-listener>
org.apache.myfaces.groovyloader.test.TestPhaseListener
Added: myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/elResolverTest/BeanFactory.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/elResolverTest/BeanFactory.java?rev=918525&view=auto
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/elResolverTest/BeanFactory.java (added)
+++ myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/elResolverTest/BeanFactory.java Wed Mar 3 15:45:22 2010
@@ -0,0 +1,45 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.myfaces.javaloader.elResolverTest;
+
+import org.apache.myfaces.javaloader.blog.JSFUtilJava;
+
+import javax.faces.bean.ApplicationScoped;
+import javax.faces.bean.ManagedBean;
+import java.util.HashMap;
+
+/**
+ * @author Werner Punz (latest modification by $Author$)
+ * @version $Revision$ $Date$
+ */
+
+@ManagedBean (name="myFactory")
+@ApplicationScoped
+public class BeanFactory extends HashMap {
+
+ public Object getBean() {
+ return new MyBean();
+ }
+
+ @Override
+ public Object get(Object key) {
+ return JSFUtilJava.resolveVariable("myBean");
+ }
+}
Propchange: myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/elResolverTest/BeanFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/elResolverTest/BeanFactory.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/elResolverTest/MyBean.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/elResolverTest/MyBean.java?rev=918525&view=auto
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/elResolverTest/MyBean.java (added)
+++ myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/elResolverTest/MyBean.java Wed Mar 3 15:45:22 2010
@@ -0,0 +1,73 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.myfaces.javaloader.elResolverTest;
+
+import javax.faces.bean.ManagedBean;
+import javax.faces.bean.ManagedProperty;
+import javax.faces.bean.RequestScoped;
+import javax.faces.component.UIComponent;
+
+/**
+ * component testcase for bug
+ *
+ */
+@ManagedBean(name = "myBean")
+@RequestScoped
+public class MyBean {
+ String test;
+ UIComponent bindingMyTest;
+ String hello = "hello world from mybean ";
+
+ @ManagedProperty(value = "#{secondaryBean}")
+ Object secondaryBean;
+
+ public String getTest() {
+ return test;
+ }
+
+ public void setTest(String test) {
+ this.test = test;
+ }
+
+ public UIComponent getBindingMyTest() {
+ return bindingMyTest;
+ }
+
+ public void setBindingMyTest(UIComponent bindingMyTest) {
+ this.bindingMyTest = bindingMyTest;
+ }
+
+ public String getHello() {
+ return hello;
+ }
+
+ public void setHello(String hello) {
+ this.hello = hello;
+ }
+
+
+
+ public Object getSecondaryBean() {
+ return secondaryBean;
+ }
+
+ public void setSecondaryBean(Object secondaryBean) {
+ this.secondaryBean = secondaryBean;
+ }
+}
\ No newline at end of file
Propchange: myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/elResolverTest/MyBean.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/elResolverTest/MyBean.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/elResolverTest/Receiver.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/elResolverTest/Receiver.java?rev=918525&view=auto
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/elResolverTest/Receiver.java (added)
+++ myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/elResolverTest/Receiver.java Wed Mar 3 15:45:22 2010
@@ -0,0 +1,45 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.myfaces.javaloader.elResolverTest;
+
+import javax.faces.bean.ManagedBean;
+import javax.faces.bean.ManagedProperty;
+import javax.faces.bean.SessionScoped;
+
+/**
+ * @author Werner Punz (latest modification by $Author$)
+ * @version $Revision$ $Date$
+ */
+
+@ManagedBean (name="receiver")
+@SessionScoped
+public class Receiver {
+
+ @ManagedProperty(value = "#{myFactory['booga']}")
+ Object myBean;
+
+ public Object getMyBean() {
+ return myBean;
+ }
+
+ public void setMyBean(Object myBean) {
+ this.myBean = myBean;
+ }
+}
Propchange: myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/elResolverTest/Receiver.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/elResolverTest/Receiver.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/elResolverTest/SecondaryBean.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/elResolverTest/SecondaryBean.java?rev=918525&view=auto
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/elResolverTest/SecondaryBean.java (added)
+++ myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/elResolverTest/SecondaryBean.java Wed Mar 3 15:45:22 2010
@@ -0,0 +1,42 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.myfaces.javaloader.elResolverTest;
+
+import javax.faces.bean.ManagedBean;
+import javax.faces.bean.RequestScoped;
+
+/**
+ * @author Werner Punz (latest modification by $Author$)
+ * @version $Revision$ $Date$
+ */
+
+@ManagedBean(name = "secondaryBean")
+@RequestScoped
+public class SecondaryBean {
+ String hello = "hello world from secondary bean";
+
+ public String getHello() {
+ return hello;
+ }
+
+ public void setHello(String hello) {
+ this.hello = hello;
+ }
+}
Propchange: myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/elResolverTest/SecondaryBean.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/elResolverTest/SecondaryBean.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/complexBean.xhtml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/complexBean.xhtml?rev=918525&view=auto
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/complexBean.xhtml (added)
+++ myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/complexBean.xhtml Wed Mar 3 15:45:22 2010
@@ -0,0 +1,30 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html">
+<head>
+ <title>Hello World</title>
+</head>
+<h:body>
+
+
+ <h1> this example tests complex bean relationships for refreshing</h1>
+ <h:form id="myForm">
+ <h:outputScript name="jsf.js" library="javax.faces" target="head"/>
+
+
+ <h:inputText value="#{myBean.test}">
+ <f:ajax render="#{myBean.bindingMyTest.clientId}" event="keyup"/>
+ </h:inputText>
+ <h:inputText id="myText" value="#{myBean.test}" binding="#{myBean.bindingMyTest}"/>
+
+
+ <h:outputText value="#{receiver.myBean.hello}" />
+ <h:outputText value="#{receiver.myBean.secondaryBean.hello}" />
+
+
+ </h:form>
+
+
+</h:body>
+</html>