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

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 (file)
index 0000000..d804c1d
Binary files /dev/null and b/eclipse/plugins/org.argeo.jcr.ui.explorer/exec/org.argeo.jcr.ui.explorer/data/tomcat/work/org.argeo.jcr.webapp/SESSIONS.ser differ

diff --git a/eclipse/plugins/org.argeo.jcr.ui.explorer/log4j.properties b/eclipse/plugins/org.argeo.jcr.ui.explorer/log4j.properties
index dcc3a49d05a3460b28eca10c7d49ac7b48a074e9..46b724cea8a103ff4338b2eb8abc86a08d3e2420 100644 (file)
--- 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 (file)
index 0000000..4981c93
--- /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 b5758f5c3d70aff77f3d10b3b11b4441812c75e9..ba6ebbf6b36d2cbf7d19dfddf35f9254535d15b8 100644 (file)
--- 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 f330740b06238d1facd1125197090f847e56167f..6e87783c201c68831d696f4370ac6d3b8b817e4c 100644 (file)
--- 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 ebe125573630fa869f580f296db46267cca7fdb2..a76b598f9dabf8efc7b2ecb928833a1eafe23602 100644 (file)
--- 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 2a5d0e9e87dfa348a15814b4b2657119dc5fc825..3cc16bceee04cfe2eee7c4d7bfe3ff6ae59c33bd 100644 (file)
--- 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;
+       }
+
+       
 }