Author: ivaynberg
Date: Mon Mar 1 01:38:17 2010
New Revision: 917345
URL: http://svn.apache.org/viewvc?rev=917345&view=rev
Log:
test cleanup?
Added:
wicket/trunk/wicket/src/main/java/org/apache/wicket/SystemMapper.java
- copied, changed from r917331,
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/SystemMapper.java
Removed:
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/SystemMapper.java
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/Application.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/ResourceReferenceMapper.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/IResourceSettings.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/Settings.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/AutolinkPageExpectedResult_1.html
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/Application.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/Application.java?rev=917345&r1=917344&r2=917345&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/Application.java
(original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/Application.java Mon
Mar 1 01:38:17 2010
@@ -56,7 +56,6 @@
import org.apache.wicket.ng.request.cycle.RequestCycle;
import org.apache.wicket.ng.request.cycle.RequestCycleContext;
import org.apache.wicket.ng.request.mapper.IMapperContext;
-import org.apache.wicket.ng.request.mapper.SystemMapper;
import org.apache.wicket.ng.resource.ResourceReferenceRegistry;
import org.apache.wicket.pageStore.DefaultPageManagerContext;
import org.apache.wicket.pageStore.DefaultPageStore;
@@ -929,7 +928,7 @@
sharedResources = newSharedResources(resourceReferenceRegistry);
// set up default request mapper
- setRootRequestMapper(new SystemMapper());
+ setRootRequestMapper(new SystemMapper(getResourceSettings()));
pageFactory = newPageFactory();
Copied: wicket/trunk/wicket/src/main/java/org/apache/wicket/SystemMapper.java
(from r917331,
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/SystemMapper.java)
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/SystemMapper.java?p2=wicket/trunk/wicket/src/main/java/org/apache/wicket/SystemMapper.java&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/SystemMapper.java&r1=917331&r2=917345&rev=917345&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/SystemMapper.java
(original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/SystemMapper.java Mon
Mar 1 01:38:17 2010
@@ -14,9 +14,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.ng.request.mapper;
+package org.apache.wicket;
-import org.apache.wicket.RestartResponseAtInterceptPageException;
+import org.apache.wicket.ng.request.mapper.BookmarkableMapper;
+import org.apache.wicket.ng.request.mapper.BufferedResponseMapper;
+import org.apache.wicket.ng.request.mapper.HomePageMapper;
+import org.apache.wicket.ng.request.mapper.PageInstanceMapper;
+import org.apache.wicket.ng.request.mapper.ResourceReferenceMapper;
+import org.apache.wicket.ng.request.mapper.ThreadsafeCompoundRequestMapper;
+import
org.apache.wicket.ng.request.mapper.parameters.SimplePageParametersEncoder;
+import org.apache.wicket.settings.IResourceSettings;
/**
@@ -30,13 +37,14 @@
/**
* Constructor
*/
- public SystemMapper()
+ public SystemMapper(IResourceSettings settings)
{
register(RestartResponseAtInterceptPageException.MAPPER);
register(new HomePageMapper());
register(new PageInstanceMapper());
register(new BookmarkableMapper());
- register(new ResourceReferenceMapper());
+ register(new ResourceReferenceMapper(new
SimplePageParametersEncoder(),
+ settings.getParentFolderPlaceholder()));
register(new BufferedResponseMapper());
}
}
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/ResourceReferenceMapper.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/ResourceReferenceMapper.java?rev=917345&r1=917344&r2=917345&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/ResourceReferenceMapper.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/ResourceReferenceMapper.java
Mon Mar 1 01:38:17 2010
@@ -16,7 +16,6 @@
*/
package org.apache.wicket.ng.request.mapper;
-import org.apache.wicket.Application;
import org.apache.wicket.IRequestHandler;
import org.apache.wicket.Request;
import org.apache.wicket.ng.request.Url;
@@ -45,15 +44,19 @@
public class ResourceReferenceMapper extends AbstractResourceReferenceMapper
{
private final IPageParametersEncoder pageParametersEncoder;
+ private final String relativePathPartEscapeSequence;
/**
* Construct.
*
* @param pageParametersEncoder
+ * @param relativePathPartEscapeSequence
*/
- public ResourceReferenceMapper(IPageParametersEncoder
pageParametersEncoder)
+ public ResourceReferenceMapper(IPageParametersEncoder
pageParametersEncoder,
+ String relativePathPartEscapeSequence)
{
this.pageParametersEncoder = pageParametersEncoder;
+ this.relativePathPartEscapeSequence =
relativePathPartEscapeSequence;
}
/**
@@ -61,7 +64,7 @@
*/
public ResourceReferenceMapper()
{
- this(new SimplePageParametersEncoder());
+ this(new SimplePageParametersEncoder(), null);
}
/**
@@ -71,12 +74,14 @@
{
Url url = request.getUrl();
- for (int i = 0; i < url.getSegments().size(); i++)
+ if (relativePathPartEscapeSequence != null)
{
- if (url.getSegments().get(i).equals(
-
Application.get().getResourceSettings().getParentFolderPlaceholder()))
+ for (int i = 0; i < url.getSegments().size(); i++)
{
- url.getSegments().set(i, "..");
+ if
(url.getSegments().get(i).equals(relativePathPartEscapeSequence))
+ {
+ url.getSegments().set(i, "..");
+ }
}
}
@@ -154,18 +159,16 @@
url = encodePageParameters(url, parameters,
pageParametersEncoder);
}
- final CharSequence placeholder = Application.get()
- .getResourceSettings()
- .getParentFolderPlaceholder();
-
- for (int i = 0; i < url.getSegments().size(); i++)
+ if (relativePathPartEscapeSequence != null)
{
- if ("..".equals(url.getSegments().get(i)))
+ for (int i = 0; i < url.getSegments().size();
i++)
{
- url.getSegments().set(i,
placeholder.toString());
+ if
("..".equals(url.getSegments().get(i)))
+ {
+ url.getSegments().set(i,
relativePathPartEscapeSequence);
+ }
}
}
-
return url;
}
return null;
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/IResourceSettings.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/IResourceSettings.java?rev=917345&r1=917344&r2=917345&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/IResourceSettings.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/IResourceSettings.java
Mon Mar 1 01:38:17 2010
@@ -347,7 +347,7 @@
*
* @return placeholder
*/
- CharSequence getParentFolderPlaceholder();
+ String getParentFolderPlaceholder();
/**
* Placeholder string for '..' within resource urls (which will be
crippled by the browser and
@@ -364,5 +364,5 @@
* @param sequence
* character sequence which must not be ambiguous within urls
*/
- void setParentFolderPlaceholder(CharSequence sequence);
+ void setParentFolderPlaceholder(String sequence);
}
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/Settings.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/Settings.java?rev=917345&r1=917344&r2=917345&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/Settings.java
(original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/settings/Settings.java
Mon Mar 1 01:38:17 2010
@@ -314,7 +314,7 @@
private Bytes defaultMaximumUploadSize = Bytes.MAX;
/** escape string for '..' within resource keys */
- private CharSequence parentFolderPlaceholder = "";
+ private String parentFolderPlaceholder = null;
/** Default cache duration */
private int defaultCacheDuration = 3600;
@@ -1325,7 +1325,7 @@
/**
* @see
org.apache.wicket.settings.IResourceSettings#getParentFolderPlaceholder()
*/
- public CharSequence getParentFolderPlaceholder()
+ public String getParentFolderPlaceholder()
{
return parentFolderPlaceholder;
}
@@ -1333,7 +1333,7 @@
/**
* @see
org.apache.wicket.settings.IResourceSettings#setParentFolderPlaceholder(CharSequence)
*/
- public void setParentFolderPlaceholder(final CharSequence sequence)
+ public void setParentFolderPlaceholder(final String sequence)
{
parentFolderPlaceholder = sequence;
}
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/AutolinkPageExpectedResult_1.html
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/AutolinkPageExpectedResult_1.html?rev=917345&r1=917344&r2=917345&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/AutolinkPageExpectedResult_1.html
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/AutolinkPageExpectedResult_1.html
Mon Mar 1 01:38:17 2010
@@ -27,7 +27,7 @@
<link
href="../resource/org.apache.wicket.markup.html.link.AutolinkPage_1/test.css?-myStyle"/>
<link
href="../resource/org.apache.wicket.markup.html.link.AutolinkPage_1/test2.css?-myStyle"/>
<link
href="../resource/org.apache.wicket.markup.html.link.AutolinkPage_1/test3.css?de_DE-myStyle"/>
-<link
href="../resource/org.apache.wicket.markup.html.link.AutolinkPage_1/../../html/link/test2.css?-myStyle"/>
+<link
href="../resource/org.apache.wicket.markup.html.link.AutolinkPage_1/$up$/$up$/html/link/test2.css?-myStyle"/>
<a href="/root/test.html">Home</a>
<a href="org.apache.wicket.markup.html.link.Page1">Home</a>
<a href="http://www.google.com";>Google</a>
