Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlyn Normington2013-01-22 10:17:15 -0500
committerGlyn Normington2013-01-22 10:17:15 -0500
commit3aa7360aaacaacfecabd1c8ab05b32a15080a105 (patch)
tree814ba81818d83b8d61133861da845a1a34edd49b
parent59817e145809199ab8ba4d57436420df5206716f (diff)
downloadorg.eclipse.virgo.samples-3aa7360aaacaacfecabd1c8ab05b32a15080a105.tar.gz
org.eclipse.virgo.samples-3aa7360aaacaacfecabd1c8ab05b32a15080a105.tar.xz
org.eclipse.virgo.samples-3aa7360aaacaacfecabd1c8ab05b32a15080a105.zip
changes to ensure dispatcher servlet is driven
-rw-r--r--REST/org.eclipse.virgo.samples.rest/src/main/java/org/eclipse/virgo/samples/rest/RestController.java2
-rw-r--r--REST/org.eclipse.virgo.samples.rest/src/main/webapp/WEB-INF/rest-servlet.xml4
-rw-r--r--REST/org.eclipse.virgo.samples.rest/src/main/webapp/WEB-INF/web.xml4
-rw-r--r--REST/org.eclipse.virgo.samples.rest/src/main/webapp/favicon.icobin0 -> 894 bytes
4 files changed, 6 insertions, 4 deletions
diff --git a/REST/org.eclipse.virgo.samples.rest/src/main/java/org/eclipse/virgo/samples/rest/RestController.java b/REST/org.eclipse.virgo.samples.rest/src/main/java/org/eclipse/virgo/samples/rest/RestController.java
index cdc935b..64e1070 100644
--- a/REST/org.eclipse.virgo.samples.rest/src/main/java/org/eclipse/virgo/samples/rest/RestController.java
+++ b/REST/org.eclipse.virgo.samples.rest/src/main/java/org/eclipse/virgo/samples/rest/RestController.java
@@ -31,7 +31,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
@RequestMapping("/rest")
public final class RestController {
- @RequestMapping(value="users/{userId}", method = RequestMethod.GET)
+ @RequestMapping(value="/users/{userId}", method = RequestMethod.GET)
@ResponseBody
public String getUser(@PathVariable("userId") String userId) {
return userId;
diff --git a/REST/org.eclipse.virgo.samples.rest/src/main/webapp/WEB-INF/rest-servlet.xml b/REST/org.eclipse.virgo.samples.rest/src/main/webapp/WEB-INF/rest-servlet.xml
index d747aa2..9e2f5f0 100644
--- a/REST/org.eclipse.virgo.samples.rest/src/main/webapp/WEB-INF/rest-servlet.xml
+++ b/REST/org.eclipse.virgo.samples.rest/src/main/webapp/WEB-INF/rest-servlet.xml
@@ -14,10 +14,10 @@
<context:component-scan base-package="org.eclipse.virgo.samples.rest" />
<!-- process the @RequestMapping annotations at the class level -->
- <bean class="org.springframework.web.servlet.mvc.annotation.DefaultAnnotationHandlerMapping" />
+ <!-- <bean class="org.springframework.web.servlet.mvc.annotation.DefaultAnnotationHandlerMapping" /> -->
<!-- process the @RequestMapping annotations at the method level -->
- <bean class="org.springframework.web.servlet.mvc.annotation.AnnotationMethodHandlerAdapter" />
+ <!-- <bean class="org.springframework.web.servlet.mvc.annotation.AnnotationMethodHandlerAdapter" /> -->
<!-- View configuration -->
<bean id="topViewResolver" class="org.springframework.web.servlet.view.InternalResourceViewResolver">
diff --git a/REST/org.eclipse.virgo.samples.rest/src/main/webapp/WEB-INF/web.xml b/REST/org.eclipse.virgo.samples.rest/src/main/webapp/WEB-INF/web.xml
index fe97fb1..2f20a33 100644
--- a/REST/org.eclipse.virgo.samples.rest/src/main/webapp/WEB-INF/web.xml
+++ b/REST/org.eclipse.virgo.samples.rest/src/main/webapp/WEB-INF/web.xml
@@ -14,7 +14,8 @@
<!-- Configure a parent application context -->
<context-param>
<param-name>contextConfigLocation</param-name>
- <param-value>WEB-INF/applicationContext.xml</param-value>
+ <!-- <param-value>WEB-INF/applicationContext.xml</param-value> -->
+ <param-value>WEB-INF/rest-servlet.xml</param-value>
</context-param>
<context-param>
@@ -34,6 +35,7 @@
<servlet-mapping>
<servlet-name>rest</servlet-name>
+ <url-pattern>/rest/</url-pattern>
<url-pattern>/rest/*</url-pattern>
</servlet-mapping>
diff --git a/REST/org.eclipse.virgo.samples.rest/src/main/webapp/favicon.ico b/REST/org.eclipse.virgo.samples.rest/src/main/webapp/favicon.ico
new file mode 100644
index 0000000..7e54ebd
--- /dev/null
+++ b/REST/org.eclipse.virgo.samples.rest/src/main/webapp/favicon.ico
Binary files differ

Back to the top