From: Mathieu Baudier <mbaudier@argeo.org>
Date: Thu, 11 Jun 2009 10:41:01 +0000 (+0000)
Subject: Change extender config location
X-Git-Tag: argeo-slc-2.1.7~1795
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=60904d0cbd408637258ca9c9d4e76e6e387b93a4;p=gpl%2Fargeo-slc.git

Change extender config location

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

diff --git a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.webextender/META-INF/spring/extender/webextender.xml b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.webextender/META-INF/spring/extender/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/extender/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
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
deleted file mode 100644
index f330740b0..000000000
--- a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.webextender/META-INF/spring/webextender.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?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