From 13893134219a45ed91c340c89dbd75269d21da16 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Fri, 25 Feb 2011 19:26:58 +0000
Subject: [PATCH] Extend Spring DM web extender in order to fix issue when
 undeploying

git-svn-id: https://svn.argeo.org/commons/trunk@4210 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 .../META-INF/MANIFEST.MF                      | 21 --------
 .../.classpath                                |  0
 .../.project                                  |  2 +-
 .../.settings/org.eclipse.jdt.core.prefs      |  0
 .../.settings/org.eclipse.pde.core.prefs      |  0
 .../build.properties                          |  0
 .../org.argeo.server.webextender/pom.xml      | 49 +++++++++++++++++++
 .../argeo/server/catalina/CatalinaServer.java |  0
 .../argeo/server/catalina/OsgiCatalina.java   |  0
 .../argeo/server/catalina/TomcatDeployer.java |  0
 10 files changed, 50 insertions(+), 22 deletions(-)
 delete mode 100644 server/runtime/org.argeo.server.catalina/META-INF/MANIFEST.MF
 rename server/runtime/{org.argeo.server.catalina => org.argeo.server.webextender}/.classpath (100%)
 rename server/runtime/{org.argeo.server.catalina => org.argeo.server.webextender}/.project (93%)
 rename server/runtime/{org.argeo.server.catalina => org.argeo.server.webextender}/.settings/org.eclipse.jdt.core.prefs (100%)
 rename server/runtime/{org.argeo.server.catalina => org.argeo.server.webextender}/.settings/org.eclipse.pde.core.prefs (100%)
 rename server/runtime/{org.argeo.server.catalina => org.argeo.server.webextender}/build.properties (100%)
 create mode 100644 server/runtime/org.argeo.server.webextender/pom.xml
 rename server/runtime/{org.argeo.server.catalina => org.argeo.server.webextender}/src/main/java/org/argeo/server/catalina/CatalinaServer.java (100%)
 rename server/runtime/{org.argeo.server.catalina => org.argeo.server.webextender}/src/main/java/org/argeo/server/catalina/OsgiCatalina.java (100%)
 rename server/runtime/{org.argeo.server.catalina => org.argeo.server.webextender}/src/main/java/org/argeo/server/catalina/TomcatDeployer.java (100%)

diff --git a/server/runtime/org.argeo.server.catalina/META-INF/MANIFEST.MF b/server/runtime/org.argeo.server.catalina/META-INF/MANIFEST.MF
deleted file mode 100644
index a76b598f9..000000000
--- a/server/runtime/org.argeo.server.catalina/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,21 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Catalina
-Bundle-SymbolicName: org.argeo.server.catalina
-Bundle-Version: 0.2.3.SNAPSHOT
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Import-Package: org.apache.catalina;version="6.0.24",
- org.apache.catalina.connector;version="6.0.24",
- org.apache.catalina.core;version="6.0.24",
- org.apache.catalina.startup;version="6.0.24",
- org.apache.catalina.util;version="6.0.24",
- org.apache.commons.logging;version="1.1.1",
- org.apache.naming.resources;version="6.0.24",
- org.osgi.framework;version="1.5.0",
- org.osgi.service.url;version="1.0.0",
- org.springframework.aop;version="2.5.6.SEC01",
- org.springframework.beans.factory;version="2.5.6.SEC01",
- org.springframework.osgi.context;version="1.2.1",
- org.springframework.osgi.web.deployer;version="1.2.1",
- org.springframework.osgi.web.deployer.tomcat;version="1.2.1"
-Export-Package: org.argeo.server.catalina
diff --git a/server/runtime/org.argeo.server.catalina/.classpath b/server/runtime/org.argeo.server.webextender/.classpath
similarity index 100%
rename from server/runtime/org.argeo.server.catalina/.classpath
rename to server/runtime/org.argeo.server.webextender/.classpath
diff --git a/server/runtime/org.argeo.server.catalina/.project b/server/runtime/org.argeo.server.webextender/.project
similarity index 93%
rename from server/runtime/org.argeo.server.catalina/.project
rename to server/runtime/org.argeo.server.webextender/.project
index 11c4760fb..39a8ee851 100644
--- a/server/runtime/org.argeo.server.catalina/.project
+++ b/server/runtime/org.argeo.server.webextender/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.argeo.server.catalina</name>
+	<name>org.argeo.server.webextender</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/server/runtime/org.argeo.server.catalina/.settings/org.eclipse.jdt.core.prefs b/server/runtime/org.argeo.server.webextender/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from server/runtime/org.argeo.server.catalina/.settings/org.eclipse.jdt.core.prefs
rename to server/runtime/org.argeo.server.webextender/.settings/org.eclipse.jdt.core.prefs
diff --git a/server/runtime/org.argeo.server.catalina/.settings/org.eclipse.pde.core.prefs b/server/runtime/org.argeo.server.webextender/.settings/org.eclipse.pde.core.prefs
similarity index 100%
rename from server/runtime/org.argeo.server.catalina/.settings/org.eclipse.pde.core.prefs
rename to server/runtime/org.argeo.server.webextender/.settings/org.eclipse.pde.core.prefs
diff --git a/server/runtime/org.argeo.server.catalina/build.properties b/server/runtime/org.argeo.server.webextender/build.properties
similarity index 100%
rename from server/runtime/org.argeo.server.catalina/build.properties
rename to server/runtime/org.argeo.server.webextender/build.properties
diff --git a/server/runtime/org.argeo.server.webextender/pom.xml b/server/runtime/org.argeo.server.webextender/pom.xml
new file mode 100644
index 000000000..08adbeefc
--- /dev/null
+++ b/server/runtime/org.argeo.server.webextender/pom.xml
@@ -0,0 +1,49 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.argeo.commons.server</groupId>
+		<artifactId>runtime</artifactId>
+		<version>0.2.3-SNAPSHOT</version>
+		<relativePath>..</relativePath>
+	</parent>
+	<artifactId>org.argeo.server.webextender</artifactId>
+	<name>Commons Server Web Extender (Spring DM)</name>
+	<description>Configure / hack Spring DM web extender</description>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-source-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jar-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-bundle-plugin</artifactId>
+				<version>${version.maven-bundle-plugin}</version>
+				<configuration>
+					<instructions>
+
+						<Export-Package>
+							org.argeo.server.*
+						</Export-Package>
+					</instructions>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+	<dependencies>
+		<!-- Spring -->
+		<dependency>
+			<groupId>org.springframework.osgi</groupId>
+			<artifactId>org.springframework.web.extender</artifactId>
+		</dependency>
+	</dependencies>
+</project>
diff --git a/server/runtime/org.argeo.server.catalina/src/main/java/org/argeo/server/catalina/CatalinaServer.java b/server/runtime/org.argeo.server.webextender/src/main/java/org/argeo/server/catalina/CatalinaServer.java
similarity index 100%
rename from server/runtime/org.argeo.server.catalina/src/main/java/org/argeo/server/catalina/CatalinaServer.java
rename to server/runtime/org.argeo.server.webextender/src/main/java/org/argeo/server/catalina/CatalinaServer.java
diff --git a/server/runtime/org.argeo.server.catalina/src/main/java/org/argeo/server/catalina/OsgiCatalina.java b/server/runtime/org.argeo.server.webextender/src/main/java/org/argeo/server/catalina/OsgiCatalina.java
similarity index 100%
rename from server/runtime/org.argeo.server.catalina/src/main/java/org/argeo/server/catalina/OsgiCatalina.java
rename to server/runtime/org.argeo.server.webextender/src/main/java/org/argeo/server/catalina/OsgiCatalina.java
diff --git a/server/runtime/org.argeo.server.catalina/src/main/java/org/argeo/server/catalina/TomcatDeployer.java b/server/runtime/org.argeo.server.webextender/src/main/java/org/argeo/server/catalina/TomcatDeployer.java
similarity index 100%
rename from server/runtime/org.argeo.server.catalina/src/main/java/org/argeo/server/catalina/TomcatDeployer.java
rename to server/runtime/org.argeo.server.webextender/src/main/java/org/argeo/server/catalina/TomcatDeployer.java
-- 
2.39.2