From: Mathieu Baudier <mbaudier@argeo.org>
Date: Thu, 11 Jun 2009 10:18:29 +0000 (+0000)
Subject: Increase timeout when waiting for Tomcat instance to be started.
X-Git-Tag: argeo-slc-2.1.7~1796
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=81490fb5b67b65dd98515630fbae64d97bfa3f91;p=gpl%2Fargeo-slc.git

Increase timeout when waiting for Tomcat instance to be started.

git-svn-id: https://svn.argeo.org/slc/trunk@2533 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---

diff --git a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.webextender/META-INF/MANIFEST.MF b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.webextender/META-INF/MANIFEST.MF
new file mode 100644
index 000000000..c2327e519
--- /dev/null
+++ b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.webextender/META-INF/MANIFEST.MF
@@ -0,0 +1,8 @@
+Manifest-Version: 1.0
+Bundle-SymbolicName: org.argeo.slc.server.webextender
+Bundle-Version: 0.11.4.SNAPSHOT
+Import-Package: org.apache.catalina,
+ org.apache.catalina.connector
+Fragment-Host: org.springframework.osgi.web.extender
+
+
diff --git a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.webextender/META-INF/spring/webextender.xml b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.webextender/META-INF/spring/webextender.xml
new file mode 100644
index 000000000..f330740b0
--- /dev/null
+++ b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.webextender/META-INF/spring/webextender.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:osgi="http://www.springframework.org/schema/osgi"
+	xmlns:p="http://www.springframework.org/schema/p"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans   
+     http://www.springframework.org/schema/beans/spring-beans.xsd
+     http://www.springframework.org/schema/osgi
+     http://www.springframework.org/schema/osgi/spring-osgi.xsd">
+
+	<!-- we leave 5 mins to Tomcat to start -->
+	<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"
+		p:service-ref="tomcatServer" />
+
+</beans>
\ No newline at end of file