svn commit: r1124739 - in /myfaces/extensions/cdi/trunk: core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/activation/ core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/scope/conversation/ core/api/src/main/java/org/apac...

[gp...@apache.org]

Author: gpetracek
Date: Thu May 19 13:15:49 2011
New Revision: 1124739

URL: http://svn.apache.org/viewvc?rev=1124739&view=rev
Log:
minor improvements

Modified:
    myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/activation/ExpressionActivated.java
    myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/scope/conversation/ConversationRequired.java
    myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/security/SecurityViolation.java
    myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ViewConfigCache.java

Modified: myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/activation/ExpressionActivated.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/activation/ExpressionActivated.java?rev=1124739&r1=1124738&r2=1124739&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/activation/ExpressionActivated.java (original)
+++ myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/activation/ExpressionActivated.java Thu May 19 13:15:49 2011
@@ -25,6 +25,10 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
+/**
+ * @author Gerhard Petracek
+ * @author Mark Struberg
+ */
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.TYPE})
 public @interface ExpressionActivated

Modified: myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/scope/conversation/ConversationRequired.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/scope/conversation/ConversationRequired.java?rev=1124739&r1=1124738&r2=1124739&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/scope/conversation/ConversationRequired.java (original)
+++ myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/scope/conversation/ConversationRequired.java Thu May 19 13:15:49 2011
@@ -38,6 +38,10 @@ import static java.lang.annotation.Reten
 @ViewMetaData(override = true)
 public @interface ConversationRequired
 {
+    /**
+     * Group of the conversation which is required. If used at beans, it's by default the group of the bean
+     * @return Group of the conversation
+     */
     Class<?> conversationGroup() default ConversationRequired.class;
 
     /**

Modified: myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/security/SecurityViolation.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/security/SecurityViolation.java?rev=1124739&r1=1124738&r2=1124739&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/security/SecurityViolation.java (original)
+++ myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/security/SecurityViolation.java Thu May 19 13:15:49 2011
@@ -18,12 +18,14 @@
  */
 package org.apache.myfaces.extensions.cdi.core.api.security;
 
+import java.io.Serializable;
+
 /**
  * Provides the concrete reason for the restriction.
  *
  * @author Gerhard Petracek
  */
-public interface SecurityViolation
+public interface SecurityViolation extends Serializable
 {
     /**
      * Provides a description of the violation.

Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ViewConfigCache.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ViewConfigCache.java?rev=1124739&r1=1124738&r2=1124739&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ViewConfigCache.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ViewConfigCache.java Thu May 19 13:15:49 2011
@@ -319,7 +319,7 @@ public class ViewConfigCache
             return;
         }
 
-        ViewConfigDescriptor viewConfig;
+        EditableViewConfigDescriptor viewConfig;
         for(InlineViewConfigDescriptor inlineViewConfigDescriptor : inlineViewConfigDescriptors)
         {
             viewConfig = inlineViewConfigDescriptor.getViewConfigExtractor()
@@ -327,11 +327,8 @@ public class ViewConfigCache
 
             if(viewConfig != null)
             {
-                if(viewConfig instanceof EditableViewConfigDescriptor)
-                {
-                    //activate view controller annotations
-                    ((EditableViewConfigDescriptor)viewConfig).addPageBean(viewConfig.getViewConfig());
-                }
+                //activate view controller annotations
+                viewConfig.addPageBean(viewConfig.getViewConfig());
 
                 storeViewDefinition(viewConfig.getViewId(), viewConfig, false, false);
             }