From a38adfb15dcc8f27d4fff561b2377c83118623fd Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Tue, 1 Mar 2011 18:20:54 +0000 Subject: [PATCH] RAP Tomcat deployment git-svn-id: https://svn.argeo.org/commons/trunk@4253 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- .../org.argeo.server.osgi.webapp/.project | 22 ++++++++ .../.settings/org.eclipse.pde.core.prefs | 4 ++ .../META-INF/MANIFEST.MF | 16 ++++++ .../WEB-INF/applicationContext.xml | 11 ++++ .../WEB-INF/osgi.xml | 13 +++++ .../WEB-INF/security.xml | 14 +++++ .../WEB-INF/service-servlet.xml | 28 ++++++++++ .../WEB-INF/web.xml | 55 +++++++++++++++++++ .../build.properties | 2 + 9 files changed, 165 insertions(+) create mode 100644 server/modules/org.argeo.server.osgi.webapp/.project create mode 100644 server/modules/org.argeo.server.osgi.webapp/.settings/org.eclipse.pde.core.prefs create mode 100644 server/modules/org.argeo.server.osgi.webapp/META-INF/MANIFEST.MF create mode 100644 server/modules/org.argeo.server.osgi.webapp/WEB-INF/applicationContext.xml create mode 100644 server/modules/org.argeo.server.osgi.webapp/WEB-INF/osgi.xml create mode 100644 server/modules/org.argeo.server.osgi.webapp/WEB-INF/security.xml create mode 100644 server/modules/org.argeo.server.osgi.webapp/WEB-INF/service-servlet.xml create mode 100644 server/modules/org.argeo.server.osgi.webapp/WEB-INF/web.xml create mode 100644 server/modules/org.argeo.server.osgi.webapp/build.properties diff --git a/server/modules/org.argeo.server.osgi.webapp/.project b/server/modules/org.argeo.server.osgi.webapp/.project new file mode 100644 index 000000000..93ccf84c0 --- /dev/null +++ b/server/modules/org.argeo.server.osgi.webapp/.project @@ -0,0 +1,22 @@ + + + org.argeo.server.osgi.webapp + + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + + org.eclipse.pde.PluginNature + + diff --git a/server/modules/org.argeo.server.osgi.webapp/.settings/org.eclipse.pde.core.prefs b/server/modules/org.argeo.server.osgi.webapp/.settings/org.eclipse.pde.core.prefs new file mode 100644 index 000000000..fd884c249 --- /dev/null +++ b/server/modules/org.argeo.server.osgi.webapp/.settings/org.eclipse.pde.core.prefs @@ -0,0 +1,4 @@ +#Tue Mar 01 15:09:47 CET 2011 +eclipse.preferences.version=1 +pluginProject.extensions=false +resolve.requirebundle=false diff --git a/server/modules/org.argeo.server.osgi.webapp/META-INF/MANIFEST.MF b/server/modules/org.argeo.server.osgi.webapp/META-INF/MANIFEST.MF new file mode 100644 index 000000000..ca03a9268 --- /dev/null +++ b/server/modules/org.argeo.server.osgi.webapp/META-INF/MANIFEST.MF @@ -0,0 +1,16 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: OSGi Webapp +Bundle-SymbolicName: org.argeo.server.osgi.webapp +Bundle-Version: 1.0.0.qualifier +Bundle-Vendor: Argeo +Web-ContextPath: org.argeo.osgi.webapp +Import-Package: org.eclipse.equinox.http.servlet;version="1.1.0", + org.springframework.osgi.web.context.support;version="1.2.1", + org.springframework.security;version="2.0.6.RELEASE", + org.springframework.security.ui.webapp;version="2.0.6.RELEASE", + org.springframework.web.context;version="2.5.6.SEC01", + org.springframework.web.filter;version="2.5.6.SEC01", + org.springframework.web.servlet;version="2.5.6.SEC01", + org.springframework.web.servlet.handler;version="2.5.6.SEC01", + org.springframework.web.servlet.mvc;version="2.5.6.SEC01" diff --git a/server/modules/org.argeo.server.osgi.webapp/WEB-INF/applicationContext.xml b/server/modules/org.argeo.server.osgi.webapp/WEB-INF/applicationContext.xml new file mode 100644 index 000000000..a45053fd5 --- /dev/null +++ b/server/modules/org.argeo.server.osgi.webapp/WEB-INF/applicationContext.xml @@ -0,0 +1,11 @@ + + + + + + + \ No newline at end of file diff --git a/server/modules/org.argeo.server.osgi.webapp/WEB-INF/osgi.xml b/server/modules/org.argeo.server.osgi.webapp/WEB-INF/osgi.xml new file mode 100644 index 000000000..d344cc8d6 --- /dev/null +++ b/server/modules/org.argeo.server.osgi.webapp/WEB-INF/osgi.xml @@ -0,0 +1,13 @@ + + + + + \ No newline at end of file diff --git a/server/modules/org.argeo.server.osgi.webapp/WEB-INF/security.xml b/server/modules/org.argeo.server.osgi.webapp/WEB-INF/security.xml new file mode 100644 index 000000000..d606d0300 --- /dev/null +++ b/server/modules/org.argeo.server.osgi.webapp/WEB-INF/security.xml @@ -0,0 +1,14 @@ + + + + + + + + \ No newline at end of file diff --git a/server/modules/org.argeo.server.osgi.webapp/WEB-INF/service-servlet.xml b/server/modules/org.argeo.server.osgi.webapp/WEB-INF/service-servlet.xml new file mode 100644 index 000000000..7a052199e --- /dev/null +++ b/server/modules/org.argeo.server.osgi.webapp/WEB-INF/service-servlet.xml @@ -0,0 +1,28 @@ + + + + + + + + osgiServiceController + + + + + + + org.eclipse.equinox.http.servlet.HttpServiceServlet + + + osgiService + + + \ No newline at end of file diff --git a/server/modules/org.argeo.server.osgi.webapp/WEB-INF/web.xml b/server/modules/org.argeo.server.osgi.webapp/WEB-INF/web.xml new file mode 100644 index 000000000..fde1ebba4 --- /dev/null +++ b/server/modules/org.argeo.server.osgi.webapp/WEB-INF/web.xml @@ -0,0 +1,55 @@ + + + + Argeo OSGi Webapp + + + + contextConfigLocation + /WEB-INF/applicationContext.xml + + + + Spring Context + org.springframework.web.context.ContextLoaderListener + + + contextClass + org.springframework.osgi.web.context.support.OsgiBundleXmlWebApplicationContext + + + + + + + + + + service + org.springframework.web.servlet.DispatcherServlet + + contextClass + org.springframework.osgi.web.context.support.OsgiBundleXmlWebApplicationContext + + 1 + + + + service + /* + + + + + springSecurityFilterChain + org.springframework.web.filter.DelegatingFilterProxy + + + + springSecurityFilterChain + /* + + + diff --git a/server/modules/org.argeo.server.osgi.webapp/build.properties b/server/modules/org.argeo.server.osgi.webapp/build.properties new file mode 100644 index 000000000..29dea25a4 --- /dev/null +++ b/server/modules/org.argeo.server.osgi.webapp/build.properties @@ -0,0 +1,2 @@ +bin.includes = META-INF/,\ + WEB-INF/ -- 2.30.2