From de5375d3d1fa1a6f098f556a0d101580eb1857f4 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Thu, 2 Jun 2011 07:19:27 +0000
Subject: [PATCH] Rename OSGi webapp to RAP webapp

git-svn-id: https://svn.argeo.org/commons/trunk@4552 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 .../org.argeo.server.osgi.webapp/META-INF/context.xml      | 2 --
 .../.project                                               | 2 +-
 .../.settings/org.eclipse.pde.core.prefs                   | 0
 .../META-INF/MANIFEST.MF                                   | 7 ++++---
 .../META-INF/context-template.xml                          | 4 ++++
 .../WEB-INF/applicationContext.xml                         | 0
 .../WEB-INF/osgi.xml                                       | 0
 .../WEB-INF/security.xml                                   | 0
 .../WEB-INF/service-servlet.xml                            | 0
 .../WEB-INF/web.xml                                        | 0
 .../build.properties                                       | 0
 11 files changed, 9 insertions(+), 6 deletions(-)
 delete mode 100644 server/modules/org.argeo.server.osgi.webapp/META-INF/context.xml
 rename server/modules/{org.argeo.server.osgi.webapp => org.argeo.server.rap.webapp}/.project (91%)
 rename server/modules/{org.argeo.server.osgi.webapp => org.argeo.server.rap.webapp}/.settings/org.eclipse.pde.core.prefs (100%)
 rename server/modules/{org.argeo.server.osgi.webapp => org.argeo.server.rap.webapp}/META-INF/MANIFEST.MF (80%)
 create mode 100644 server/modules/org.argeo.server.rap.webapp/META-INF/context-template.xml
 rename server/modules/{org.argeo.server.osgi.webapp => org.argeo.server.rap.webapp}/WEB-INF/applicationContext.xml (100%)
 rename server/modules/{org.argeo.server.osgi.webapp => org.argeo.server.rap.webapp}/WEB-INF/osgi.xml (100%)
 rename server/modules/{org.argeo.server.osgi.webapp => org.argeo.server.rap.webapp}/WEB-INF/security.xml (100%)
 rename server/modules/{org.argeo.server.osgi.webapp => org.argeo.server.rap.webapp}/WEB-INF/service-servlet.xml (100%)
 rename server/modules/{org.argeo.server.osgi.webapp => org.argeo.server.rap.webapp}/WEB-INF/web.xml (100%)
 rename server/modules/{org.argeo.server.osgi.webapp => org.argeo.server.rap.webapp}/build.properties (100%)

diff --git a/server/modules/org.argeo.server.osgi.webapp/META-INF/context.xml b/server/modules/org.argeo.server.osgi.webapp/META-INF/context.xml
deleted file mode 100644
index 188c647ff..000000000
--- a/server/modules/org.argeo.server.osgi.webapp/META-INF/context.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<Context cookies="false">
-</Context>
\ No newline at end of file
diff --git a/server/modules/org.argeo.server.osgi.webapp/.project b/server/modules/org.argeo.server.rap.webapp/.project
similarity index 91%
rename from server/modules/org.argeo.server.osgi.webapp/.project
rename to server/modules/org.argeo.server.rap.webapp/.project
index 93ccf84c0..3ffaae189 100644
--- a/server/modules/org.argeo.server.osgi.webapp/.project
+++ b/server/modules/org.argeo.server.rap.webapp/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.argeo.server.osgi.webapp</name>
+	<name>org.argeo.server.rap.webapp</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/server/modules/org.argeo.server.osgi.webapp/.settings/org.eclipse.pde.core.prefs b/server/modules/org.argeo.server.rap.webapp/.settings/org.eclipse.pde.core.prefs
similarity index 100%
rename from server/modules/org.argeo.server.osgi.webapp/.settings/org.eclipse.pde.core.prefs
rename to server/modules/org.argeo.server.rap.webapp/.settings/org.eclipse.pde.core.prefs
diff --git a/server/modules/org.argeo.server.osgi.webapp/META-INF/MANIFEST.MF b/server/modules/org.argeo.server.rap.webapp/META-INF/MANIFEST.MF
similarity index 80%
rename from server/modules/org.argeo.server.osgi.webapp/META-INF/MANIFEST.MF
rename to server/modules/org.argeo.server.rap.webapp/META-INF/MANIFEST.MF
index 34e0cc936..f0406fc36 100644
--- a/server/modules/org.argeo.server.osgi.webapp/META-INF/MANIFEST.MF
+++ b/server/modules/org.argeo.server.rap.webapp/META-INF/MANIFEST.MF
@@ -1,10 +1,11 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: OSGi Webapp
-Bundle-SymbolicName: org.argeo.server.osgi.webapp
+Bundle-Name: RAP Webapp
+Bundle-Description: OSGi compatible RAP webapp
+Bundle-SymbolicName: org.argeo.server.rap.webapp
 Bundle-Version: 0.3.2.SNAPSHOT
 Bundle-Vendor: Argeo
-Web-ContextPath: org.argeo.osgi.webapp
+Web-ContextPath: org.argeo.rap.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",
diff --git a/server/modules/org.argeo.server.rap.webapp/META-INF/context-template.xml b/server/modules/org.argeo.server.rap.webapp/META-INF/context-template.xml
new file mode 100644
index 000000000..eaf6e86cc
--- /dev/null
+++ b/server/modules/org.argeo.server.rap.webapp/META-INF/context-template.xml
@@ -0,0 +1,4 @@
+<!-- Spring OSGi Web 1.2.1 doesn't take context.xml files into account, so 
+	we set cookies to false at deployment -->
+<Context cookies="false">
+</Context>
\ No newline at end of file
diff --git a/server/modules/org.argeo.server.osgi.webapp/WEB-INF/applicationContext.xml b/server/modules/org.argeo.server.rap.webapp/WEB-INF/applicationContext.xml
similarity index 100%
rename from server/modules/org.argeo.server.osgi.webapp/WEB-INF/applicationContext.xml
rename to server/modules/org.argeo.server.rap.webapp/WEB-INF/applicationContext.xml
diff --git a/server/modules/org.argeo.server.osgi.webapp/WEB-INF/osgi.xml b/server/modules/org.argeo.server.rap.webapp/WEB-INF/osgi.xml
similarity index 100%
rename from server/modules/org.argeo.server.osgi.webapp/WEB-INF/osgi.xml
rename to server/modules/org.argeo.server.rap.webapp/WEB-INF/osgi.xml
diff --git a/server/modules/org.argeo.server.osgi.webapp/WEB-INF/security.xml b/server/modules/org.argeo.server.rap.webapp/WEB-INF/security.xml
similarity index 100%
rename from server/modules/org.argeo.server.osgi.webapp/WEB-INF/security.xml
rename to server/modules/org.argeo.server.rap.webapp/WEB-INF/security.xml
diff --git a/server/modules/org.argeo.server.osgi.webapp/WEB-INF/service-servlet.xml b/server/modules/org.argeo.server.rap.webapp/WEB-INF/service-servlet.xml
similarity index 100%
rename from server/modules/org.argeo.server.osgi.webapp/WEB-INF/service-servlet.xml
rename to server/modules/org.argeo.server.rap.webapp/WEB-INF/service-servlet.xml
diff --git a/server/modules/org.argeo.server.osgi.webapp/WEB-INF/web.xml b/server/modules/org.argeo.server.rap.webapp/WEB-INF/web.xml
similarity index 100%
rename from server/modules/org.argeo.server.osgi.webapp/WEB-INF/web.xml
rename to server/modules/org.argeo.server.rap.webapp/WEB-INF/web.xml
diff --git a/server/modules/org.argeo.server.osgi.webapp/build.properties b/server/modules/org.argeo.server.rap.webapp/build.properties
similarity index 100%
rename from server/modules/org.argeo.server.osgi.webapp/build.properties
rename to server/modules/org.argeo.server.rap.webapp/build.properties
-- 
2.30.2