Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlyn Normington2013-01-22 06:13:11 -0500
committerGlyn Normington2013-01-22 06:13:11 -0500
commit59817e145809199ab8ba4d57436420df5206716f (patch)
treed63b01922513b70f3ca662d1f7fdaa8779549901
parent350b37d13991a28b264b61f73e73ff49616de635 (diff)
downloadorg.eclipse.virgo.samples-59817e145809199ab8ba4d57436420df5206716f.tar.gz
org.eclipse.virgo.samples-59817e145809199ab8ba4d57436420df5206716f.tar.xz
org.eclipse.virgo.samples-59817e145809199ab8ba4d57436420df5206716f.zip
tidy up
-rw-r--r--REST/org.eclipse.virgo.samples.rest/.classpath8
-rw-r--r--REST/org.eclipse.virgo.samples.rest/src/main/java/org/eclipse/virgo/samples/rest/RestController.java4
-rw-r--r--REST/org.eclipse.virgo.samples.rest/src/main/webapp/META-INF/MANIFEST.MF2
-rw-r--r--REST/org.eclipse.virgo.samples.rest/src/main/webapp/WEB-INF/applicationContext.xml1
-rw-r--r--REST/org.eclipse.virgo.samples.rest/src/main/webapp/WEB-INF/jsp/properties.jsp75
-rw-r--r--REST/org.eclipse.virgo.samples.rest/src/main/webapp/WEB-INF/rest-servlet.xml2
-rw-r--r--REST/org.eclipse.virgo.samples.rest/src/main/webapp/WEB-INF/web.xml11
7 files changed, 5 insertions, 98 deletions
diff --git a/REST/org.eclipse.virgo.samples.rest/.classpath b/REST/org.eclipse.virgo.samples.rest/.classpath
index 9b77339..9ef238e 100644
--- a/REST/org.eclipse.virgo.samples.rest/.classpath
+++ b/REST/org.eclipse.virgo.samples.rest/.classpath
@@ -6,7 +6,7 @@
</attributes>
</classpathentry>
<classpathentry kind="src" path="src/main/resources"/>
- <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.web/3.1.0.RELEASE/org.springframework.web-3.1.0.RELEASE.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.web/3.0.0.RELEASE/org.springframework.web-sources-3.0.0.RELEASE.jar"/>
+ <classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.web/3.1.0.RELEASE/org.springframework.web-3.1.0.RELEASE.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.web/3.1.0.RELEASE/org.springframework.web-sources-3.1.0.RELEASE.jar"/>
<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.beans/3.1.0.RELEASE/org.springframework.beans-3.1.0.RELEASE.jar"/>
<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.web.servlet/3.1.0.RELEASE/org.springframework.web.servlet-3.1.0.RELEASE.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.web.servlet/3.1.0.RELEASE/org.springframework.web.servlet-sources-3.1.0.RELEASE.jar"/>
<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/javax.servlet/3.0.0.v201112011016/javax.servlet-3.0.0.v201112011016.jar" sourcepath="/IVY_CACHE/javax.servlet/com.springsource.javax.servlet/3.0.0.v201112011016/com.springsource.javax.servlet-sources-3.0.0.v201112011016.jar"/>
@@ -18,10 +18,6 @@
<classpathentry kind="var" path="IVY_CACHE/org.apache.taglibs/com.springsource.org.apache.taglibs.standard/1.1.2/com.springsource.org.apache.taglibs.standard-1.1.2.jar"/>
<classpathentry kind="var" path="IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.7.1.R37x_v20110808-1106/org.eclipse.osgi-3.7.1.R37x_v20110808-1106.jar" sourcepath="/IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.6.1.R36x_v20100806/org.eclipse.osgi-sources-3.6.1.R36x_v20100806.jar"/>
<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.equinox.cm/1.0.400.v20120319-2029/org.eclipse.equinox.cm-1.0.400.v20120319-2029.jar" sourcepath="/IVY_CACHE/org.apache.felix/org.apache.felix.configadmin/1.2.4/org.apache.felix.configadmin-sources-1.2.4.jar"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/JVM 1.6.0 (MacOS X Default)">
- <attributes>
- <attribute name="owner.project.facets" value="java"/>
- </attributes>
- </classpathentry>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
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 feb7070..cdc935b 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
@@ -28,10 +28,10 @@ import org.springframework.web.bind.annotation.ResponseBody;
*
*/
@Controller
-//@RequestMapping("/rest/users")
+@RequestMapping("/rest")
public final class RestController {
- @RequestMapping(value="/rest/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/META-INF/MANIFEST.MF b/REST/org.eclipse.virgo.samples.rest/src/main/webapp/META-INF/MANIFEST.MF
index 8c7ee42..261fb20 100644
--- a/REST/org.eclipse.virgo.samples.rest/src/main/webapp/META-INF/MANIFEST.MF
+++ b/REST/org.eclipse.virgo.samples.rest/src/main/webapp/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Import-Bundle: com.springsource.org.apache.taglibs.standard;version="[
1.1.2,1.3)"
Bundle-Version: 1
-Tool: Bundlor 1.1.0.M04
+Tool: Bundlor 1.1.1.RELEASE
Bundle-Name: REST Sample Web Bundle
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.virgo.samples.rest
diff --git a/REST/org.eclipse.virgo.samples.rest/src/main/webapp/WEB-INF/applicationContext.xml b/REST/org.eclipse.virgo.samples.rest/src/main/webapp/WEB-INF/applicationContext.xml
index a271df8..6fb6d13 100644
--- a/REST/org.eclipse.virgo.samples.rest/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/REST/org.eclipse.virgo.samples.rest/src/main/webapp/WEB-INF/applicationContext.xml
@@ -5,5 +5,4 @@
xsi:schemaLocation="http://www.springframework.org/schema/osgi http://www.springframework.org/schema/osgi/spring-osgi.xsd
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
-
</beans>
diff --git a/REST/org.eclipse.virgo.samples.rest/src/main/webapp/WEB-INF/jsp/properties.jsp b/REST/org.eclipse.virgo.samples.rest/src/main/webapp/WEB-INF/jsp/properties.jsp
deleted file mode 100644
index 899c9ce..0000000
--- a/REST/org.eclipse.virgo.samples.rest/src/main/webapp/WEB-INF/jsp/properties.jsp
+++ /dev/null
@@ -1,75 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1" pageEncoding="ISO-8859-1" %><%--
---%><%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %><%--
---%><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
- <title>Configuration properties sample</title>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <link rel="shortcut icon" href="/resources/images/favicon.ico" />
- <link rel="stylesheet" href="/resources/styles/main.css" type="text/css" />
- <link rel="stylesheet" href="/resources/styles/local.css" type="text/css" />
- <link rel="stylesheet" href="/resources/styles/print.css" type="text/css" media="print" />
-</head>
-<body class="main tundra">
- <div id="page">
- <div id="mini-header">
- <div id="mini-header-left"></div>
- <div id="mini-header-right"></div>
- </div> <!-- /mini-header -->
-
- <div id="primary-navigation">
- <div id="primary-left">
- </div>
- <img id="left-curve" src="/config-properties/images/menu-curve-left.png"/>
- <div id="primary-right">
- <ul>
- <li><a href="/admin" title="Admin Console">Admin Console</a></li>
- <li><a href="http://www.eclipse.org/virgo" title="Virgo">Virgo</a></li>
- </ul>
- </div>
- <img id="right-curve" src="/config-properties/images/menu-curve-right.png"/>
- </div><!-- /primary-navigation -->
-
- <div id="container">
- <div id="content-no-nav">
- <h1 class="title">Configuration properties sample</h1>
- <p>
- The following properties have been found in 'org.eclipse.virgo.samples.configuration'.
- </p>
- <table id="properties" class="bordered-table">
- <tr>
- <th>Name</th>
- <th>Value</th>
- </tr>
- <c:choose>
- <c:when test="${empty properties}">
- <tr class="name-sublevel1-odd">
- <td id="property_null" colspan="2">No properties have been registered.</td>
- </tr>
- </c:when>
- <c:otherwise>
- <c:forEach var="property" items="${properties}" varStatus="loopStatus">
- <c:set var="rowStyle" value="odd" scope="page" />
- <c:if test="${(loopStatus.index % 2) eq 0}">
- <c:set var="rowStyle" value="even" scope="page" />
- </c:if>
- <tr class="sublevel1-${rowStyle}">
- <td id="property_key">${property.key}</td>
- <td id="property_value">${property.value}</td>
- </tr>
- <c:remove var="rowStyle" />
- </c:forEach>
- </c:otherwise>
- </c:choose>
- </table>
- </div><!-- /content -->
- </div><!-- /container -->
-
- <div id="footer-wrapper">
- <div id="footer-left">&copy; Copyright 2008, 2013 VMware Inc. Licensed under the Eclipse Public License v1.0.</div>
- <div id="footer-right"></div>
- </div>
- </div> <!-- /page-->
-</body>
-</html>
-
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 e4f0c3a..d747aa2 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
@@ -18,10 +18,8 @@
<!-- 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/" />
<property name="suffix" value=".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 769961c..fe97fb1 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
@@ -36,16 +36,5 @@
<servlet-name>rest</servlet-name>
<url-pattern>/rest/*</url-pattern>
</servlet-mapping>
-
- <!--
- <servlet>
- <servlet-name>ResourceServlet</servlet-name>
- <servlet-class>org.springframework.web.servlet.ResourceServlet</servlet-class>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>ResourceServlet</servlet-name>
- <url-pattern>/resources/*</url-pattern>
- </servlet-mapping> -->
</web-app> \ No newline at end of file

Back to the top