Improve server structure

[gpl/argeo-slc.git] / server / org.argeo.slc.siteserver / bundles / org.argeo.slc.webapp.war / WEB-INF / web.xml

diff --git a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/WEB-INF/web.xml b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/WEB-INF/web.xml
index 62d26b5a61f81bf1797b4db35685a6a15479a976..b1872115788ff54a194f697e1c387453f0f2fb15 100644 (file)
--- a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/WEB-INF/web.xml
+++ b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/WEB-INF/web.xml
@@ -13,6 +13,7 @@
                        <param-name>contextClass</param-name>
                        <param-value>org.springframework.osgi.web.context.support.OsgiBundleXmlWebApplicationContext</param-value>
                </init-param>
+               <load-on-startup>1</load-on-startup>
        </servlet>
 
        <servlet-mapping>
@@ -85,11 +86,12 @@
                <param-value>org.springframework.osgi.web.context.support.OsgiBundleXmlWebApplicationContext</param-value>
        </context-param>
 
-       <!-- Env refs
-       <resource-env-ref>
+       <!--
+               Env refs <resource-env-ref>
                <resource-env-ref-name>jdbc/mainDs</resource-env-ref-name>
                <resource-env-ref-type>javax.sql.DataSource</resource-env-ref-type>
-       </resource-env-ref> -->
+               </resource-env-ref>
+       -->
 
        <!-- Log4j configContext loader config -->
        <listener>
@@ -109,7 +111,7 @@
        <!-- Active MQ -->
        <context-param>
                <param-name>org.apache.activemq.brokerURL</param-name>
-               <param-value>tcp://localhost:61616</param-value>
+               <param-value>vm://localhost</param-value>
        </context-param>
 
        <context-param>