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 (file)
index 0000000..c2327e5
--- /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\r
+Bundle-SymbolicName: org.argeo.slc.server.webextender\r
+Bundle-Version: 0.11.4.SNAPSHOT\r
+Import-Package: org.apache.catalina,\r
+ org.apache.catalina.connector\r
+Fragment-Host: org.springframework.osgi.web.extender\r
+\r
+\r

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 (file)
index 0000000..f330740
--- /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