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 2009/09/21 19:22:27 UTC
svn commit: r817326 - in /myfaces/extensions/scripting/trunk:
core/core/src/main/java/org/apache/myfaces/scripting/api/
core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/
examples/myfaces20-example/src/main/webapp/WEB-...
Author: werpu
Date: Mon Sep 21 17:22:27 2009
New Revision: 817326
URL: http://svn.apache.org/viewvc?rev=817326&view=rev
Log:
https://issues.apache.org/jira/browse/EXTSCRIPT-18
initial scan now working on managed beans
Modified:
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/AnnotationScanListener.java
myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/BeanImplementationListener.java
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/WEB-INF/java/org/apache/myfaces/javaloader/blog/Blog.java
myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/test/TestBean2.java
Modified: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/AnnotationScanListener.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/AnnotationScanListener.java?rev=817326&r1=817325&r2=817326&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/AnnotationScanListener.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/AnnotationScanListener.java Mon Sep 21 17:22:27 2009
@@ -35,6 +35,6 @@
public void registerSource(Object clazz, String annotationName, Map<String, Object> params);
- public void register(Class clazz, String annotationName, Map<String, String> params);
+ public void register(Class clazz, String annotationName, Map<String, Object> params);
}
Modified: myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/BeanImplementationListener.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/BeanImplementationListener.java?rev=817326&r1=817325&r2=817326&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/BeanImplementationListener.java (original)
+++ myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/BeanImplementationListener.java Mon Sep 21 17:22:27 2009
@@ -91,12 +91,13 @@
AnnotationConstant propVal = (AnnotationConstant) params.get("name");
String beanName = (String) propVal.getParameterValue();
+ beanName = beanName.replaceAll("\"","");
if (!hasToReregister(beanName, clazz)) {
return;
}
ManagedBean mbean = new ManagedBean();
- mbean.setBeanClass(clazz.getName());
+ mbean.setBeanClass(clazz.getFullyQualifiedName());
mbean.setName(beanName);
_alreadyRegistered.put(beanName, mbean);
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=817326&r1=817325&r2=817326&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 Mon Sep 21 17:22:27 2009
@@ -29,19 +29,20 @@
</managed-bean>
+
<managed-bean>
<managed-bean-name>testbean</managed-bean-name>
<managed-bean-class>org.apache.myfaces.groovyloader.test.TestBean</managed-bean-class>
<managed-bean-scope>request</managed-bean-scope>
</managed-bean>
-
+<!--
<managed-bean>
<managed-bean-name>javatestbean</managed-bean-name>
<managed-bean-class>org.apache.myfaces.javaloader.test.TestBean2</managed-bean-class>
<managed-bean-scope>request</managed-bean-scope>
</managed-bean>
-
+-->
<managed-bean>
<managed-bean-name>blogView</managed-bean-name>
<managed-bean-class>org.apache.myfaces.groovyloader.blog.Blog</managed-bean-class>
Modified: myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/Blog.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/Blog.java?rev=817326&r1=817325&r2=817326&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/Blog.java (original)
+++ myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/Blog.java Mon Sep 21 17:22:27 2009
@@ -64,6 +64,8 @@
public String addEntry2 () {
+
+
getLog().info("adding entry");
Object service = JSFUtil.resolveVariable("javaBlogService");
@@ -100,8 +102,10 @@
executeMethod(service, "addEntry", entry);
}
+ throw new javax.faces.FacesException("bla bla bla");
+
//we stay on the same page
- return null;
+ // return null;
}
Modified: myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/test/TestBean2.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/test/TestBean2.java?rev=817326&r1=817325&r2=817326&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/test/TestBean2.java (original)
+++ myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/test/TestBean2.java Mon Sep 21 17:22:27 2009
@@ -5,6 +5,7 @@
import javax.faces.bean.RequestScoped;
+@ManagedBean (name="javatestbean")
public class TestBean2 {
String sayHello = "hello worldgggg";
String hello2 = "hello from added attribute";