Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlyn Normington2013-01-23 11:42:45 -0500
committerGlyn Normington2013-01-23 11:42:45 -0500
commit54f43bcd97ab7a7f6d7890ca47325ab1b67cbceb (patch)
tree81df577962cee22a6f0d36402bd57ce0368aaaec
parent48f784dcc9233a34ddb53c73b5a504371e560ffc (diff)
downloadorg.eclipse.virgo.samples-54f43bcd97ab7a7f6d7890ca47325ab1b67cbceb.tar.gz
org.eclipse.virgo.samples-54f43bcd97ab7a7f6d7890ca47325ab1b67cbceb.tar.xz
org.eclipse.virgo.samples-54f43bcd97ab7a7f6d7890ca47325ab1b67cbceb.zip
tidy up
-rw-r--r--REST/org.eclipse.virgo.samples.rest/src/main/webapp/META-INF/MANIFEST.MF18
-rw-r--r--REST/org.eclipse.virgo.samples.rest/src/main/webapp/WEB-INF/applicationContext.xml8
-rw-r--r--REST/org.eclipse.virgo.samples.rest/src/main/webapp/WEB-INF/web.xml6
3 files changed, 16 insertions, 16 deletions
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 565cf70..b0d799e 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
@@ -11,14 +11,12 @@ Web-ContextPath: rest
Import-Package: org.eclipse.virgo.web.dm;version="[3.0.0,4.0.0)",org.s
pringframework.beans.factory.xml;version="[3.0,4.0)",org.springframew
ork.context.config;version="[3.0,4.0)",org.springframework.context.su
- pport;version="[3.0,4.0)",org.springframework.stereotype;version="[3.
- 0,4.0)",org.springframework.web.bind.annotation;version="[3.0,4.0)",o
- rg.springframework.web.context;version="[3.0,4.0)",org.springframewor
- k.web.context.support;version="[3.0,4.0)",org.springframework.web.ser
- vlet;version="[3.0,4.0)",org.springframework.web.servlet.config;versi
- on="[3.0,4.0)",org.springframework.web.servlet.handler;version="[3.0,
- 4.0)",org.springframework.web.servlet.mvc;version="[3.0,4.0)",org.spr
- ingframework.web.servlet.mvc.annotation;version="[3.0,4.0)",org.sprin
- gframework.web.servlet.support;version="[3.0,4.0)",org.springframewor
- k.web.servlet.view;version="[3.0,4.0)"
+ pport;version="[3.0,4.0)",org.springframework.web.context;version="[3
+ .0,4.0)",org.springframework.web.context.support;version="[3.0,4.0)",
+ org.springframework.web.servlet;version="[3.0,4.0)",org.springframewo
+ rk.web.servlet.config;version="[3.0,4.0)",org.springframework.web.ser
+ vlet.handler;version="[3.0,4.0)",org.springframework.web.servlet.mvc;
+ version="[3.0,4.0)",org.springframework.web.servlet.mvc.annotation;ve
+ rsion="[3.0,4.0)",org.springframework.web.servlet.support;version="[3
+ .0,4.0)",org.springframework.web.servlet.view;version="[3.0,4.0)"
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
new file mode 100644
index 0000000..6fb6d13
--- /dev/null
+++ b/REST/org.eclipse.virgo.samples.rest/src/main/webapp/WEB-INF/applicationContext.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:osgi="http://www.springframework.org/schema/osgi"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ 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/web.xml b/REST/org.eclipse.virgo.samples.rest/src/main/webapp/WEB-INF/web.xml
index aa93f3c..c85a25d 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,11 +11,6 @@
<welcome-file>index.html</welcome-file>
</welcome-file-list>
-<!-- <context-param>
- <param-name>contextConfigLocation</param-name>
- <param-value>/WEB-INF/rest-servlet.xml</param-value>
- </context-param> -->
-
<context-param>
<param-name>contextClass</param-name>
<param-value>org.eclipse.virgo.web.dm.ServerOsgiBundleXmlWebApplicationContext</param-value>
@@ -29,7 +24,6 @@
<servlet>
<servlet-name>rest</servlet-name>
<servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
- <load-on-startup>1</load-on-startup>
</servlet>
<servlet-mapping>

Back to the top