Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlyn Normington2013-01-23 11:39:08 -0500
committerGlyn Normington2013-01-23 11:39:08 -0500
commit48f784dcc9233a34ddb53c73b5a504371e560ffc (patch)
tree68c3eae60dacd302594472c48696d027643b8024
parentddbba14220ac31503244a305cdbc6203b27966a8 (diff)
downloadorg.eclipse.virgo.samples-48f784dcc9233a34ddb53c73b5a504371e560ffc.tar.gz
org.eclipse.virgo.samples-48f784dcc9233a34ddb53c73b5a504371e560ffc.tar.xz
org.eclipse.virgo.samples-48f784dcc9233a34ddb53c73b5a504371e560ffc.zip
tidy up
-rw-r--r--REST/org.eclipse.virgo.samples.rest/src/main/java/org/eclipse/virgo/samples/rest/RestController.java12
-rw-r--r--REST/org.eclipse.virgo.samples.rest/src/main/webapp/WEB-INF/rest-servlet.xml6
-rw-r--r--REST/org.eclipse.virgo.samples.rest/src/main/webapp/WEB-INF/web.xml8
3 files changed, 8 insertions, 18 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 9ce0442..0292a1f 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
@@ -19,18 +19,18 @@ import org.springframework.web.bind.annotation.ResponseBody;
/**
* <p>
- * TODO Document AppController
+ * {@link RestController} is a Spring MVC controller class which handles REST requests.
* </p>
- *
+ *
* <strong>Concurrent Semantics</strong><br />
- *
- * TODO Document concurrent semantics of AppController
- *
+ *
+ * Thread safe.
+ *
*/
@Controller
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 2c1753f..5934d54 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
@@ -13,12 +13,6 @@
<mvc:annotation-driven />
- <!-- process the @RequestMapping annotations at the class level -->
- <!-- <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" /> -->
-
<!-- View configuration -->
<bean id="topViewResolver" class="org.springframework.web.servlet.view.InternalResourceViewResolver">
<property name="prefix" value="/WEB-INF/jsp/" />
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 3a6b867..aa93f3c 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
@@ -11,12 +11,10 @@
<welcome-file>index.html</welcome-file>
</welcome-file-list>
- <!-- Configure a parent application context -->
- <context-param>
+<!-- <context-param>
<param-name>contextConfigLocation</param-name>
- <!-- <param-value>WEB-INF/applicationContext.xml</param-value> -->
<param-value>/WEB-INF/rest-servlet.xml</param-value>
- </context-param>
+ </context-param> -->
<context-param>
<param-name>contextClass</param-name>
@@ -37,8 +35,6 @@
<servlet-mapping>
<servlet-name>rest</servlet-name>
<url-pattern>/</url-pattern>
- <!-- <url-pattern>/rest/</url-pattern>
- <url-pattern>/rest/*</url-pattern> -->
</servlet-mapping>
</web-app> \ No newline at end of file

Back to the top