myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jankeesvanan...@apache.org
Subject svn commit: r799929 - in /myfaces/core/trunk: api/src/main/java/javax/faces/bean/ impl/src/main/java/org/apache/myfaces/config/annotation/
Date Sat, 01 Aug 2009 21:29:34 GMT
Author: jankeesvanandel
Date: Sat Aug  1 21:29:33 2009
New Revision: 799929

URL: http://svn.apache.org/viewvc?rev=799929&view=rev
Log:
MYFACES-2296 Annotation scanning bugs

Modified:
    myfaces/core/trunk/api/src/main/java/javax/faces/bean/ApplicationScoped.java
    myfaces/core/trunk/api/src/main/java/javax/faces/bean/CustomScoped.java
    myfaces/core/trunk/api/src/main/java/javax/faces/bean/ManagedBean.java
    myfaces/core/trunk/api/src/main/java/javax/faces/bean/ManagedProperty.java
    myfaces/core/trunk/api/src/main/java/javax/faces/bean/NoneScoped.java
    myfaces/core/trunk/api/src/main/java/javax/faces/bean/RequestScoped.java
    myfaces/core/trunk/api/src/main/java/javax/faces/bean/SessionScoped.java
    myfaces/core/trunk/api/src/main/java/javax/faces/bean/ViewScoped.java
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/annotation/AnnotationConfigurator.java
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/annotation/_ClassByteCodeAnnotationFilter.java

Modified: myfaces/core/trunk/api/src/main/java/javax/faces/bean/ApplicationScoped.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/bean/ApplicationScoped.java?rev=799929&r1=799928&r2=799929&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/bean/ApplicationScoped.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/bean/ApplicationScoped.java Sat Aug 
1 21:29:33 2009
@@ -18,12 +18,18 @@
  */
 package javax.faces.bean;
 
+import java.lang.annotation.*;
+
 /**
  * 
  * @since 2.0
  * @author Leonardo Uribe (latest modification by $Author$)
  * @version $Revision$ $Date$
  */
+@Documented
+@Retention(java.lang.annotation.RetentionPolicy.RUNTIME)
+@Target(ElementType.TYPE)
+@Inherited
 public @interface ApplicationScoped
 {
 

Modified: myfaces/core/trunk/api/src/main/java/javax/faces/bean/CustomScoped.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/bean/CustomScoped.java?rev=799929&r1=799928&r2=799929&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/bean/CustomScoped.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/bean/CustomScoped.java Sat Aug  1 21:29:33
2009
@@ -18,11 +18,17 @@
  */
 package javax.faces.bean;
 
+import java.lang.annotation.*;
+
 /**
  * @since 2.0
  * @author Leonardo Uribe (latest modification by $Author$)
  * @version $Revision$ $Date$
  */
+@Documented
+@Retention(java.lang.annotation.RetentionPolicy.RUNTIME)
+@Target(ElementType.TYPE)
+@Inherited
 public @interface CustomScoped
 {
     public String value() default "";

Modified: myfaces/core/trunk/api/src/main/java/javax/faces/bean/ManagedBean.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/bean/ManagedBean.java?rev=799929&r1=799928&r2=799929&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/bean/ManagedBean.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/bean/ManagedBean.java Sat Aug  1 21:29:33
2009
@@ -18,11 +18,7 @@
  */
 package javax.faces.bean;
 
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
+import java.lang.annotation.*;
 
 /**
  * @author Simon Lessard (latest modification by $Author$)
@@ -30,7 +26,8 @@
  *
  * @since 2.0
  */
-@Retention(RetentionPolicy.RUNTIME)
+@Documented
+@Retention(java.lang.annotation.RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)
 @Inherited
 public @interface ManagedBean

Modified: myfaces/core/trunk/api/src/main/java/javax/faces/bean/ManagedProperty.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/bean/ManagedProperty.java?rev=799929&r1=799928&r2=799929&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/bean/ManagedProperty.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/bean/ManagedProperty.java Sat Aug  1
21:29:33 2009
@@ -18,10 +18,7 @@
  */
 package javax.faces.bean;
 
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
+import java.lang.annotation.*;
 
 /**
  * @author Simon Lessard (latest modification by $Author$)
@@ -29,8 +26,10 @@
  * 
  * @since 2.0
  */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.FIELD)
+@Documented
+@Retention(java.lang.annotation.RetentionPolicy.RUNTIME)
+@Target({ElementType.FIELD, ElementType.METHOD})
+@Inherited
 public @interface ManagedProperty
 {
     /**

Modified: myfaces/core/trunk/api/src/main/java/javax/faces/bean/NoneScoped.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/bean/NoneScoped.java?rev=799929&r1=799928&r2=799929&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/bean/NoneScoped.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/bean/NoneScoped.java Sat Aug  1 21:29:33
2009
@@ -18,11 +18,17 @@
  */
 package javax.faces.bean;
 
+import java.lang.annotation.*;
+
 /**
  * @since 2.0
  * @author Leonardo Uribe (latest modification by $Author$)
  * @version $Revision$ $Date$
  */
+@Documented
+@Retention(java.lang.annotation.RetentionPolicy.RUNTIME)
+@Target(ElementType.TYPE)
+@Inherited
 public @interface NoneScoped
 {
 

Modified: myfaces/core/trunk/api/src/main/java/javax/faces/bean/RequestScoped.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/bean/RequestScoped.java?rev=799929&r1=799928&r2=799929&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/bean/RequestScoped.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/bean/RequestScoped.java Sat Aug  1 21:29:33
2009
@@ -18,11 +18,17 @@
  */
 package javax.faces.bean;
 
+import java.lang.annotation.*;
+
 /**
  * @since 2.0
  * @author Leonardo Uribe (latest modification by $Author$)
  * @version $Revision$ $Date$
  */
+@Documented
+@Retention(java.lang.annotation.RetentionPolicy.RUNTIME)
+@Target(ElementType.TYPE)
+@Inherited
 public @interface RequestScoped
 {
 

Modified: myfaces/core/trunk/api/src/main/java/javax/faces/bean/SessionScoped.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/bean/SessionScoped.java?rev=799929&r1=799928&r2=799929&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/bean/SessionScoped.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/bean/SessionScoped.java Sat Aug  1 21:29:33
2009
@@ -18,11 +18,17 @@
  */
 package javax.faces.bean;
 
+import java.lang.annotation.*;
+
 /**
  * @since 2.0
  * @author Leonardo Uribe (latest modification by $Author$)
  * @version $Revision$ $Date$
  */
+@Documented
+@Retention(java.lang.annotation.RetentionPolicy.RUNTIME)
+@Target(ElementType.TYPE)
+@Inherited
 public @interface SessionScoped
 {
 

Modified: myfaces/core/trunk/api/src/main/java/javax/faces/bean/ViewScoped.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/bean/ViewScoped.java?rev=799929&r1=799928&r2=799929&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/bean/ViewScoped.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/bean/ViewScoped.java Sat Aug  1 21:29:33
2009
@@ -18,11 +18,17 @@
  */
 package javax.faces.bean;
 
+import java.lang.annotation.*;
+
 /**
  * @since 2.0
  * @author Leonardo Uribe (latest modification by $Author$)
  * @version $Revision$ $Date$
  */
+@Documented
+@Retention(java.lang.annotation.RetentionPolicy.RUNTIME)
+@Target(ElementType.TYPE)
+@Inherited
 public @interface ViewScoped
 {
 

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/annotation/AnnotationConfigurator.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/annotation/AnnotationConfigurator.java?rev=799929&r1=799928&r2=799929&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/annotation/AnnotationConfigurator.java
(original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/annotation/AnnotationConfigurator.java
Sat Aug  1 21:29:33 2009
@@ -140,11 +140,11 @@
     static
     {
         Set<String> bcan = new HashSet<String>(10, 1f);
-        bcan.add("Lorg/apache/myfaces/test/annotations/component/FacesComponent;");
-        bcan.add("Lorg/apache/myfaces/test/annotations/converter/FacesConverter;");
-        bcan.add("Lorg/apache/myfaces/test/annotations/validator/FacesValidator;");
-        bcan.add("Lorg/apache/myfaces/test/annotations/render/FacesRenderer;");
-        bcan.add("Lorg/apache/myfaces/test/annotations/bean/ManagedBean;");
+        bcan.add("Ljavax/faces/component/FacesComponent;");
+        bcan.add("Ljavax/faces/convert/FacesConverter;");
+        bcan.add("Ljavax/faces/validator/FacesValidator;");
+        bcan.add("Ljavax/faces/render/FacesRenderer;");
+        bcan.add("Ljavax/faces/bean/ManagedBean;");
 
         byteCodeAnnotationsNames = Collections.unmodifiableSet(bcan);
     }

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/annotation/_ClassByteCodeAnnotationFilter.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/annotation/_ClassByteCodeAnnotationFilter.java?rev=799929&r1=799928&r2=799929&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/annotation/_ClassByteCodeAnnotationFilter.java
(original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/annotation/_ClassByteCodeAnnotationFilter.java
Sat Aug  1 21:29:33 2009
@@ -48,7 +48,7 @@
      * Checks if the .class file referenced by the DataInput could 
      * contain the annotation names available in the set.
      * 
-     * @param stream
+     * @param in
      * @param byteCodeAnnotationsNames
      * @return
      * @throws IOException
@@ -143,6 +143,7 @@
                     break;
                 case CP_INFO_STRING: //ignore
                     //u2 string_index
+                    in.readUnsignedShort();
                     break;
                 case CP_INFO_INTEGER: //ignore
                 case CP_INFO_FLOAT: //ignore
@@ -154,6 +155,7 @@
                     //u4 high_bytes
                     //u4 low_bytes
                     in.readInt();
+                    in.readInt();
                     break;
                 case CP_INFO_NAME_AND_TYPE: //ignore
                     //u2 name_index



Mime
View raw message