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/11/19 17:06:26 UTC
svn commit: r1036914 - in /myfaces/extensions/cdi/trunk/jee-modules:
jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/spi/
jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/conv...
Author: gpetracek
Date: Fri Nov 19 16:06:25 2010
New Revision: 1036914
URL: http://svn.apache.org/viewvc?rev=1036914&view=rev
Log:
first draft of BookmarkAwareWindowHandler
Added:
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/spi/BookmarkAwareWindowHandler.java
myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/conversation/ClientAwareWindowHandler.java
- copied, changed from r1036887, myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/conversation/Jsf2WindowHandler.java
Removed:
myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/conversation/Jsf2WindowHandler.java
Modified:
myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/conversation/RedirectedConversationAwareExternalContext.java
Added: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/spi/BookmarkAwareWindowHandler.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/BookmarkAwareWindowHandler.java?rev=1036914&view=auto
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/spi/BookmarkAwareWindowHandler.java (added)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/spi/BookmarkAwareWindowHandler.java Fri Nov 19 16:06:25 2010
@@ -0,0 +1,31 @@
+/*
+ * 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.jsf.impl.scope.conversation.spi;
+
+import javax.faces.context.ExternalContext;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author Gerhard Petracek
+ */
+public interface BookmarkAwareWindowHandler extends WindowHandler
+{
+ public String encodeBookmarkableURL(ExternalContext externalContext, String url, Map<String, List<String>> params);
+}
\ No newline at end of file
Copied: myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/conversation/ClientAwareWindowHandler.java (from r1036887, myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/conversation/Jsf2WindowHandler.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/scope/conversation/ClientAwareWindowHandler.java?p2=myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/conversation/ClientAwareWindowHandler.java&p1=myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/conversation/Jsf2WindowHandler.java&r1=1036887&r2=1036914&rev=1036914&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/conversation/Jsf2WindowHandler.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/conversation/ClientAwareWindowHandler.java Fri Nov 19 16:06:25 2010
@@ -20,6 +20,7 @@ package org.apache.myfaces.extensions.cd
import org.apache.myfaces.extensions.cdi.jsf.impl.scope.conversation.DefaultWindowHandler;
import org.apache.myfaces.extensions.cdi.jsf.impl.scope.conversation.spi.JsfModuleConfig;
+import org.apache.myfaces.extensions.cdi.jsf.impl.scope.conversation.spi.BookmarkAwareWindowHandler;
import org.apache.myfaces.extensions.cdi.jsf2.impl.windowhandler.Jsf2WindowHandlerServlet;
import javax.enterprise.context.ApplicationScoped;
@@ -29,23 +30,27 @@ import javax.faces.context.FacesContext;
import javax.faces.context.PartialViewContext;
import javax.inject.Inject;
import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.ArrayList;
/**
* WindowHandler with JSF2 features
*/
@Alternative
@ApplicationScoped
-public class Jsf2WindowHandler extends DefaultWindowHandler
+public class ClientAwareWindowHandler extends DefaultWindowHandler implements BookmarkAwareWindowHandler
{
private static final long serialVersionUID = 5293942986187078113L;
- protected Jsf2WindowHandler()
+ protected ClientAwareWindowHandler()
{
// default ct is needed for proxying
}
@Inject
- protected Jsf2WindowHandler(JsfModuleConfig config)
+ protected ClientAwareWindowHandler(JsfModuleConfig config)
{
super(config);
}
@@ -70,4 +75,27 @@ public class Jsf2WindowHandler extends D
super.sendRedirect(externalContext, url, addRequestParameter);
}
+
+ public String encodeBookmarkableURL(ExternalContext externalContext, String url, Map<String, List<String>> params)
+ {
+ Map<String, List<String>> newparms = new HashMap<String, List<String>>();
+ List<String> urlParam= new ArrayList<String>();
+ urlParam.add(externalContext.encodeBookmarkableURL(url, params));
+ newparms.put(Jsf2WindowHandlerServlet.URL_PARAM, urlParam);
+ return externalContext.encodeBookmarkableURL(getWindowHandlerPath(externalContext), newparms);
+ }
+
+ private String getWindowHandlerPath(ExternalContext externalContext)
+ {
+ String contextPath = externalContext.getRequestContextPath();
+
+ if (contextPath == null)
+ {
+ return Jsf2WindowHandlerServlet.WINDOWHANDLER_URL;
+ }
+ else
+ {
+ return contextPath + Jsf2WindowHandlerServlet.WINDOWHANDLER_URL;
+ }
+ }
}
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/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/jsf2/impl/scope/conversation/RedirectedConversationAwareExternalContext.java?rev=1036914&r1=1036913&r2=1036914&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/conversation/RedirectedConversationAwareExternalContext.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/conversation/RedirectedConversationAwareExternalContext.java Fri Nov 19 16:06:25 2010
@@ -21,13 +21,11 @@ package org.apache.myfaces.extensions.cd
import org.apache.myfaces.extensions.cdi.core.impl.util.CodiUtils;
import org.apache.myfaces.extensions.cdi.jsf.impl.scope.conversation.spi.JsfModuleConfig;
import org.apache.myfaces.extensions.cdi.jsf.impl.scope.conversation.spi.WindowHandler;
-import org.apache.myfaces.extensions.cdi.jsf2.impl.windowhandler.Jsf2WindowHandlerServlet;
+import org.apache.myfaces.extensions.cdi.jsf.impl.scope.conversation.spi.BookmarkAwareWindowHandler;
import javax.faces.context.ExternalContext;
import javax.faces.context.ExternalContextWrapper;
import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -45,8 +43,6 @@ public class RedirectedConversationAware
private boolean encodeActionURLs;
- private boolean clientSideWindowHandlerUsed = false;
-
public RedirectedConversationAwareExternalContext(ExternalContext wrapped)
{
this.wrapped = wrapped;
@@ -83,16 +79,12 @@ public class RedirectedConversationAware
{
lazyInit();
- if(!this.clientSideWindowHandlerUsed)
+ if(this.windowHandler instanceof BookmarkAwareWindowHandler)
{
- return super.encodeBookmarkableURL(baseUrl, parameters);
+ return ((BookmarkAwareWindowHandler)getWrapped()).encodeBookmarkableURL(this, baseUrl, parameters);
}
-
- Map<String, List<String>> newparms = new HashMap<String, List<String>>();
- List<String> urlParam= new ArrayList<String>();
- urlParam.add(wrapped.encodeBookmarkableURL(baseUrl, parameters));
- newparms.put(Jsf2WindowHandlerServlet.URL_PARAM, urlParam);
- return wrapped.encodeBookmarkableURL(getWindowHandlerPath(), newparms);
+
+ return super.encodeBookmarkableURL(baseUrl, parameters);
}
private synchronized void lazyInit()
@@ -101,11 +93,6 @@ public class RedirectedConversationAware
{
this.windowHandler = getWindowHandler();
- if(this.windowHandler instanceof Jsf2WindowHandler)
- {
- this.clientSideWindowHandlerUsed = true;
- }
-
this.encodeActionURLs = CodiUtils
.getContextualReferenceByClass(JsfModuleConfig.class)
.isAddWindowIdToActionUrlsEnabled();
@@ -116,19 +103,4 @@ public class RedirectedConversationAware
{
return this.windowHandler.encodeURL(url);
}
-
- private String getWindowHandlerPath()
- {
- String contextPath = getRequestContextPath();
-
- if (contextPath == null)
- {
- return Jsf2WindowHandlerServlet.WINDOWHANDLER_URL;
- }
- else
- {
- return contextPath + Jsf2WindowHandlerServlet.WINDOWHANDLER_URL;
- }
- }
-
}