rendered paste bodyIndex: src/test/java/applicationContext.xml
===================================================================
--- src/test/java/applicationContext.xml (revision 11252)
+++ src/test/java/applicationContext.xml (working copy)
@@ -13,10 +13,10 @@
<property name="routes">
<map>
<entry>
- <key><value>/exception</value></key>
+ <key><value>/exception?{query}</value></key>
<value>exceptionFinder</value>
</entry>
</map>
</property>
</bean>
-</beans>
\ No newline at end of file
+</beans>
Index: src/main/java/org/geoserver/rest/RESTDispatcher.java
===================================================================
--- src/main/java/org/geoserver/rest/RESTDispatcher.java (revision 11252)
+++ src/main/java/org/geoserver/rest/RESTDispatcher.java (working copy)
@@ -21,6 +21,7 @@
import org.restlet.data.Request;
import org.restlet.data.Response;
import org.restlet.resource.Resource;
+import org.restlet.util.Template;
import org.springframework.beans.BeansException;
import org.springframework.web.servlet.ModelAndView;
import org.springframework.web.servlet.mvc.AbstractController;
@@ -118,9 +119,19 @@
// LOG.info("Found mapping: " + entry.getKey().toString());
if (getApplicationContext().getBean(entry.getValue().toString()) instanceof Resource){
- r.attach(entry.getKey().toString(), new BeanResourceFinder(getApplicationContext(), entry.getValue().toString()));
+ r.attach(entry.getKey().toString(),
+ new BeanResourceFinder(
+ getApplicationContext(),
+ entry.getValue().toString()
+ )
+ ).getTemplate().setMatchingMode(Template.MODE_EQUALS);
} else {
- r.attach(entry.getKey().toString(), new BeanDelegatingRestlet(getApplicationContext(), entry.getValue().toString()));
+ r.attach(entry.getKey().toString(),
+ new BeanDelegatingRestlet(
+ getApplicationContext(),
+ entry.getValue().toString()
+ )
+ ).getTemplate().setMatchingMode(Template.MODE_EQUALS);
}
}
}
@@ -144,7 +155,7 @@
String pageURI = request.getResourceRef().toString();
if ( gs.getGlobal().getProxyBaseUrl() != null ) {
- baseURI= RequestUtils.proxifiedBaseURL(baseURI, gs.getGlobal().getProxyBaseUrl());
+ baseURI = RequestUtils.proxifiedBaseURL(baseURI, gs.getGlobal().getProxyBaseUrl());
pageURI = ResponseUtils.appendPath( baseURI, request.getResourceRef().getPath() );
}
Index: src/main/java/org/geoserver/rest/MapResource.java
===================================================================
--- src/main/java/org/geoserver/rest/MapResource.java (revision 11252)
+++ src/main/java/org/geoserver/rest/MapResource.java (working copy)
@@ -68,6 +68,7 @@
throw new RestletException( "", Status.SERVER_ERROR_INTERNAL, e );
}
DataFormat format = getFormatGet();
+ System.out.println("Request: " + getRequest().getAttributes());
getResponse().setEntity(format.toRepresentation(map));
}