Author: ivaynberg
Date: Fri Oct 2 21:10:35 2009
New Revision: 821168
URL: http://svn.apache.org/viewvc?rev=821168&view=rev
Log:
added system mapper
Added:
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/mapper/SystemMapper.java
(with props)
Removed:
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/encoder/
Modified:
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/protocol/http/WebApplication.java
Modified:
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/protocol/http/WebApplication.java
URL:
http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/protocol/http/WebApplication.java?rev=821168&r1=821167&r2=821168&view=diff
==============================================================================
---
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/protocol/http/WebApplication.java
(original)
+++
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/protocol/http/WebApplication.java
Fri Oct 2 21:10:35 2009
@@ -27,10 +27,7 @@
import org.apache.wicket.request.handler.impl.RenderPageRequestHandler;
import
org.apache.wicket.request.handler.impl.render.RenderPageRequestHandlerDelegate;
import
org.apache.wicket.request.handler.impl.render.WebRenderPageRequestHandlerDelegate;
-import org.apache.wicket.request.mapper.BookmarkableMapper;
-import org.apache.wicket.request.mapper.BufferedResponseMapper;
-import org.apache.wicket.request.mapper.PageInstanceMapper;
-import org.apache.wicket.request.mapper.ResourceReferenceMapper;
+import org.apache.wicket.request.mapper.SystemMapper;
import org.apache.wicket.request.response.BufferedWebResponse;
import org.apache.wicket.session.HttpSessionStore;
import org.apache.wicket.session.SessionStore;
@@ -38,90 +35,87 @@
/**
*
* @author Matej Knopp
- *
+ *
*/
public abstract class WebApplication extends Application
{
- public WebApplication()
- {
- super();
- }
-
- @Override
- protected void registerDefaultEncoders()
- {
- registerEncoder(new PageInstanceMapper());
- registerEncoder(new BookmarkableMapper());
- registerEncoder(new ResourceReferenceMapper());
- registerEncoder(new BufferedResponseMapper());
- }
-
- public void mount(IRequestMapper encoder)
- {
- registerEncoder(encoder);
- }
-
- // TODO: Do this properly
- private Map<String, BufferedWebResponse> storedResponses = new
ConcurrentHashMap<String, BufferedWebResponse>();
-
- public boolean hasBufferedResponse(String sessionId, Url url)
- {
- String key = sessionId + url.toString();
- return storedResponses.containsKey(key);
- }
-
- public BufferedWebResponse getAndRemoveBufferedResponse(String
sessionId, Url url)
- {
- String key = sessionId + url.toString();
- return storedResponses.remove(key);
- }
-
- public void storeBufferedResponse(String sessionId, Url url,
BufferedWebResponse response)
- {
- String key = sessionId + url.toString();
- storedResponses.put(key, response);
- }
-
- @Override
- protected SessionStore newSessionStore()
- {
- return new HttpSessionStore(this);
- }
-
- /**
- * Gets the servlet context for this application. Use this to get
references to absolute paths,
- * global web.xml parameters (<context-param>), etc.
- *
- * @return The servlet context for this application
- */
- public ServletContext getServletContext()
- {
- if (wicketFilter != null)
- {
- return
wicketFilter.getFilterConfig().getServletContext();
- }
- throw new IllegalStateException("servletContext is not set yet.
Any code in your"
- + " Application object that uses the wicket filter
instance should be put"
- + " in the init() method instead of your constructor");
- }
-
- public void setWicketFilter(WicketFilter wicketFilter)
- {
- this.wicketFilter = wicketFilter;
- }
-
- private WicketFilter wicketFilter;
-
- @Override
- public RenderPageRequestHandlerDelegate
getRenderPageRequestHandlerDelegate(
- RenderPageRequestHandler renderPageRequestHandler)
- {
- return new
WebRenderPageRequestHandlerDelegate(renderPageRequestHandler);
- }
-
- public static WebApplication get()
- {
- return (WebApplication) Application.get();
- }
+ public WebApplication()
+ {
+ super();
+ }
+
+ @Override
+ protected void registerDefaultEncoders()
+ {
+ registerEncoder(new SystemMapper());
+ }
+
+ public void mount(IRequestMapper encoder)
+ {
+ registerEncoder(encoder);
+ }
+
+ // TODO: Do this properly
+ private Map<String, BufferedWebResponse> storedResponses = new
ConcurrentHashMap<String, BufferedWebResponse>();
+
+ public boolean hasBufferedResponse(String sessionId, Url url)
+ {
+ String key = sessionId + url.toString();
+ return storedResponses.containsKey(key);
+ }
+
+ public BufferedWebResponse getAndRemoveBufferedResponse(String sessionId,
Url url)
+ {
+ String key = sessionId + url.toString();
+ return storedResponses.remove(key);
+ }
+
+ public void storeBufferedResponse(String sessionId, Url url,
BufferedWebResponse response)
+ {
+ String key = sessionId + url.toString();
+ storedResponses.put(key, response);
+ }
+
+ @Override
+ protected SessionStore newSessionStore()
+ {
+ return new HttpSessionStore(this);
+ }
+
+ /**
+ * Gets the servlet context for this application. Use this to get
references to absolute paths,
+ * global web.xml parameters (<context-param>), etc.
+ *
+ * @return The servlet context for this application
+ */
+ public ServletContext getServletContext()
+ {
+ if (wicketFilter != null)
+ {
+ return wicketFilter.getFilterConfig().getServletContext();
+ }
+ throw new IllegalStateException("servletContext is not set yet. Any
code in your"
+ + " Application object that uses the wicket filter instance
should be put"
+ + " in the init() method instead of your constructor");
+ }
+
+ public void setWicketFilter(WicketFilter wicketFilter)
+ {
+ this.wicketFilter = wicketFilter;
+ }
+
+ private WicketFilter wicketFilter;
+
+ @Override
+ public RenderPageRequestHandlerDelegate
getRenderPageRequestHandlerDelegate(
+ RenderPageRequestHandler renderPageRequestHandler)
+ {
+ return new
WebRenderPageRequestHandlerDelegate(renderPageRequestHandler);
+ }
+
+ public static WebApplication get()
+ {
+ return (WebApplication)Application.get();
+ }
}
Added:
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/mapper/SystemMapper.java
URL:
http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/mapper/SystemMapper.java?rev=821168&view=auto
==============================================================================
---
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/mapper/SystemMapper.java
(added)
+++
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/mapper/SystemMapper.java
Fri Oct 2 21:10:35 2009
@@ -0,0 +1,48 @@
+package org.apache.wicket.request.mapper;
+
+import org.apache.wicket.request.IRequestHandler;
+import org.apache.wicket.request.IRequestMapper;
+import org.apache.wicket.request.Request;
+import org.apache.wicket.request.Url;
+
+/**
+ * Mapper that encapsulates mappers that are necessary for Wicket to function.
+ *
+ * @author igor.vaynberg
+ *
+ */
+public class SystemMapper implements IRequestMapper
+{
+ private CompoundRequestMapper mapper = new CompoundRequestMapper();
+
+ /**
+ * Constructor
+ */
+ public SystemMapper()
+ {
+ mapper.register(new PageInstanceMapper());
+ mapper.register(new BookmarkableMapper());
+ mapper.register(new ResourceReferenceMapper());
+ mapper.register(new BufferedResponseMapper());
+ }
+
+ /** {...@inheritdoc} */
+ public int getCompatibilityScore(Request request)
+ {
+ return mapper.getCompatibilityScore(request);
+ }
+
+ /** {...@inheritdoc} */
+ public Url map(IRequestHandler handler)
+ {
+ return mapper.map(handler);
+ }
+
+ /** {...@inheritdoc} */
+ public IRequestHandler map(Request request)
+ {
+ return mapper.map(request);
+ }
+
+
+}
Propchange:
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/mapper/SystemMapper.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
