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/16 15:37:26 UTC
svn commit: r964799 - in /myfaces/extensions/cdi/trunk:
core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/util/
jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/config/
jee-modules/jsf-module/i...
Author: gpetracek
Date: Fri Jul 16 13:37:25 2010
New Revision: 964799
URL: http://svn.apache.org/viewvc?rev=964799&view=rev
Log:
EXTCDI-1, EXTCDI-2 and EXTCDI-3 intermediate result of RedirectProcessor and minor refactorings
Added:
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/request/DefaultRedirectProcessor.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/spi/JsfAwareWindowContextConfig.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/spi/RedirectProcessor.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/util/UuidEntry.java
- copied, changed from r964730, myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/UuidEntry.java
myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf2/impl/scope/conversation/DefaultRedirectProcessor.java
Removed:
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/UuidEntry.java
Modified:
myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/util/ClassUtils.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/config/DefaultCodiWebConfig.java
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/RedirectedConversationAwareExternalContext.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/util/ConversationUtils.java
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/scope/conversation/RedirectedConversationAwareExternalContext.java
Modified: myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/util/ClassUtils.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/util/ClassUtils.java?rev=964799&r1=964798&r2=964799&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/util/ClassUtils.java (original)
+++ myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/util/ClassUtils.java Fri Jul 16 13:37:25 2010
@@ -127,6 +127,14 @@ public class ClassUtils
return null;
}
+ public static <T> T tryToInstantiateClassForName(String className, Class<T> targetType)
+ {
+ Object result = tryToInstantiateClassForName(className);
+
+ //noinspection unchecked
+ return result != null ? (T)result : null;
+ }
+
public static Object tryToInstantiateClassForName(String className)
{
try
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/config/DefaultCodiWebConfig.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/DefaultCodiWebConfig.java?rev=964799&r1=964798&r2=964799&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/config/DefaultCodiWebConfig.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/config/DefaultCodiWebConfig.java Fri Jul 16 13:37:25 2010
@@ -24,15 +24,15 @@ import static org.apache.myfaces.extensi
import org.apache.myfaces.extensions.cdi.core.api.config.Config;
import javax.enterprise.context.Dependent;
+import javax.enterprise.context.ApplicationScoped;
import javax.enterprise.inject.Produces;
import javax.inject.Named;
-import javax.inject.Singleton;
import javax.faces.context.FacesContext;
/**
* @author Gerhard Petracek
*/
-@Singleton
+@ApplicationScoped
public class DefaultCodiWebConfig extends CodiWebConfig12
{
private static final long serialVersionUID = 2195635039365964148L;
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=964799&r1=964798&r2=964799&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 Fri Jul 16 13:37:25 2010
@@ -21,18 +21,21 @@ package org.apache.myfaces.extensions.cd
import org.apache.myfaces.extensions.cdi.core.api.config.Config;
import org.apache.myfaces.extensions.cdi.core.api.scope.conversation.WindowContextConfig;
import static org.apache.myfaces.extensions.cdi.javaee.jsf.api.ConfigParameter.*;
+import org.apache.myfaces.extensions.cdi.javaee.jsf.impl.scope.conversation.spi.JsfAwareWindowContextConfig;
+import org.apache.myfaces.extensions.cdi.javaee.jsf.impl.scope.conversation.spi.RedirectProcessor;
+import org.apache.myfaces.extensions.cdi.javaee.jsf.impl.request.DefaultRedirectProcessor;
import javax.enterprise.context.Dependent;
+import javax.enterprise.context.ApplicationScoped;
import javax.enterprise.inject.Produces;
import javax.faces.context.FacesContext;
import javax.inject.Named;
-import javax.inject.Singleton;
/**
* @author Gerhard Petracek
*/
-@Singleton
-public class DefaultWindowContextConfig extends WindowContextConfig
+@ApplicationScoped
+public class DefaultWindowContextConfig extends JsfAwareWindowContextConfig
{
private static final long serialVersionUID = -1065123725125153533L;
@@ -174,4 +177,9 @@ public class DefaultWindowContextConfig
setAttribute(GROUPED_CONVERSATION_TIMEOUT, Integer.parseInt(timeoutString));
}
+
+ public RedirectProcessor getRedirectProcessor()
+ {
+ return new DefaultRedirectProcessor();
+ }
}
\ No newline at end of file
Added: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/request/DefaultRedirectProcessor.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/request/DefaultRedirectProcessor.java?rev=964799&view=auto
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/request/DefaultRedirectProcessor.java (added)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/request/DefaultRedirectProcessor.java Fri Jul 16 13:37:25 2010
@@ -0,0 +1,43 @@
+/*
+ * 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.javaee.jsf.impl.request;
+
+import org.apache.myfaces.extensions.cdi.javaee.jsf.impl.scope.conversation.spi.RedirectProcessor;
+import static org.apache.myfaces.extensions.cdi.javaee.jsf.impl.util.ConversationUtils.UUID_ID_KEY;
+
+import javax.faces.context.ExternalContext;
+import java.io.IOException;
+
+/**
+ * @author Gerhard Petracek
+ */
+public class DefaultRedirectProcessor implements RedirectProcessor
+{
+ public void redirect(ExternalContext externalContext, String url, String uniqueRequestId) throws IOException
+ {
+ if (uniqueRequestId != null)
+ {
+ url = url + "?" + UUID_ID_KEY + "=" + uniqueRequestId;
+
+ url = externalContext.encodeActionURL(url);
+ }
+
+ externalContext.redirect(url);
+ }
+}
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/RedirectedConversationAwareExternalContext.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/RedirectedConversationAwareExternalContext.java?rev=964799&r1=964798&r2=964799&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/RedirectedConversationAwareExternalContext.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/RedirectedConversationAwareExternalContext.java Fri Jul 16 13:37:25 2010
@@ -19,6 +19,7 @@
package org.apache.myfaces.extensions.cdi.javaee.jsf.impl.scope.conversation;
import static org.apache.myfaces.extensions.cdi.javaee.jsf.impl.util.ConversationUtils.*;
+import org.apache.myfaces.extensions.cdi.javaee.jsf.impl.scope.conversation.spi.RedirectProcessor;
import javax.faces.context.ExternalContext;
import java.io.IOException;
@@ -39,6 +40,8 @@ public class RedirectedConversationAware
{
private ExternalContext wrapped;
+ private static RedirectProcessor redirectProcessor;
+
public RedirectedConversationAwareExternalContext(ExternalContext wrapped)
{
this.wrapped = wrapped;
@@ -255,6 +258,15 @@ public class RedirectedConversationAware
public void redirect(String url)
throws IOException
{
- sendRedirect(this.wrapped, url);
+ lazyInit();
+ sendRedirect(this.wrapped, url, redirectProcessor);
+ }
+
+ private synchronized void lazyInit()
+ {
+ if(redirectProcessor == null)
+ {
+ redirectProcessor = getRedirectProcessor();
+ }
}
}
Added: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/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/javaee/jsf/impl/scope/conversation/spi/JsfAwareWindowContextConfig.java?rev=964799&view=auto
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/spi/JsfAwareWindowContextConfig.java (added)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/spi/JsfAwareWindowContextConfig.java Fri Jul 16 13:37:25 2010
@@ -0,0 +1,29 @@
+/*
+ * 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.javaee.jsf.impl.scope.conversation.spi;
+
+import org.apache.myfaces.extensions.cdi.core.api.scope.conversation.WindowContextConfig;
+
+/**
+ * @author Gerhard Petracek
+ */
+public abstract class JsfAwareWindowContextConfig extends WindowContextConfig
+{
+ public abstract RedirectProcessor getRedirectProcessor();
+}
Added: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/spi/RedirectProcessor.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/spi/RedirectProcessor.java?rev=964799&view=auto
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/spi/RedirectProcessor.java (added)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/spi/RedirectProcessor.java Fri Jul 16 13:37:25 2010
@@ -0,0 +1,30 @@
+/*
+ * 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.javaee.jsf.impl.scope.conversation.spi;
+
+import javax.faces.context.ExternalContext;
+import java.io.IOException;
+
+/**
+ * @author Gerhard Petracek
+ */
+public interface RedirectProcessor
+{
+ void redirect(ExternalContext externalContext, String url, String uniqueRequestId) throws IOException;
+}
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/util/ConversationUtils.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/util/ConversationUtils.java?rev=964799&r1=964798&r2=964799&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/util/ConversationUtils.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/util/ConversationUtils.java Fri Jul 16 13:37:25 2010
@@ -19,15 +19,18 @@
package org.apache.myfaces.extensions.cdi.javaee.jsf.impl.util;
import org.apache.myfaces.extensions.cdi.core.api.manager.BeanManagerProvider;
+import static org.apache.myfaces.extensions.cdi.core.api.manager.BeanManagerProvider.getInstance;
import org.apache.myfaces.extensions.cdi.core.api.tools.annotate.DefaultAnnotation;
import org.apache.myfaces.extensions.cdi.core.api.scope.conversation.ViewAccessScoped;
import org.apache.myfaces.extensions.cdi.core.api.scope.conversation.WindowScoped;
import org.apache.myfaces.extensions.cdi.core.api.scope.conversation.ConversationGroup;
+import org.apache.myfaces.extensions.cdi.core.api.resolver.ConfigResolver;
import org.apache.myfaces.extensions.cdi.core.impl.scope.conversation.spi.WindowContextManager;
import org.apache.myfaces.extensions.cdi.core.impl.utils.CodiUtils;
import org.apache.myfaces.extensions.cdi.javaee.jsf.api.qualifier.Jsf;
import org.apache.myfaces.extensions.cdi.javaee.jsf.impl.scope.conversation.WindowContextIdHolderComponent;
-import org.apache.myfaces.extensions.cdi.javaee.jsf.impl.scope.conversation.UuidEntry;
+import org.apache.myfaces.extensions.cdi.javaee.jsf.impl.scope.conversation.spi.RedirectProcessor;
+import org.apache.myfaces.extensions.cdi.javaee.jsf.impl.scope.conversation.spi.JsfAwareWindowContextConfig;
import javax.enterprise.inject.spi.Bean;
import javax.enterprise.inject.spi.BeanManager;
@@ -210,6 +213,7 @@ public class ConversationUtils
if (windowContextIdHolder != null)
{
+ //TODO cache for request
return windowContextIdHolder.getWindowContextId();
}
@@ -344,21 +348,31 @@ public class ConversationUtils
return new WindowContextIdHolderComponent(conversationManager.getCurrentWindowContext().getId());
}
- public static void sendRedirect(ExternalContext externalContext, String url) throws IOException
+ public static void sendRedirect(ExternalContext externalContext,
+ String url,
+ RedirectProcessor redirectProcessor) throws IOException
{
- Long windowContextId = resolveWindowContextId();
-
- if (windowContextId != null)
+ if(redirectProcessor != null)
{
- UuidEntry uuidEntry = storeUuidEntry(externalContext.getSessionMap(),
- windowContextId,
- getOldViewIdFromRequest(externalContext.getRequestMap()));
+ Long windowContextId = resolveWindowContextId();
- url = url + "?" + UUID_ID_KEY + "=" + uuidEntry.getUuid();
- url = externalContext.encodeActionURL(url);
- }
+ String uniqueRequestId = null;
+ if (windowContextId != null)
+ {
+ UuidEntry uuidEntry = storeUuidEntry(externalContext.getSessionMap(),
+ windowContextId,
+ getOldViewIdFromRequest(externalContext.getRequestMap()));
- externalContext.redirect(url);
+ uniqueRequestId = uuidEntry.getUuid();
+ }
+
+ redirectProcessor.redirect(externalContext, url, uniqueRequestId);
+ }
+ else
+ {
+ //TODO log warning in case of project stage dev.
+ externalContext.redirect(url);
+ }
}
private static Long resolveWindowContextId()
@@ -366,4 +380,15 @@ public class ConversationUtils
return ConversationUtils.resolveWindowContextId(false
/*TODO log warning if request parameter is disabled - we have to use false here*/);
}
+
+ public static RedirectProcessor getRedirectProcessor()
+ {
+ Set<Bean<?>> configResolvers = getInstance().getBeanManager().getBeans(ConfigResolver.class);
+
+ //TODO
+ ConfigResolver configResolver = (ConfigResolver) CodiUtils
+ .getOrCreateScopedInstanceOfBean(configResolvers.iterator().next());
+
+ return configResolver.resolve(JsfAwareWindowContextConfig.class).getRedirectProcessor();
+ }
}
Copied: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/util/UuidEntry.java (from r964730, myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/UuidEntry.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/util/UuidEntry.java?p2=myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/util/UuidEntry.java&p1=myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/UuidEntry.java&r1=964730&r2=964799&rev=964799&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/UuidEntry.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/util/UuidEntry.java Fri Jul 16 13:37:25 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.extensions.cdi.javaee.jsf.impl.scope.conversation;
+package org.apache.myfaces.extensions.cdi.javaee.jsf.impl.util;
import java.util.UUID;
@@ -24,30 +24,30 @@ import java.util.UUID;
* TODO
* @author Gerhard Petracek
*/
-public class UuidEntry
+class UuidEntry
{
private final String uuid;
private final long windowContextId;
private final String viewId;
- public UuidEntry(long windowContextId, String viewId)
+ UuidEntry(long windowContextId, String viewId)
{
this.uuid = UUID.randomUUID().toString().replace("-", "");
this.viewId = viewId;
this.windowContextId = windowContextId;
}
- public String getUuid()
+ String getUuid()
{
return uuid;
}
- public long getWindowContextId()
+ long getWindowContextId()
{
return windowContextId;
}
- public String getViewId()
+ String getViewId()
{
return viewId;
}
Modified: 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/request/RequestTypeResolverExtension.java?rev=964799&r1=964798&r2=964799&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/request/RequestTypeResolverExtension.java Fri Jul 16 13:37:25 2010
@@ -19,6 +19,7 @@
package org.apache.myfaces.extensions.cdi.javaee.jsf2.impl.request;
import org.apache.myfaces.extensions.cdi.javaee.jsf.impl.request.DefaultRequestTypeResolver;
+import org.apache.myfaces.extensions.cdi.javaee.jsf.impl.config.DefaultWindowContextConfig;
import javax.enterprise.inject.spi.Extension;
import javax.enterprise.inject.spi.ProcessAnnotatedType;
@@ -31,10 +32,16 @@ public class RequestTypeResolverExtensio
{
public void filterJsfPhaseListeners(@Observes ProcessAnnotatedType processAnnotatedType)
{
- if(DefaultRequestTypeResolver.class.isAssignableFrom(processAnnotatedType.getAnnotatedType().getJavaClass()))
+ Class beanClass = processAnnotatedType.getAnnotatedType().getJavaClass();
+ if(DefaultRequestTypeResolver.class.isAssignableFrom(beanClass))
{
//veto the RequestTypeResolver for jsf 1.2
processAnnotatedType.veto();
}
+ else if(DefaultWindowContextConfig.class.getName().equals(beanClass.getName()))
+ {
+ //veto the config for jsf 1.2
+ processAnnotatedType.veto();
+ }
}
}
Added: myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf2/impl/scope/conversation/DefaultRedirectProcessor.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/DefaultRedirectProcessor.java?rev=964799&view=auto
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf2/impl/scope/conversation/DefaultRedirectProcessor.java (added)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf2/impl/scope/conversation/DefaultRedirectProcessor.java Fri Jul 16 13:37:25 2010
@@ -0,0 +1,44 @@
+/*
+ * 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.javaee.jsf2.impl.scope.conversation;
+
+import org.apache.myfaces.extensions.cdi.javaee.jsf.impl.scope.conversation.spi.RedirectProcessor;
+import static org.apache.myfaces.extensions.cdi.javaee.jsf.impl.util.ConversationUtils.UUID_ID_KEY;
+
+import javax.faces.context.ExternalContext;
+import java.io.IOException;
+
+/**
+ * @author Gerhard Petracek
+ */
+public class DefaultRedirectProcessor implements RedirectProcessor
+{
+ public void redirect(ExternalContext externalContext, String url, String uniqueRequestId) throws IOException
+ {
+ //TODO try to use special jsf 2.0 api's
+ if (uniqueRequestId != null)
+ {
+ url = url + "?" + UUID_ID_KEY + "=" + uniqueRequestId;
+
+ url = externalContext.encodeActionURL(url);
+ }
+
+ externalContext.redirect(url);
+ }
+}
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf2/impl/scope/conversation/RedirectedConversationAwareExternalContext.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/RedirectedConversationAwareExternalContext.java?rev=964799&r1=964798&r2=964799&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf2/impl/scope/conversation/RedirectedConversationAwareExternalContext.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf2/impl/scope/conversation/RedirectedConversationAwareExternalContext.java Fri Jul 16 13:37:25 2010
@@ -19,6 +19,7 @@
package org.apache.myfaces.extensions.cdi.javaee.jsf2.impl.scope.conversation;
import static org.apache.myfaces.extensions.cdi.javaee.jsf.impl.util.ConversationUtils.*;
+import org.apache.myfaces.extensions.cdi.javaee.jsf.impl.scope.conversation.spi.RedirectProcessor;
import javax.faces.context.ExternalContext;
import javax.faces.context.Flash;
@@ -43,6 +44,8 @@ public class RedirectedConversationAware
{
private final ExternalContext wrapped;
+ private RedirectProcessor redirectProcessor;
+
public RedirectedConversationAwareExternalContext(ExternalContext wrapped)
{
this.wrapped = wrapped;
@@ -161,6 +164,7 @@ public class RedirectedConversationAware
@Override
public String getRequestCharacterEncoding()
{
+ //TODO codi config
return wrapped.getRequestCharacterEncoding();
}
@@ -283,6 +287,8 @@ public class RedirectedConversationAware
@Override
public String getResponseCharacterEncoding()
{
+ //TODO codi config - depending on getResponseContentType
+
return wrapped.getResponseCharacterEncoding();
}
@@ -426,6 +432,15 @@ public class RedirectedConversationAware
public void redirect(String url)
throws IOException
{
- sendRedirect(this.wrapped, url);
+ lazyInit();
+ sendRedirect(this.wrapped, url, this.redirectProcessor);
+ }
+
+ private synchronized void lazyInit()
+ {
+ if(this.redirectProcessor == null)
+ {
+ this.redirectProcessor = getRedirectProcessor();
+ }
}
}