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/04/20 13:15:46 UTC
svn commit: r935871 - in /myfaces/extensions/scripting/trunk:
extscript-core-root/extscript-myfaces2-extensions/src/main/java/org/apache/myfaces/extensions/scripting/jsf2/annotation/
extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org...
Author: werpu
Date: Tue Apr 20 11:15:46 2010
New Revision: 935871
URL: http://svn.apache.org/viewvc?rev=935871&view=rev
Log:
https://issues.apache.org/jira/browse/EXTSCRIPT-121
managed property handling now improved, removed props are now removed from our implementation datastructure as well
the error now is gone
Added:
myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/test/JavaTestBeanReplacement.java
Modified:
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-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/beanvalidationtesting/Controller.java
myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/test/TestBean2.java
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=935871&r1=935870&r2=935871&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 20 11:15:46 2010
@@ -98,6 +98,8 @@ public class BeanImplementationListener
}
private void handleManagedpropertiesCompiled(ManagedBean mbean, Field[] fields) {
+ /*since we reprocess the managed properties we can handle them here by clearing them first*/
+ mbean.getManagedProperties().clear();
for (Field field : fields) {
if (log.isLoggable(Level.FINEST)) {
log.log(Level.FINEST, " Scanning field '" + field.getName() + "'");
Modified: myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/beanvalidationtesting/Controller.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/beanvalidationtesting/Controller.java?rev=935871&r1=935870&r2=935871&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/beanvalidationtesting/Controller.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/beanvalidationtesting/Controller.java Tue Apr 20 11:15:46 2010
@@ -47,7 +47,7 @@ public class Controller {
@BeanValidation.List({
@BeanValidation(useGroups = Default.class),
- @BeanValidation(viewIds = "/beanValidation.xhtml", useGroups = User.class)
+ @BeanValidation(viewIds = "/beanValidation.xhtml", useGroups = Admin.class)
})
private Person person = new Person();
Added: myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/test/JavaTestBeanReplacement.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/test/JavaTestBeanReplacement.java?rev=935871&view=auto
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/test/JavaTestBeanReplacement.java (added)
+++ myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/test/JavaTestBeanReplacement.java Tue Apr 20 11:15:46 2010
@@ -0,0 +1,107 @@
+/*
+ * 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.test;
+
+import javax.faces.bean.ManagedBean;
+import javax.faces.bean.ManagedProperty;
+import javax.faces.bean.RequestScoped;
+import javax.faces.event.ComponentSystemEvent;
+
+/**
+ * @author Werner Punz (latest modification by $Author$)
+ * @version $Revision$ $Date$
+ */
+
+public class JavaTestBeanReplacement {
+
+
+ String sayHello = "<h2>hello world test JavaTestBeanReplacement</h2>";
+ String hello2 = "hello from added attribute JavaTestBeanReplacement";
+ String hello3 = "hello from added attribute 2 JavaTestBeanReplacement";
+
+
+ @ManagedProperty(value = "#{javatestbean4xxx}")
+ TestBean3 bean3;
+
+ @ManagedProperty(value = "#{javatestbean4}")
+ TestBean4 bean4;
+
+ public void validate(ComponentSystemEvent e) {
+ System.out.println("Validating");
+ }
+
+ public String getSayHello() {
+
+
+ // return bean4.getHello();
+ return sayHello;
+ }
+
+ public String getSayHello2() {
+ return hello2;
+ }
+
+ public void setSayHello(String hello) {
+ this.sayHello = hello;
+ System.out.println("hello world");
+ }
+
+ public void setResource(String param) {
+
+ }
+
+ public String doAction() {
+ return null;
+ }
+
+ public String getResource() throws java.io.IOException {
+ /* ResourceHandler handler = FacesContext.getCurrentInstance().getApplication().getResourceHandler();
+ Resource resource = handler.createResource("testResource");
+ InputStream istr = resource.getInputStream();
+ BufferedReader rdr = new BufferedReader(new InputStreamReader(istr));
+ StringBuilder strBuf = new StringBuilder();
+ String line = null;
+ try {
+ while ((line = rdr.readLine()) != null) {
+ strBuf.append(line);
+ }
+ } catch (IOException ex) {
+
+ };
+ return strBuf.toString(); */
+ return "hello world";
+ }
+
+ public TestBean3 getBean3() {
+ return bean3;
+ }
+
+ public void setBean3(TestBean3 bean3) {
+ this.bean3 = bean3;
+ }
+
+ public TestBean4 getBean4() {
+ return bean4;
+ }
+
+ public void setBean4(TestBean4 bean4) {
+ this.bean4 = bean4;
+ }
+}
Modified: myfaces/extensions/scripting/trunk/extscript-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/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/test/TestBean2.java?rev=935871&r1=935870&r2=935871&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/test/TestBean2.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/test/TestBean2.java Tue Apr 20 11:15:46 2010
@@ -31,6 +31,8 @@ import javax.el.ELContext;
@RequestScoped
public class TestBean2 {
+
+
int cnt = 0;
String sayHello = "<h2>hello world test</h2>";
@@ -51,7 +53,8 @@ public class TestBean2 {
public String getSayHello() {
- return bean4.getHello();
+ return bean4.getHello();
+ //return "replacement";
}
public String getSayHello2() {