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

git-svn-id: https://svn.argeo.org/commons/trunk@4209 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 .../work/org.argeo.jcr.webapp/SESSIONS.ser    | Bin 0 -> 2703 bytes
 .../log4j.properties                          |   2 +-
 .../org.argeo.jcr.ui.explorer.properties      |  11 +++++++++
 .../META-INF/MANIFEST.MF                      |   4 ++-
 .../META-INF/spring/extender/webextender.xml  |   3 +--
 .../META-INF/MANIFEST.MF                      |   2 ++
 .../argeo/server/catalina/TomcatDeployer.java |  23 +++++++++++++++++-
 7 files changed, 40 insertions(+), 5 deletions(-)
 create mode 100644 eclipse/plugins/org.argeo.jcr.ui.explorer/exec/org.argeo.jcr.ui.explorer/data/tomcat/work/org.argeo.jcr.webapp/SESSIONS.ser
 create mode 100644 eclipse/plugins/org.argeo.jcr.ui.explorer/org.argeo.jcr.ui.explorer.properties

diff --git a/eclipse/plugins/org.argeo.jcr.ui.explorer/exec/org.argeo.jcr.ui.explorer/data/tomcat/work/org.argeo.jcr.webapp/SESSIONS.ser b/eclipse/plugins/org.argeo.jcr.ui.explorer/exec/org.argeo.jcr.ui.explorer/data/tomcat/work/org.argeo.jcr.webapp/SESSIONS.ser
new file mode 100644
index 0000000000000000000000000000000000000000..d804c1d0336b656909cf0f36869f909f1c0bfcdb
GIT binary patch
literal 2703
zcmbtWZEO@p7@oVfUJs<beu!d3A$<6O>``n1X%zOh2V7mQ<?gCdf^}|p+S_(-XPKRC
z?=TurgC-<OjGCB;`a_~7{2|eQ#>Du;81aWDMq^?$MEoNf`9VmO7~h%Q>)n-xnt089
z%<RnbzVp1#^G?tHj@mqix~B0gR&4A{DH(^8DZ;uhyz}nW<1g%pqDTg{&0^ap6^0V^
zby>e$B<#f5*H$lo_2-jOgeopVC<0&|^+h^$rUp;`a_aoc>wW^H;TqBr^bCr?YUS{s
zzy0lrQA^VZkYer4d8H_|33k3(!;XFX=3jpR+IS7kMG_(wX+pZj(V8vk0c}rO(*{y0
zHT{69_4oIu2L`rn*ZLpawpC5_%MB0=wQ$5Jn^HWNS<ciX!(}o@*^Dwrii$yjk_uNC
zIpPzKD|y0ZZNhWGQ01IiMV}K-8A|61xiPJf8Ocs)s;;M0?GeQ@s7uTOW>bVK9`QVj
zI-`uvS|(v|LgW8NT|WdlG2h^Tt6|$NVq+#{IVK!Kw>(Z9!iJx_oWAl!{vvRuqaO46
z^&Iu;qG(B>fMm{h99*=?V8w+5cP*A+5h~#+li1*tRTa;7UCOvJWO*+2#MTr%S5544
z!cLdYcb<8DBaWh*#!)YECMh$B%$ZjA6JDYwOk2(@ogvNpb<`@taMaz9+emSm7<^Di
z?c!M$%GCTk55)k<>8M*gAEh1#t_@(FGLNG~faG(_P6~2hU6-VzmWlurYV4`F5h3M1
zad=TWs!Ri~3>S-*5JH)9qU5czYm<C)N$+|-5&89#bKgs@mm7?j#NigUA^NQ{dL=n+
zu%uRh05rQC-LZsDdZejD=8DP~u8Q<4$G=(q#^?BSi|}ZxXB{QdgJ`Z56uqp%QOuMT
zkw;o3&UG7Pksr-vvU?};X>BZ*DIA>8MzV$U;{`bFj>Sst5yNK|ug=>bA5Lh2EiypD
z$MGZYol3sK<)J&U&r9Oa1{Rv+XtNHu$py|z)^L+*)AB%c!#B*tt=UHz^9XaGW~12i
zz^`UARsl5S2zSFP5=BuRH5Nqh(XFGnaJ*r;*p?H}<Wm1JxLO3`fdv)``rUy}`_$VH
z?~bCDakQd=5Mmxe%f*-irxrL7Z8>yfdiFB#0FfsXd#a$>m`OOcY}vfJL8(3qQLbxW
zHIkL<P<~w7(fe%I;SXw!J6cowf;vIV3hTcRLKHsWR*(ywrIkU44&B4ivfPNCo=}JO
zXR<QUyE%%>sj+-Ix1`v7OL>eGo0%O7PJQl0p8fFJg-f!aD*`X7rpdsEGB}hpY_l12
zKAU*o*6qp``0E3&wVGgHNZ}q)=)m3cr-Xh?z+vEcp{+1v{g|MkHgQZDsuu+1!>TOi
zK7{9}v!TE2$L=7AY4Z)mBzA|zlv=I_ijAW#Y#7vcc$PZpifci~7)OcvoKB4yF?CBr
zlWANUBeIJx5S(CS9kfq3bWBKDyU0X1DP$}HFY$9DM{A$T?^B<)NdD1*fdj@Sa$p1>
z9LnWOIH^t_%@&5!4*{c$QVxu6tamAm+BURm=m6gOF{eyTYtj-|gJ@jWIydxvbm^r;
zAR8NIM66z*>;9zy>cFc~=-8J}T)k7mL=28rHt=6xCR&QXza7|(2E9=X?-d`LD&lh|
zq`qP4$WYSDXWsvZUx}rHkY%yCFN7Zikl_C)*`@bkuLK*~Vn2NP*~%xsZb8vKXqip1
zxkuib85HLw5KW2NX2spLTUP$&xpw$Yz&ip4^5p#@WC+OjEuvLN>Mp#8#JWI;5=wTw
zRuCxMZw9kmQ3#Q34+xl)p?idb_@o6l<NUn`%CK?67)r8Xk;t{yR}Y%lnXc|zck!*D
lq`d0Zlmvc@=Y5wjp)ig*gi?0f)WCKLZfB5A4kp5{%D+HKnGpa0

literal 0
HcmV?d00001

diff --git a/eclipse/plugins/org.argeo.jcr.ui.explorer/log4j.properties b/eclipse/plugins/org.argeo.jcr.ui.explorer/log4j.properties
index dcc3a49d0..46b724cea 100644
--- a/eclipse/plugins/org.argeo.jcr.ui.explorer/log4j.properties
+++ b/eclipse/plugins/org.argeo.jcr.ui.explorer/log4j.properties
@@ -2,7 +2,7 @@ log4j.rootLogger=WARN, console
 
 ## Levels
 log4j.logger.org.argeo=DEBUG
-log4j.logger.org.springframework.security=INFO
+log4j.logger.org.springframework.security=WARN
 
 log4j.logger.org.apache.catalina=INFO
 log4j.logger.org.apache.coyote=INFO
diff --git a/eclipse/plugins/org.argeo.jcr.ui.explorer/org.argeo.jcr.ui.explorer.properties b/eclipse/plugins/org.argeo.jcr.ui.explorer/org.argeo.jcr.ui.explorer.properties
new file mode 100644
index 000000000..4981c934b
--- /dev/null
+++ b/eclipse/plugins/org.argeo.jcr.ui.explorer/org.argeo.jcr.ui.explorer.properties
@@ -0,0 +1,11 @@
+argeo.osgi.start=org.argeo.dep.osgi.catalina.start,\
+org.argeo.jackrabbit.webapp,\
+org.argeo.node.repo.jackrabbit,\
+org.argeo.security.equinox,\
+org.argeo.security.manager.ldap,\
+org.argeo.security.services,\
+org.argeo.server.ads.server,\
+org.springframework.osgi.extender,\
+org.springframework.osgi.web.extender
+
+log4j.configuration=file:../../log4j.properties
diff --git a/server/modules/org.argeo.server.webextender/META-INF/MANIFEST.MF b/server/modules/org.argeo.server.webextender/META-INF/MANIFEST.MF
index b5758f5c3..ba6ebbf6b 100644
--- a/server/modules/org.argeo.server.webextender/META-INF/MANIFEST.MF
+++ b/server/modules/org.argeo.server.webextender/META-INF/MANIFEST.MF
@@ -6,4 +6,6 @@ Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: Argeo
 Fragment-Host: org.springframework.osgi.web.extender
 Import-Package: org.apache.catalina,
- org.apache.catalina.connector
+ org.apache.catalina.connector,
+ org.argeo.server.catalina,
+ org.springframework.osgi.web.deployer.tomcat;version="1.2.1"
diff --git a/server/modules/org.argeo.server.webextender/META-INF/spring/extender/webextender.xml b/server/modules/org.argeo.server.webextender/META-INF/spring/extender/webextender.xml
index f330740b0..6e87783c2 100644
--- a/server/modules/org.argeo.server.webextender/META-INF/spring/extender/webextender.xml
+++ b/server/modules/org.argeo.server.webextender/META-INF/spring/extender/webextender.xml
@@ -11,8 +11,7 @@
 	<osgi:reference id="tomcatServer" interface="org.apache.catalina.Service"
 		cardinality="0..1" timeout="300000" />
 
-	<bean id="warDeployer"
-		class="org.springframework.osgi.web.deployer.tomcat.TomcatWarDeployer"
+	<bean id="warDeployer" class="org.argeo.server.catalina.TomcatDeployer"
 		p:service-ref="tomcatServer" />
 
 </beans>
\ No newline at end of file
diff --git a/server/runtime/org.argeo.server.catalina/META-INF/MANIFEST.MF b/server/runtime/org.argeo.server.catalina/META-INF/MANIFEST.MF
index ebe125573..a76b598f9 100644
--- a/server/runtime/org.argeo.server.catalina/META-INF/MANIFEST.MF
+++ b/server/runtime/org.argeo.server.catalina/META-INF/MANIFEST.MF
@@ -15,5 +15,7 @@ Import-Package: org.apache.catalina;version="6.0.24",
  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/src/main/java/org/argeo/server/catalina/TomcatDeployer.java b/server/runtime/org.argeo.server.catalina/src/main/java/org/argeo/server/catalina/TomcatDeployer.java
index 2a5d0e9e8..3cc16bcee 100644
--- a/server/runtime/org.argeo.server.catalina/src/main/java/org/argeo/server/catalina/TomcatDeployer.java
+++ b/server/runtime/org.argeo.server.catalina/src/main/java/org/argeo/server/catalina/TomcatDeployer.java
@@ -1,5 +1,26 @@
 package org.argeo.server.catalina;
 
-public class TomcatDeployer {
+import org.apache.catalina.Service;
+import org.springframework.osgi.web.deployer.tomcat.TomcatWarDeployer;
 
+/**
+ * Wraps the Spring DM Tomcate deployer in order to avoid issue with call to
+ * getServerInfo() when undeployed.
+ */
+public class TomcatDeployer extends TomcatWarDeployer {
+	private String serverInfo;
+
+	@Override
+	public void setService(Object service) {
+		super.setService(service);
+
+		serverInfo = ((Service) service).getInfo();
+	}
+
+	@Override
+	protected String getServerInfo() {
+		return serverInfo;
+	}
+
+	
 }
-- 
2.39.2