Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlyn Normington2013-01-23 11:21:16 -0500
committerGlyn Normington2013-01-23 11:21:16 -0500
commitf8b5519d25b5d4bde63ef3efdc392d8da814551f (patch)
tree322d9b6c847cd6e3b55459f657af665d6b1bacf7
parent3aa7360aaacaacfecabd1c8ab05b32a15080a105 (diff)
downloadorg.eclipse.virgo.samples-f8b5519d25b5d4bde63ef3efdc392d8da814551f.tar.gz
org.eclipse.virgo.samples-f8b5519d25b5d4bde63ef3efdc392d8da814551f.tar.xz
org.eclipse.virgo.samples-f8b5519d25b5d4bde63ef3efdc392d8da814551f.zip
define bundle classpath
-rw-r--r--REST/org.eclipse.virgo.samples.rest/src/main/webapp/META-INF/MANIFEST.MF1
-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/rest-servlet.xml4
-rw-r--r--REST/org.eclipse.virgo.samples.rest/src/main/webapp/WEB-INF/web.xml8
-rw-r--r--REST/org.eclipse.virgo.samples.rest/template.mf1
5 files changed, 9 insertions, 13 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 261fb20..85bcc7b 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
@@ -7,6 +7,7 @@ Bundle-Name: REST Sample Web Bundle
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.virgo.samples.rest
Web-ContextPath: rest
+Bundle-Classpath: .,WEB-INF/classes
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
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
deleted file mode 100644
index 6fb6d13..0000000
--- a/REST/org.eclipse.virgo.samples.rest/src/main/webapp/WEB-INF/applicationContext.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?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/rest-servlet.xml b/REST/org.eclipse.virgo.samples.rest/src/main/webapp/WEB-INF/rest-servlet.xml
index 9e2f5f0..2c1753f 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
@@ -9,10 +9,10 @@
http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.1.xsd">
- <mvc:annotation-driven />
-
<context:component-scan base-package="org.eclipse.virgo.samples.rest" />
+ <mvc:annotation-driven />
+
<!-- process the @RequestMapping annotations at the class level -->
<!-- <bean class="org.springframework.web.servlet.mvc.annotation.DefaultAnnotationHandlerMapping" /> -->
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 2f20a33..3a6b867 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
@@ -15,7 +15,7 @@
<context-param>
<param-name>contextConfigLocation</param-name>
<!-- <param-value>WEB-INF/applicationContext.xml</param-value> -->
- <param-value>WEB-INF/rest-servlet.xml</param-value>
+ <param-value>/WEB-INF/rest-servlet.xml</param-value>
</context-param>
<context-param>
@@ -31,12 +31,14 @@
<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>
<servlet-name>rest</servlet-name>
- <url-pattern>/rest/</url-pattern>
- <url-pattern>/rest/*</url-pattern>
+ <url-pattern>/</url-pattern>
+ <!-- <url-pattern>/rest/</url-pattern>
+ <url-pattern>/rest/*</url-pattern> -->
</servlet-mapping>
</web-app> \ No newline at end of file
diff --git a/REST/org.eclipse.virgo.samples.rest/template.mf b/REST/org.eclipse.virgo.samples.rest/template.mf
index 92e7561..f855a4e 100644
--- a/REST/org.eclipse.virgo.samples.rest/template.mf
+++ b/REST/org.eclipse.virgo.samples.rest/template.mf
@@ -28,3 +28,4 @@ Import-Package:
org.springframework.beans.factory.xml;version="[3.0,4.0)"
Excluded-Exports: *
Web-ContextPath: rest
+Bundle-Classpath: .,WEB-INF/classes

Back to the top