You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by im...@apache.org on 2007/10/20 20:42:46 UTC
svn commit: r586772 - in /myfaces/orchestra/trunk/core/src:
main/java/org/apache/myfaces/orchestra/requestParameterProvider/
test/java/org/apache/myfaces/orchestra/requestParameterProvider/
Author: imario
Date: Sat Oct 20 11:42:45 2007
New Revision: 586772
URL: http://svn.apache.org/viewvc?rev=586772&view=rev
Log:
ORCHESTRA-7: fix "#" urls, added test
Added:
myfaces/orchestra/trunk/core/src/test/java/org/apache/myfaces/orchestra/requestParameterProvider/
myfaces/orchestra/trunk/core/src/test/java/org/apache/myfaces/orchestra/requestParameterProvider/TestRequestParameterProviderManager.java
Modified:
myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/requestParameterProvider/RequestParameterProviderManager.java
Modified: myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/requestParameterProvider/RequestParameterProviderManager.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/requestParameterProvider/RequestParameterProviderManager.java?rev=586772&r1=586771&r2=586772&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/requestParameterProvider/RequestParameterProviderManager.java (original)
+++ myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/requestParameterProvider/RequestParameterProviderManager.java Sat Oct 20 11:42:45 2007
@@ -22,6 +22,8 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.myfaces.orchestra.frameworkAdapter.FrameworkAdapter;
+import org.apache.myfaces.orchestra.frameworkAdapter.local.LocalFrameworkAdapter;
+import org.apache.myfaces.orchestra.conversation.basic.LogConversationMessager;
import java.io.Serializable;
import java.util.ArrayList;
@@ -49,6 +51,7 @@
{
private final Log LOG = LogFactory.getLog(RequestParameterProviderManager.class);
+ private static final String PAGE_LINK_SEP = "#";
private static final String PAGE_PARAMETER_SEP = "?";
private static final String PARAMETER_SEP = "&";
private static final String PARAMETER_PROVIDER_MANAGER_KEY = RequestParameterProviderManager.class.getName();
@@ -112,6 +115,12 @@
throw new IllegalStateException("RequestParameterServletFilter not called. Please configure the filter " + RequestParameterServletFilter.class.getName() + " in your web.xml to cover your faces requests.");
}
+ if (PAGE_LINK_SEP.equals(url))
+ {
+ // just an inner page link, ignore
+ return url;
+ }
+
StringBuffer sb = new StringBuffer();
if (url == null)
{
@@ -121,7 +130,16 @@
int nuofParams = -1;
String firstSeparator = url.indexOf(PAGE_PARAMETER_SEP) == -1 ? PAGE_PARAMETER_SEP : PARAMETER_SEP;
- sb.append(url);
+ int pageLinkPos = url.indexOf(PAGE_LINK_SEP);
+ if (pageLinkPos < 0)
+ {
+ sb.append(url);
+ }
+ else
+ {
+ sb.append(url.substring(0, pageLinkPos));
+ }
+
for (Iterator it = getProviders().iterator(); it.hasNext();)
{
RequestParameterProvider provider = (RequestParameterProvider) it.next();
@@ -139,6 +157,11 @@
sb.append("=");
sb.append(provider.getFieldValue(fields[i]));
}
+ }
+
+ if (pageLinkPos > -1)
+ {
+ sb.append(url.substring(pageLinkPos));
}
return sb.toString();
}
Added: myfaces/orchestra/trunk/core/src/test/java/org/apache/myfaces/orchestra/requestParameterProvider/TestRequestParameterProviderManager.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core/src/test/java/org/apache/myfaces/orchestra/requestParameterProvider/TestRequestParameterProviderManager.java?rev=586772&view=auto
==============================================================================
--- myfaces/orchestra/trunk/core/src/test/java/org/apache/myfaces/orchestra/requestParameterProvider/TestRequestParameterProviderManager.java (added)
+++ myfaces/orchestra/trunk/core/src/test/java/org/apache/myfaces/orchestra/requestParameterProvider/TestRequestParameterProviderManager.java Sat Oct 20 11:42:45 2007
@@ -0,0 +1,56 @@
+/*
+ * 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.orchestra.requestParameterProvider;
+
+import junit.framework.TestCase;
+import org.apache.myfaces.orchestra.frameworkAdapter.local.LocalFrameworkAdapter;
+import org.apache.myfaces.orchestra.frameworkAdapter.FrameworkAdapter;
+import org.apache.myfaces.orchestra.conversation.basic.LogConversationMessager;
+
+public class TestRequestParameterProviderManager extends TestCase
+{
+ public void testParameterAdding()
+ {
+ LocalFrameworkAdapter lfa = new LocalFrameworkAdapter();
+ lfa.setConversationMessager(new LogConversationMessager());
+ lfa.setRequestAttribute(RequestParameterServletFilter.REQUEST_PARAM_FILTER_CALLED, Boolean.TRUE);
+ FrameworkAdapter.setCurrentInstance(lfa);
+ RequestParameterProviderManager man = RequestParameterProviderManager.getInstance();
+ man.register(new RequestParameterProvider()
+ {
+
+ public String[] getFields()
+ {
+ return new String[] {"FIELD"};
+ }
+
+ public String getFieldValue(String field)
+ {
+ return "VALUE";
+ }
+ });
+
+ assertEquals("http://domain/path?FIELD=VALUE", man.encodeAndAttachParameters("http://domain/path"));
+ assertEquals("http://domain/path?ab=cd&FIELD=VALUE", man.encodeAndAttachParameters("http://domain/path?ab=cd"));
+ assertEquals("http://domain/path?FIELD=VALUE#", man.encodeAndAttachParameters("http://domain/path#"));
+ assertEquals("http://domain/path?FIELD=VALUE#22", man.encodeAndAttachParameters("http://domain/path#22"));
+ assertEquals("http://domain/path?ab=cd&FIELD=VALUE#22", man.encodeAndAttachParameters("http://domain/path?ab=cd#22"));
+ assertEquals("#", man.encodeAndAttachParameters("#"));
+ }
+}