You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by gp...@apache.org on 2010/07/28 22:00:40 UTC
svn commit: r980191 - in /myfaces/extensions/cdi/trunk/jee-modules:
jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/config/
jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversati...
Author: gpetracek
Date: Wed Jul 28 20:00:40 2010
New Revision: 980191
URL: http://svn.apache.org/viewvc?rev=980191&view=rev
Log:
EXTCDI-1, EXTCDI-2 and EXTCDI-3 cleanup
Added:
myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf2/impl/Jsf12AwareFilterExtension.java
- copied, changed from r979798, myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf2/impl/request/RequestTypeResolverExtension.java
myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf2/impl/config/
myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf2/impl/config/DefaultWindowContextConfig.java
- copied, changed from r980166, myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf2/impl/scope/conversation/DefaultWindowContextConfig.java
myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf2/impl/scope/conversation/ServerSideWindowHandler.java
- copied, changed from r980166, myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf2/impl/request/ServerSideWindowHandler.java
Removed:
myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf2/impl/request/RequestTypeResolverExtension.java
myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf2/impl/request/ServerSideWindowHandler.java
myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf2/impl/scope/conversation/DefaultWindowContextConfig.java
Modified:
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/config/DefaultWindowContextConfig.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/DefaultWindowHandler.java
myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/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/javaee/jsf/impl/config/DefaultWindowContextConfig.java?rev=980191&r1=980190&r2=980191&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/config/DefaultWindowContextConfig.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/config/DefaultWindowContextConfig.java Wed Jul 28 20:00:40 2010
@@ -184,7 +184,10 @@ public class DefaultWindowContextConfig
public WindowHandler getWindowHandler()
{
- return new DefaultWindowHandler(isUrlParameterSupported());
+ return new DefaultWindowHandler(isUrlParameterSupported())
+ {
+ private static final long serialVersionUID = 7376499174252256735L;
+ };
}
public ConversationFactory getConversationFactory()
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/DefaultWindowHandler.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/DefaultWindowHandler.java?rev=980191&r1=980190&r2=980191&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/DefaultWindowHandler.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/DefaultWindowHandler.java Wed Jul 28 20:00:40 2010
@@ -43,7 +43,7 @@ public class DefaultWindowHandler implem
protected final boolean useWindowAwareUrlEncoding;
- public DefaultWindowHandler(boolean useWindowAwareUrlEncoding)
+ protected DefaultWindowHandler(boolean useWindowAwareUrlEncoding)
{
this.useWindowAwareUrlEncoding = useWindowAwareUrlEncoding;
}
Copied: myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf2/impl/Jsf12AwareFilterExtension.java (from r979798, myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf2/impl/request/RequestTypeResolverExtension.java)
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf2/impl/Jsf12AwareFilterExtension.java?p2=myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf2/impl/Jsf12AwareFilterExtension.java&p1=myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf2/impl/request/RequestTypeResolverExtension.java&r1=979798&r2=980191&rev=980191&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf2/impl/request/RequestTypeResolverExtension.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf2/impl/Jsf12AwareFilterExtension.java Wed Jul 28 20:00:40 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.extensions.cdi.javaee.jsf2.impl.request;
+package org.apache.myfaces.extensions.cdi.javaee.jsf2.impl;
import org.apache.myfaces.extensions.cdi.javaee.jsf.impl.request.DefaultRequestTypeResolver;
import org.apache.myfaces.extensions.cdi.javaee.jsf.impl.config.DefaultWindowContextConfig;
@@ -26,9 +26,13 @@ import javax.enterprise.inject.spi.Proce
import javax.enterprise.event.Observes;
/**
+ * filters implementations for jsf 1.2
+ * this module contains all replacements for jsf 2.0
+ *
* @author Gerhard Petracek
*/
-public class RequestTypeResolverExtension implements Extension
+@SuppressWarnings({"UnusedDeclaration"})
+public class Jsf12AwareFilterExtension implements Extension
{
public void filterJsfPhaseListeners(@Observes ProcessAnnotatedType processAnnotatedType)
{
Copied: myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf2/impl/config/DefaultWindowContextConfig.java (from r980166, myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf2/impl/scope/conversation/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/javaee/jsf2/impl/config/DefaultWindowContextConfig.java?p2=myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf2/impl/config/DefaultWindowContextConfig.java&p1=myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf2/impl/scope/conversation/DefaultWindowContextConfig.java&r1=980166&r2=980191&rev=980191&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf2/impl/scope/conversation/DefaultWindowContextConfig.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf2/impl/config/DefaultWindowContextConfig.java Wed Jul 28 20:00:40 2010
@@ -16,10 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.extensions.cdi.javaee.jsf2.impl.scope.conversation;
+package org.apache.myfaces.extensions.cdi.javaee.jsf2.impl.config;
import org.apache.myfaces.extensions.cdi.javaee.jsf.impl.scope.conversation.spi.WindowHandler;
-import org.apache.myfaces.extensions.cdi.javaee.jsf2.impl.request.ServerSideWindowHandler;
+import org.apache.myfaces.extensions.cdi.javaee.jsf2.impl.scope.conversation.ServerSideWindowHandler;
import javax.enterprise.context.ApplicationScoped;
@@ -36,6 +36,9 @@ public class DefaultWindowContextConfig
@Override
public WindowHandler getWindowHandler()
{
- return new ServerSideWindowHandler(isUrlParameterSupported());
+ return new ServerSideWindowHandler(isUrlParameterSupported())
+ {
+ private static final long serialVersionUID = -9034142203391043297L;
+ };
}
}
Copied: myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf2/impl/scope/conversation/ServerSideWindowHandler.java (from r980166, myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf2/impl/request/ServerSideWindowHandler.java)
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf2/impl/scope/conversation/ServerSideWindowHandler.java?p2=myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf2/impl/scope/conversation/ServerSideWindowHandler.java&p1=myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf2/impl/request/ServerSideWindowHandler.java&r1=980166&r2=980191&rev=980191&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf2/impl/request/ServerSideWindowHandler.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf2/impl/scope/conversation/ServerSideWindowHandler.java Wed Jul 28 20:00:40 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.extensions.cdi.javaee.jsf2.impl.request;
+package org.apache.myfaces.extensions.cdi.javaee.jsf2.impl.scope.conversation;
import org.apache.myfaces.extensions.cdi.javaee.jsf.impl.scope.conversation.DefaultWindowHandler;
@@ -42,7 +42,7 @@ public class ServerSideWindowHandler ext
//workaround for mojarra
private final boolean useFallback;
- public ServerSideWindowHandler(boolean useWindowAwareUrlEncoding)
+ protected ServerSideWindowHandler(boolean useWindowAwareUrlEncoding)
{
super(useWindowAwareUrlEncoding);
this.useFallback = tryToLoadClassForName("org.apache.myfaces.context.FacesContextFactoryImpl") == null;
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension?rev=980191&r1=980190&r2=980191&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension Wed Jul 28 20:00:40 2010
@@ -21,4 +21,4 @@
#org.apache.myfaces.extensions.cdi.javaee.jsf2.impl.scope.view.ViewScopedExtension
# we have to activate this extension in any case!
-org.apache.myfaces.extensions.cdi.javaee.jsf2.impl.request.RequestTypeResolverExtension
+org.apache.myfaces.extensions.cdi.javaee.jsf2.impl.Jsf12AwareFilterExtension