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 2011/04/12 15:31:50 UTC
svn commit: r1091406 - in /myfaces/extensions/scripting/trunk: ./
extscript-bundles/ extscript-bundles/extscript-myfaces12-bundle/
extscript-bundles/extscript-myfaces20-bundle/ extscript-core-root/
extscript-core-root/extscript-core-java6/ extscript-co...
Author: werpu
Date: Tue Apr 12 13:31:49 2011
New Revision: 1091406
URL: http://svn.apache.org/viewvc?rev=1091406&view=rev
Log:
https://issues.apache.org/jira/browse/EXTSCRIPT-145
https://issues.apache.org/jira/browse/EXTSCRIPT-146
Removed:
myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/instantbean/HelloBean.java
Modified:
myfaces/extensions/scripting/trunk/extscript-bundles/extscript-myfaces12-bundle/pom.xml
myfaces/extensions/scripting/trunk/extscript-bundles/extscript-myfaces20-bundle/pom.xml
myfaces/extensions/scripting/trunk/extscript-bundles/pom.xml
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core-java6/pom.xml
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/pom.xml
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/api/MyFacesBeanHandler.java
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/servlet/CustomChainLoader.java
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces12-extensions/pom.xml
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces2-extensions/pom.xml
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces2-extensions/src/main/java/org/apache/myfaces/extensions/scripting/jsf2/annotation/BeanImplementationListener.java
myfaces/extensions/scripting/trunk/extscript-core-root/pom.xml
myfaces/extensions/scripting/trunk/extscript-examples/myfaces12-example/pom.xml
myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/pom.xml
myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/conf/dev/web.xml
myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/groovy/org/apache/myfaces/groovyloader/blog/BlogService.groovy
myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/BlogService.java
myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/componentTest/JavaTestComponent.java
myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/componentTest/JavaTestComponent2.java
myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/componentTest/JavaTestRenderer1.java
myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/componentTest/JavaTestRenderer2.java
myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-extscript-helloworld/pom.xml
myfaces/extensions/scripting/trunk/extscript-examples/pom.xml
myfaces/extensions/scripting/trunk/pom.xml
Modified: myfaces/extensions/scripting/trunk/extscript-bundles/extscript-myfaces12-bundle/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-bundles/extscript-myfaces12-bundle/pom.xml?rev=1091406&r1=1091405&r2=1091406&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-bundles/extscript-myfaces12-bundle/pom.xml (original)
+++ myfaces/extensions/scripting/trunk/extscript-bundles/extscript-myfaces12-bundle/pom.xml Tue Apr 12 13:31:49 2011
@@ -4,7 +4,7 @@
<artifactId>extscript-myfaces12-bundle</artifactId>
<packaging>jar</packaging>
<name>MyFaces Extension Scripting MyFaces 1.2 convenience meta bundle</name>
- <version>1.1-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
<description>
The meta bundle bundeling all needed core runtimes
@@ -14,7 +14,7 @@
<parent>
<groupId>org.apache.myfaces.extensions.scripting</groupId>
<artifactId>extscript-bundles</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<scm>
@@ -27,17 +27,17 @@
<dependency>
<groupId>org.apache.myfaces.extensions.scripting</groupId>
<artifactId>extscript-core</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.myfaces.extensions.scripting</groupId>
<artifactId>extscript-core-java6</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.myfaces.extensions.scripting</groupId>
<artifactId>extscript-myfaces12-extensions</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
</dependency>
</dependencies>
Modified: myfaces/extensions/scripting/trunk/extscript-bundles/extscript-myfaces20-bundle/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-bundles/extscript-myfaces20-bundle/pom.xml?rev=1091406&r1=1091405&r2=1091406&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-bundles/extscript-myfaces20-bundle/pom.xml (original)
+++ myfaces/extensions/scripting/trunk/extscript-bundles/extscript-myfaces20-bundle/pom.xml Tue Apr 12 13:31:49 2011
@@ -4,7 +4,7 @@
<artifactId>extscript-myfaces20-bundle</artifactId>
<packaging>jar</packaging>
<name>MyFaces Extension Scripting MyFaces 2.0 convenience meta bundle</name>
- <version>1.1-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
<description>
The meta bundle bundeling all needed core runtimes
@@ -14,7 +14,7 @@
<parent>
<groupId>org.apache.myfaces.extensions.scripting</groupId>
<artifactId>extscript-bundles</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<scm>
@@ -27,17 +27,17 @@
<dependency>
<groupId>org.apache.myfaces.extensions.scripting</groupId>
<artifactId>extscript-core</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.myfaces.extensions.scripting</groupId>
<artifactId>extscript-core-java6</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.myfaces.extensions.scripting</groupId>
<artifactId>extscript-myfaces2-extensions</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
</dependency>
</dependencies>
Modified: myfaces/extensions/scripting/trunk/extscript-bundles/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-bundles/pom.xml?rev=1091406&r1=1091405&r2=1091406&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-bundles/pom.xml (original)
+++ myfaces/extensions/scripting/trunk/extscript-bundles/pom.xml Tue Apr 12 13:31:49 2011
@@ -4,7 +4,7 @@
<artifactId>extscript-bundles</artifactId>
<packaging>pom</packaging>
<name>MyFaces Extension Scripting meta bundles</name>
- <version>1.1-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
<description>
Meta bundles bundling the various ext-script
Modified: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core-java6/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core-java6/pom.xml?rev=1091406&r1=1091405&r2=1091406&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core-java6/pom.xml (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core-java6/pom.xml Tue Apr 12 13:31:49 2011
@@ -3,7 +3,7 @@
<artifactId>extscript-core-java6</artifactId>
<packaging>jar</packaging>
<name>Core java6 part</name>
- <version>1.1-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
<description>
myfaces extension scripting java6 lib
@@ -12,7 +12,7 @@
<parent>
<groupId>org.apache.myfaces.extensions.scripting</groupId>
<artifactId>extscript-core-root</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<scm>
@@ -25,7 +25,7 @@
<dependency>
<groupId>org.apache.myfaces.extensions.scripting</groupId>
<artifactId>extscript-core</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>commons-beanutils</groupId>
Modified: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/pom.xml?rev=1091406&r1=1091405&r2=1091406&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/pom.xml (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/pom.xml Tue Apr 12 13:31:49 2011
@@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>extscript-core</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
<packaging>jar</packaging>
<name>MyFaces Extension Scripting Core</name>
@@ -13,7 +13,7 @@
<parent>
<groupId>org.apache.myfaces.extensions.scripting</groupId>
<artifactId>extscript-core-root</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<scm>
Modified: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/api/MyFacesBeanHandler.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/api/MyFacesBeanHandler.java?rev=1091406&r1=1091405&r2=1091406&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/api/MyFacesBeanHandler.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/api/MyFacesBeanHandler.java Tue Apr 12 13:31:49 2011
@@ -21,8 +21,6 @@ package org.apache.myfaces.extensions.sc
import org.apache.myfaces.config.RuntimeConfig;
import org.apache.myfaces.config.annotation.LifecycleProvider;
import org.apache.myfaces.config.annotation.LifecycleProviderFactory;
-import org.apache.myfaces.config.element.ManagedBean;
-import org.apache.myfaces.config.element.ManagedProperty;
import org.apache.myfaces.extensions.scripting.core.util.ReflectUtil;
import org.apache.myfaces.extensions.scripting.core.util.WeavingContext;
import org.apache.myfaces.extensions.scripting.monitor.ClassResource;
@@ -134,14 +132,17 @@ public class MyFacesBeanHandler implemen
//We now have to check if the tainted classes belong to the managed beans
Set<String> managedBeanClasses = new HashSet<String>();
- Map<String, ManagedBean> mbeans = RuntimeConfig.getCurrentInstance(FacesContext.getCurrentInstance().getExternalContext()).getManagedBeans();
- Map<String, ManagedBean> mbeansSnapshotView;
+ Map mbeans = RuntimeConfig.getCurrentInstance(FacesContext.getCurrentInstance().getExternalContext()).getManagedBeans();
+ Map mbeansSnapshotView;
synchronized (RefreshContext.BEAN_SYNC_MONITOR) {
mbeansSnapshotView = makeSnapshot(mbeans);
}
- for (Map.Entry<String, ManagedBean> entry : mbeansSnapshotView.entrySet()) {
- managedBeanClasses.add(entry.getValue().getManagedBeanClassName());
+
+ for (Object entry : mbeansSnapshotView.entrySet()) {
+ Object bean = (Object) ((Map.Entry)entry).getValue();
+
+ managedBeanClasses.add((String)ReflectUtil.executeMethod(bean, "getManagedBeanClassName"));//bean.getManagedBeanClassName());
}
boolean managedBeanTainted = isAnyManagedBeanTainted(tainted, managedBeanClasses);
@@ -176,14 +177,15 @@ public class MyFacesBeanHandler implemen
*
* @param workCopy the managed beam snapshot view
*/
- private void globalManagedBeanRefresh(Map<String, ManagedBean> workCopy) {
+ private void globalManagedBeanRefresh(Map workCopy) {
Set<String> tainted = getTaintedClasses();
- for (Map.Entry<String, ManagedBean> entry : workCopy.entrySet()) {
- Class managedBeanClass = entry.getValue().getManagedBeanClass();
+ for (Object entry : workCopy.entrySet()) {
+ Object bean = ((Map.Entry) entry).getValue();
+ Class managedBeanClass = (Class) ReflectUtil.executeMethod(bean, "getManagedBeanClass");
if (hasToBeRefreshed(tainted, managedBeanClass)) {
//managed bean class found we drop the class from our session
- removeBeanReferences(entry.getValue());
+ removeBeanReferences(bean);
}
//one bean tainted we have to taint all dynamic beans otherwise we will get classcast
//exceptions
@@ -248,19 +250,20 @@ public class MyFacesBeanHandler implemen
Set<String> taintedInTime = WeavingContext.getRefreshContext().getTaintHistoryClasses(taintingPeriod);
synchronized (RefreshContext.BEAN_SYNC_MONITOR) {
- Map<String, ManagedBean> mbeans = RuntimeConfig.getCurrentInstance(FacesContext.getCurrentInstance().getExternalContext()).getManagedBeans();
+ Map mbeans = RuntimeConfig.getCurrentInstance(FacesContext.getCurrentInstance().getExternalContext()).getManagedBeans();
//the map is immutable but in between scanning might change it so we make a full copy of the map
//We can synchronized the refresh, but if someone alters
//the bean map from outside we still get race conditions
//But for most cases this mutex should be enough
- Map<String, ManagedBean> mbeansSnapshotView = makeSnapshot(mbeans);
+ Map mbeansSnapshotView = makeSnapshot(mbeans);
- for (Map.Entry<String, ManagedBean> entry : mbeansSnapshotView.entrySet()) {
- Class managedBeanClass = entry.getValue().getManagedBeanClass();
+ for (Object entry : mbeansSnapshotView.entrySet()) {
+ Object value = ((Map.Entry) entry).getValue();
+ Class managedBeanClass = (Class) ReflectUtil.executeMethod(value,"getManagedBeanClass");
if (hasToBeRefreshed(taintedInTime, managedBeanClass)) {
- FacesContext.getCurrentInstance().getExternalContext().getSessionMap().remove(entry.getValue().getManagedBeanName());
- removeCustomScopedBean(entry.getValue());
+ FacesContext.getCurrentInstance().getExternalContext().getSessionMap().remove(ReflectUtil.executeMethod(value,"getManagedBeanName"));
+ removeCustomScopedBean( value );
}
}
updateBeanRefreshTime();
@@ -275,12 +278,15 @@ public class MyFacesBeanHandler implemen
* @param bean the managed bean which all references have to be removed from
*/
- private void removeBeanReferences(ManagedBean bean) {
+ private void removeBeanReferences(Object bean) {
+ String managedBeanName = (String) ReflectUtil.executeMethod(bean, "getManagedBeanName");
+
if (getLog().isLoggable(Level.FINE)) {
- getLog().log(Level.FINE, "[EXT-SCRIPTING] JavaScriptingWeaver.removeBeanReferences({0})", bean.getManagedBeanName());
+ getLog().log(Level.FINE, "[EXT-SCRIPTING] JavaScriptingWeaver.removeBeanReferences({0})", managedBeanName);
}
- FacesContext.getCurrentInstance().getExternalContext().getSessionMap().remove(bean.getManagedBeanName());
- FacesContext.getCurrentInstance().getExternalContext().getApplicationMap().remove(bean.getManagedBeanName());
+
+ FacesContext.getCurrentInstance().getExternalContext().getSessionMap().remove(managedBeanName);
+ FacesContext.getCurrentInstance().getExternalContext().getApplicationMap().remove(managedBeanName);
removeCustomScopedBean(bean);
}
@@ -291,18 +297,20 @@ public class MyFacesBeanHandler implemen
return Logger.getLogger(this.getClass().getName());
}
+
+
/**
* jsf2 helper to remove custom scoped beans
*
* @param bean the managed bean which has to be removed from the custom scope from
*/
- private void removeCustomScopedBean(ManagedBean bean) {
- Object scopeImpl = FacesContext.getCurrentInstance().getExternalContext().getApplicationMap().get(bean.getManagedBeanScope());
+ private void removeCustomScopedBean(Object bean) {
+ Object scopeImpl = FacesContext.getCurrentInstance().getExternalContext().getApplicationMap().get(ReflectUtil.executeMethod(bean,"getManagedBeanScope"));
if (scopeImpl == null) return; //scope not implemented
//we now have to revert to introspection here because scopes are a pure jsf2 construct
//so we use a messaging pattern here to cope with it
- Object beanInstance = ReflectUtil.executeMethod(scopeImpl, "get", bean.getManagedBeanName());
+ Object beanInstance = ReflectUtil.executeMethod(scopeImpl, "get", ReflectUtil.executeMethod(bean, "getManagedBeanName"));
LifecycleProvider lifecycleProvider =
LifecycleProviderFactory.getLifecycleProviderFactory().getLifecycleProvider(FacesContext.getCurrentInstance().getExternalContext());
try {
@@ -324,11 +332,12 @@ public class MyFacesBeanHandler implemen
* @return a map with the class name as key and the managed bean info
* as value of the current state of the internal runtime config bean map
*/
- private Map<String, ManagedBean> makeSnapshot(Map<String, ManagedBean> mbeans) {
- Map<String, ManagedBean> workCopy;
+ private Map makeSnapshot(Map mbeans) {
+ Map workCopy;
- workCopy = new HashMap<String, ManagedBean>(mbeans.size());
- for (Map.Entry<String, ManagedBean> entry : mbeans.entrySet()) {
+ workCopy = new HashMap(mbeans.size());
+ for (Object elem: mbeans.entrySet()) {
+ Map.Entry entry = (Map.Entry) elem;
workCopy.put(entry.getKey(), entry.getValue());
}
Modified: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/servlet/CustomChainLoader.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/servlet/CustomChainLoader.java?rev=1091406&r1=1091405&r2=1091406&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/servlet/CustomChainLoader.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/servlet/CustomChainLoader.java Tue Apr 12 13:31:49 2011
@@ -66,8 +66,8 @@ public class CustomChainLoader extends C
else if (name.startsWith("org.apache") && !name.startsWith("org.apache.myfaces")) {
return null;
}
- if(name.contains("JavaTestComponent")){
- System.out.println("Debugpoint found");
+ else if (name.startsWith("org.apache") && name.startsWith("org.apache.myfaces.config")) {
+ return null;
}
return _scriptingWeaver.loadScriptingClassFromName(name);
}
Modified: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces12-extensions/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces12-extensions/pom.xml?rev=1091406&r1=1091405&r2=1091406&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces12-extensions/pom.xml (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces12-extensions/pom.xml Tue Apr 12 13:31:49 2011
@@ -11,7 +11,7 @@
<parent>
<groupId>org.apache.myfaces.extensions.scripting</groupId>
<artifactId>extscript-core-root</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<scm>
@@ -26,7 +26,7 @@
<dependency>
<groupId>org.apache.myfaces.extensions.scripting</groupId>
<artifactId>extscript-core</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
</dependency>
Modified: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces2-extensions/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces2-extensions/pom.xml?rev=1091406&r1=1091405&r2=1091406&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces2-extensions/pom.xml (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces2-extensions/pom.xml Tue Apr 12 13:31:49 2011
@@ -11,7 +11,7 @@
<parent>
<groupId>org.apache.myfaces.extensions.scripting</groupId>
<artifactId>extscript-core-root</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<scm>
@@ -30,7 +30,7 @@
<dependency>
<groupId>org.apache.myfaces.extensions.scripting</groupId>
<artifactId>extscript-core</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
</dependency>
<dependency>
Modified: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces2-extensions/src/main/java/org/apache/myfaces/extensions/scripting/jsf2/annotation/BeanImplementationListener.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces2-extensions/src/main/java/org/apache/myfaces/extensions/scripting/jsf2/annotation/BeanImplementationListener.java?rev=1091406&r1=1091405&r2=1091406&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces2-extensions/src/main/java/org/apache/myfaces/extensions/scripting/jsf2/annotation/BeanImplementationListener.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces2-extensions/src/main/java/org/apache/myfaces/extensions/scripting/jsf2/annotation/BeanImplementationListener.java Tue Apr 12 13:31:49 2011
@@ -22,6 +22,8 @@ import org.apache.myfaces.config.Runtime
import org.apache.myfaces.config.element.NavigationRule;
import org.apache.myfaces.config.impl.digester.elements.ManagedBean;
import org.apache.myfaces.extensions.scripting.api.AnnotationScanListener;
+import org.apache.myfaces.extensions.scripting.core.util.Cast;
+import org.apache.myfaces.extensions.scripting.core.util.ReflectUtil;
import org.apache.myfaces.extensions.scripting.core.util.StringUtils;
import javax.faces.bean.*;
@@ -124,7 +126,8 @@ public class BeanImplementationListener
mpc.setPropertyName(name);
mpc.setPropertyClass(field.getType().getName()); // FIXME - primitives, arrays, etc.
mpc.setValue(property.value());
- mbean.addProperty(mpc);
+
+ ReflectUtil.executeMethod(mbean,"addProperty", mpc);
}
}
}
@@ -175,7 +178,7 @@ public class BeanImplementationListener
//us to do the same for the nav rules after purge
//we cannot purge the managed beans and nav rules separately
Collection<NavigationRule> navigationRules = new ArrayList<NavigationRule>();
- Map<String, org.apache.myfaces.config.element.ManagedBean> managedBeans = new HashMap<String, org.apache.myfaces.config.element.ManagedBean>();
+ Map managedBeans = new HashMap<String, org.apache.myfaces.config.element.ManagedBean>();
navigationRules.addAll(config.getNavigationRules());
managedBeans.putAll(config.getManagedBeans());
@@ -191,13 +194,17 @@ public class BeanImplementationListener
org.apache.myfaces.config.element.ManagedBean mbeanFound = null;
List<String> mbeanKey = new LinkedList<String>();
- for (Map.Entry mbean : managedBeans.entrySet()) {
- org.apache.myfaces.config.element.ManagedBean bean = (org.apache.myfaces.config.element.ManagedBean) mbean.getValue();
- if (!bean.getManagedBeanClass().getName().equals(className)) {
+ for (Object entry : managedBeans.entrySet()) {
+ Map.Entry mbean = (Map.Entry) entry;
+
+ Object bean = mbean.getValue();
+
+
+ if (!((Class)ReflectUtil.executeMethod( bean, "getManagedBeanClass")).getName().equals(className)) {
config.addManagedBean((String) mbean.getKey(), (org.apache.myfaces.config.element.ManagedBean) mbean.getValue());
} else {
- mbeanFound = (org.apache.myfaces.config.element.ManagedBean) mbean.getValue();
- mbeanKey.add(mbeanFound.getManagedBeanName());
+ Object mbeanf = mbean.getValue();
+ mbeanKey.add((String)ReflectUtil.executeMethod(mbeanf, "getManagedBeanName"));
}
}
if (mbeanFound != null) {
Modified: myfaces/extensions/scripting/trunk/extscript-core-root/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/pom.xml?rev=1091406&r1=1091405&r2=1091406&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/pom.xml (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/pom.xml Tue Apr 12 13:31:49 2011
@@ -3,7 +3,7 @@
<artifactId>extscript-core-root</artifactId>
<packaging>pom</packaging>
<name>MyFaces Extension Scripting Core Engine</name>
- <version>1.1-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
<description>
MyFaces Extension Scripting Core Meta Project
@@ -12,7 +12,7 @@
<parent>
<groupId>org.apache.myfaces.extensions.scripting</groupId>
<artifactId>extscript-root</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<scm>
Modified: myfaces/extensions/scripting/trunk/extscript-examples/myfaces12-example/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-examples/myfaces12-example/pom.xml?rev=1091406&r1=1091405&r2=1091406&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-examples/myfaces12-example/pom.xml (original)
+++ myfaces/extensions/scripting/trunk/extscript-examples/myfaces12-example/pom.xml Tue Apr 12 13:31:49 2011
@@ -3,14 +3,14 @@
<parent>
<artifactId>extscript-examples</artifactId>
<groupId>org.apache.myfaces.extensions.scripting</groupId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.myfaces.extensions.scripting</groupId>
<artifactId>myfaces12-example</artifactId>
<packaging>war</packaging>
<name>A custom project using myfaces 1.2</name>
- <version>1.1-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
<url>http://www.apache.org</url>
<scm>
@@ -33,7 +33,7 @@
<dependency>
<groupId>org.apache.myfaces.extensions.scripting</groupId>
<artifactId>extscript-myfaces12-bundle</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
</dependency>
<dependency>
Modified: myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/pom.xml?rev=1091406&r1=1091405&r2=1091406&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/pom.xml (original)
+++ myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/pom.xml Tue Apr 12 13:31:49 2011
@@ -4,14 +4,14 @@
<parent>
<artifactId>extscript-examples</artifactId>
<groupId>org.apache.myfaces.extensions.scripting</groupId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.myfaces.extensions.scripting</groupId>
<artifactId>myfaces20-example</artifactId>
<packaging>war</packaging>
<name>A custom project using myfaces 2.0</name>
- <version>1.1-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
<url>http://www.apache.org</url>
<scm>
@@ -68,7 +68,7 @@
<dependency>
<groupId>org.apache.myfaces.extensions.scripting</groupId>
<artifactId>extscript-myfaces20-bundle</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
</dependency>
<dependency>
Modified: myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/conf/dev/web.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/conf/dev/web.xml?rev=1091406&r1=1091405&r2=1091406&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/conf/dev/web.xml (original)
+++ myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/conf/dev/web.xml Tue Apr 12 13:31:49 2011
@@ -39,7 +39,7 @@
</description>
<param-name>org.apache.myfaces.extensions.scripting.groovy.LOADER_PATHS</param-name>
<param-value>
- /Users/werpu2/development/workspace/extension-scripting4/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/groovy
+ /Users/werpu2/development/workspace/extscript5/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/groovy
</param-value>
</context-param>
@@ -50,7 +50,7 @@
</description>
<param-name>org.apache.myfaces.extensions.scripting.java.LOADER_PATHS</param-name>
<param-value>
- /Users/werpu2/development/workspace/extension-scripting4/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java
+ /Users/werpu2/development/workspace/extscript5/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java
</param-value>
</context-param>
@@ -58,7 +58,7 @@
<description>resource paths for our custom JSF2 resource resolver</description>
<param-name>org.apache.myfaces.extensions.scripting.resources.LOADER_PATHS</param-name>
<param-value>
- /Users/werpu2/development/workspace/extension-scripting4/extscript-examples/myfaces20-example/src/main/webapp
+ /Users/werpu2/development/workspace/extscript5/extscript-examples/myfaces20-example/src/main/webapp
</param-value>
</context-param>
Modified: myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/groovy/org/apache/myfaces/groovyloader/blog/BlogService.groovy
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/groovy/org/apache/myfaces/groovyloader/blog/BlogService.groovy?rev=1091406&r1=1091405&r2=1091406&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/groovy/org/apache/myfaces/groovyloader/blog/BlogService.groovy (original)
+++ myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/groovy/org/apache/myfaces/groovyloader/blog/BlogService.groovy Tue Apr 12 13:31:49 2011
@@ -44,6 +44,7 @@ public class BlogService {
Logger log = Logger.getLogger(BlogService.class.getName())
log.info("Adding entry, topic: " + entry.topic)
+ entry.topic = "bla bla"
blogEntries.add(entry)
log.info("blogentries size" + blogEntries.size())
Modified: myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/BlogService.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/BlogService.java?rev=1091406&r1=1091405&r2=1091406&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/BlogService.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/BlogService.java Tue Apr 12 13:31:49 2011
@@ -38,9 +38,11 @@ public class BlogService implements Blog
*
* @param entry the entry to be added
*/
+
@DependencyTestAnnotation
public void addEntry(BlogEntry entry) {
if (entry != null) {
+ entry.setContent("hello world dlskjfgls kdj");
blogEntries.add(entry);
}
}
Modified: myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/componentTest/JavaTestComponent.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/componentTest/JavaTestComponent.java?rev=1091406&r1=1091405&r2=1091406&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/componentTest/JavaTestComponent.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/componentTest/JavaTestComponent.java Tue Apr 12 13:31:49 2011
@@ -38,9 +38,9 @@ public class JavaTestComponent extends U
String _testAttr;
- enum PropertyKeys {
- inc, testAttr, testAttr2, testAttr3, testAttr4
- }
+ //enum PropertyKeys {
+ // inc, testAttr, testAttr2, testAttr3, testAttr4
+ //}
public JavaTestComponent() {
setRendererType("at.irian.JavaTestRenderer");
@@ -55,35 +55,35 @@ public class JavaTestComponent extends U
}
public int getInc() {
- return (Integer) getStateHelper().eval(PropertyKeys.inc, 1);
+ return (Integer) getStateHelper().eval("inc", 1);
}
public void setInc(int inc) {
- getStateHelper().put(PropertyKeys.inc, inc);
+ getStateHelper().put("inc", inc);
}
public String getTestAttr() {
- return (String) getStateHelper().eval(PropertyKeys.testAttr, "");
+ return (String) getStateHelper().eval("testAttr", "");
}
public void setTestAttr(String testAttr) {
- getStateHelper().put(PropertyKeys.testAttr, testAttr);
+ getStateHelper().put("testAttr", testAttr);
}
public String getTestAttr2x() {
- return (String) getStateHelper().eval(PropertyKeys.testAttr2, "");
+ return (String) getStateHelper().eval("testAttr2x", "");
}
public void setTestAttr2x(String testAttr) {
- getStateHelper().put(PropertyKeys.testAttr2, testAttr);
+ getStateHelper().put("testAttr2x", testAttr);
}
public String getTestAttr3() {
- return (String) getStateHelper().eval(PropertyKeys.testAttr3, "");
+ return (String) getStateHelper().eval("testAttr3x", "");
}
public void setTestAttr3(String testAttr) {
- getStateHelper().put(PropertyKeys.testAttr3, testAttr);
+ getStateHelper().put("testAttr3x", testAttr);
}
/**
@@ -94,11 +94,11 @@ public class JavaTestComponent extends U
*/
public String getTestAttr4() {
- return (String) getStateHelper().eval(PropertyKeys.testAttr4, "");
+ return (String) getStateHelper().eval("testAttr4x", "");
}
public void setTestAttr4(String testAttr) {
- getStateHelper().put(PropertyKeys.testAttr4, testAttr);
+ getStateHelper().put("testAttr4x", testAttr);
}
Modified: myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/componentTest/JavaTestComponent2.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/componentTest/JavaTestComponent2.java?rev=1091406&r1=1091405&r2=1091406&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/componentTest/JavaTestComponent2.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/componentTest/JavaTestComponent2.java Tue Apr 12 13:31:49 2011
@@ -21,6 +21,8 @@ package org.apache.myfaces.javaloader.co
import org.apache.myfaces.javaloader.other.Markable;
import javax.faces.component.UIInput;
+import javax.faces.component.FacesComponent;
+
/**
* @author Werner Punz (latest modification by $Author$)
@@ -29,7 +31,6 @@ import javax.faces.component.UIInput;
* Second component which can act as a drop target for
* dragging and dropping the annotations from JavaTestComponent
*/
-
public class JavaTestComponent2 extends UIInput implements Markable {
public JavaTestComponent2() {
Modified: myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/componentTest/JavaTestRenderer1.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/componentTest/JavaTestRenderer1.java?rev=1091406&r1=1091405&r2=1091406&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/componentTest/JavaTestRenderer1.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/componentTest/JavaTestRenderer1.java Tue Apr 12 13:31:49 2011
@@ -36,6 +36,7 @@ import java.util.logging.Logger;
* renderer artifact to the other
*/
@FacesRenderer(componentFamily = "javax.faces.Input", rendererType = "at.irian.JavaTestRenderer")
+
public class JavaTestRenderer1 extends HtmlTextRendererBase {
static Logger log = Logger.getLogger(JavaTestRenderer1.class.getName());
Modified: myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/componentTest/JavaTestRenderer2.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/componentTest/JavaTestRenderer2.java?rev=1091406&r1=1091405&r2=1091406&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/componentTest/JavaTestRenderer2.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/componentTest/JavaTestRenderer2.java Tue Apr 12 13:31:49 2011
@@ -35,7 +35,7 @@ import org.apache.myfaces.shared_impl.re
* This renderer can act as a drag and drop target for the annotation
* set in JavaTestRenderer1
*/
-@FacesRenderer(componentFamily = "javax.faces.Input", rendererType = "at.irian.JavaTestRenderer")
+
public class JavaTestRenderer2 extends HtmlTextareaRendererBase {
private static final String MSG = "<h2> Hello world ccc from Renderer 2 </h2>";
Modified: myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-extscript-helloworld/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-extscript-helloworld/pom.xml?rev=1091406&r1=1091405&r2=1091406&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-extscript-helloworld/pom.xml (original)
+++ myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-extscript-helloworld/pom.xml Tue Apr 12 13:31:49 2011
@@ -4,14 +4,14 @@
<parent>
<artifactId>extscript-examples</artifactId>
<groupId>org.apache.myfaces.extensions.scripting</groupId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.myfaces.extensions.scripting</groupId>
<artifactId>myfaces20-extscript-helloworld</artifactId>
<packaging>war</packaging>
<name>A simple project for MyFaces 2.0 and Ext-Scripting 1.0</name>
- <version>1.1-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
<url>http://www.apache.org</url>
<scm>
@@ -68,7 +68,7 @@
<dependency>
<groupId>org.apache.myfaces.extensions.scripting</groupId>
<artifactId>extscript-myfaces20-bundle</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
</dependency>
<dependency>
Modified: myfaces/extensions/scripting/trunk/extscript-examples/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-examples/pom.xml?rev=1091406&r1=1091405&r2=1091406&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-examples/pom.xml (original)
+++ myfaces/extensions/scripting/trunk/extscript-examples/pom.xml Tue Apr 12 13:31:49 2011
@@ -3,7 +3,7 @@
<artifactId>extscript-examples</artifactId>
<packaging>pom</packaging>
<name>Examples Submodule</name>
- <version>1.1-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
<description>
Examples Meta Project, see the subprojects
@@ -13,7 +13,7 @@
<parent>
<groupId>org.apache.myfaces.extensions.scripting</groupId>
<artifactId>extscript-root</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<scm>
@@ -40,6 +40,7 @@
</connector>
</connectors>
<scanIntervalSeconds>1</scanIntervalSeconds>
+
</configuration>
</plugin>
<!-- tomcat plugin as alternative testing ground -->
@@ -48,7 +49,8 @@
<artifactId>tomcat-maven-plugin</artifactId>
<version>1.0</version>
</plugin>
-
+
+
</plugins>
</build>
Modified: myfaces/extensions/scripting/trunk/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/pom.xml?rev=1091406&r1=1091405&r2=1091406&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/pom.xml (original)
+++ myfaces/extensions/scripting/trunk/pom.xml Tue Apr 12 13:31:49 2011
@@ -23,11 +23,11 @@
<artifactId>extscript-root</artifactId>
<packaging>pom</packaging>
<name>Myfaces Extension Scripting Project</name>
- <version>1.1-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
<properties>
<myfaces12.version>1.2.9</myfaces12.version>
- <myfaces2.version>2.0.2</myfaces2.version>
+ <myfaces2.version>2.0.4</myfaces2.version>
<groovy.version>1.7.1</groovy.version>
<extval.version>2.0.4</extval.version>
</properties>
@@ -121,6 +121,7 @@
<scope>test</scope>
</dependency>
+
<dependency>
<groupId>org.apache.myfaces.test</groupId>
<artifactId>myfaces-test20</artifactId>