svn commit: r1036815 - in /myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl: Jsf12AwareFilterExtension.java config/DefaultWindowContextConfig.java

[gp...@apache.org]

Author: gpetracek
Date: Fri Nov 19 12:22:22 2010
New Revision: 1036815

URL: http://svn.apache.org/viewvc?rev=1036815&view=rev
Log:
cleanup

Added:
    myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/config/DefaultWindowContextConfig.java
Modified:
    myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/Jsf12AwareFilterExtension.java

Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/Jsf12AwareFilterExtension.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/Jsf12AwareFilterExtension.java?rev=1036815&r1=1036814&r2=1036815&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/Jsf12AwareFilterExtension.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/Jsf12AwareFilterExtension.java Fri Nov 19 12:22:22 2010
@@ -19,7 +19,7 @@
 package org.apache.myfaces.extensions.cdi.jsf2.impl;
 
 import org.apache.myfaces.extensions.cdi.jsf.impl.request.DefaultRequestTypeResolver;
-import org.apache.myfaces.extensions.cdi.jsf.impl.config.DefaultWindowContextConfig;
+//import org.apache.myfaces.extensions.cdi.jsf.impl.config.DefaultWindowContextConfig;
 import org.apache.myfaces.extensions.cdi.core.impl.util.ClassDeactivation;
 import org.apache.myfaces.extensions.cdi.core.api.Deactivatable;
 
@@ -49,11 +49,11 @@ public class Jsf12AwareFilterExtension i
             //veto the RequestTypeResolver for jsf 1.2
             processAnnotatedType.veto();
         }
-        else if(DefaultWindowContextConfig.class.getName().equals(beanClass.getName()))
+        /*else if(DefaultWindowContextConfig.class.getName().equals(beanClass.getName()))
         {
             //veto the config for jsf 1.2
             processAnnotatedType.veto();
-        }
+        }*/
     }
 
     public boolean isActivated()

Added: myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/config/DefaultWindowContextConfig.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/config/DefaultWindowContextConfig.java?rev=1036815&view=auto
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/config/DefaultWindowContextConfig.java (added)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/config/DefaultWindowContextConfig.java Fri Nov 19 12:22:22 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.jsf2.impl.config;
+
+import javax.enterprise.inject.Specializes;
+import javax.enterprise.context.ApplicationScoped;
+
+/**
+ * @author Gerhard Petracek
+ */
+@Specializes
+@ApplicationScoped
+public class DefaultWindowContextConfig  extends
+        org.apache.myfaces.extensions.cdi.jsf.impl.config.DefaultWindowContextConfig
+{
+    private static final long serialVersionUID = 2433934080486339139L;
+}