svn commit: r1031451 - in /myfaces/extensions/cdi/trunk: core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/config/ core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/utils/ jee-modules/jsf-module/impl/src/main/java/org/...

[gp...@apache.org]

Author: gpetracek
Date: Fri Nov  5 06:33:42 2010
New Revision: 1031451

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

Added:
    myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/config/AbstractAttributeAware.java
      - copied, changed from r1031422, myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/config/AbstractCodiConfig.java
    myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/utils/EnhancedLiteral.java
Removed:
    myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/config/AbstractCodiConfig.java
Modified:
    myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/DefaultWindowContextConfig.java
    myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/spi/JsfAwareWindowContextConfig.java

Copied: myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/config/AbstractAttributeAware.java (from r1031422, myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/config/AbstractCodiConfig.java)
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/config/AbstractAttributeAware.java?p2=myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/config/AbstractAttributeAware.java&p1=myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/config/AbstractCodiConfig.java&r1=1031422&r2=1031451&rev=1031451&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/config/AbstractCodiConfig.java (original)
+++ myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/config/AbstractAttributeAware.java Fri Nov  5 06:33:42 2010
@@ -22,12 +22,12 @@ import java.util.Map;
 import java.util.HashMap;
 
 /**
- * Base config implementation which implements {@link org.apache.myfaces.extensions.cdi.core.api.config.AttributeAware}
- * to support custom attributes for existing configs.
+ * Base implementation which implements {@link org.apache.myfaces.extensions.cdi.core.api.config.AttributeAware}
+ * to support custom attributes.
  *  
  * @author Gerhard Petracek
  */
-public abstract class AbstractCodiConfig implements CodiConfig, AttributeAware
+public abstract class AbstractAttributeAware implements AttributeAware
 {
     private Map<String, Object> configAttributes;
 

Added: myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/utils/EnhancedLiteral.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/utils/EnhancedLiteral.java?rev=1031451&view=auto
==============================================================================
--- myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/utils/EnhancedLiteral.java (added)
+++ myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/utils/EnhancedLiteral.java Fri Nov  5 06:33:42 2010
@@ -0,0 +1,33 @@
+/*
+ * 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.extensions.cdi.core.impl.utils;
+
+import org.apache.myfaces.extensions.cdi.core.api.Enhanced;
+
+import javax.enterprise.util.AnnotationLiteral;
+
+/**
+ * Literal for the {@link org.apache.myfaces.extensions.cdi.core.api.Enhanced} annotation.
+ *
+ * @author Gerhard Petracek
+ */
+public class EnhancedLiteral extends AnnotationLiteral<Enhanced> implements Enhanced
+{
+    private static final long serialVersionUID = -7550852235532736821L;
+}
\ No newline at end of file

Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/DefaultWindowContextConfig.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/DefaultWindowContextConfig.java?rev=1031451&r1=1031450&r2=1031451&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/DefaultWindowContextConfig.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/DefaultWindowContextConfig.java Fri Nov  5 06:33:42 2010
@@ -19,6 +19,7 @@
 package org.apache.myfaces.extensions.cdi.jsf.impl.config;
 
 import org.apache.myfaces.extensions.cdi.core.api.projectstage.ProjectStage;
+import org.apache.myfaces.extensions.cdi.core.api.config.AbstractAttributeAware;
 import org.apache.myfaces.extensions.cdi.core.impl.utils.CodiUtils;
 import org.apache.myfaces.extensions.cdi.jsf.impl.scope.conversation.spi.JsfAwareWindowContextConfig;
 
@@ -60,7 +61,7 @@ import static org.apache.myfaces.extensi
  * @author Gerhard Petracek
  */
 @ApplicationScoped
-public class DefaultWindowContextConfig extends JsfAwareWindowContextConfig
+public class DefaultWindowContextConfig extends AbstractAttributeAware implements JsfAwareWindowContextConfig
 {
     private static final long serialVersionUID = -1065123725125153533L;
 

Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/spi/JsfAwareWindowContextConfig.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/scope/conversation/spi/JsfAwareWindowContextConfig.java?rev=1031451&r1=1031450&r2=1031451&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/spi/JsfAwareWindowContextConfig.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/spi/JsfAwareWindowContextConfig.java Fri Nov  5 06:33:42 2010
@@ -20,13 +20,12 @@ package org.apache.myfaces.extensions.cd
 
 import org.apache.myfaces.extensions.cdi.core.api.scope.conversation.WindowContextConfig;
 import org.apache.myfaces.extensions.cdi.core.api.scope.conversation.ConversationConfig;
-import org.apache.myfaces.extensions.cdi.core.api.config.AbstractCodiConfig;
+import org.apache.myfaces.extensions.cdi.core.api.config.CodiConfig;
 
 /**
  * @author Gerhard Petracek
  */
-public abstract class JsfAwareWindowContextConfig extends AbstractCodiConfig
-        implements WindowContextConfig, ConversationConfig
+public interface JsfAwareWindowContextConfig extends CodiConfig, WindowContextConfig, ConversationConfig
 {
-    public abstract boolean isInitialRedirectDisable();
+    boolean isInitialRedirectDisable();
 }