X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=runtime%2Forg.argeo.slc.server%2Fsrc%2Fmain%2Fresources%2Forg%2Fargeo%2Fslc%2Fserver%2Fspring%2FservletContext.xml;h=a39c6d1123c22daa3263e4d1d8cdb0a647744d74;hb=93b66f36bdb8042d2aac73b75dda76e65d8e7994;hp=69dffa73f4a1826d589eeabb4b6d234f6f429b2d;hpb=805f03392d3e1a561257614db979f0c2c82c1328;p=gpl%2Fargeo-slc.git

diff --git a/runtime/org.argeo.slc.server/src/main/resources/org/argeo/slc/server/spring/servletContext.xml b/runtime/org.argeo.slc.server/src/main/resources/org/argeo/slc/server/spring/servletContext.xml
index 69dffa73f..a39c6d112 100644
--- a/runtime/org.argeo.slc.server/src/main/resources/org/argeo/slc/server/spring/servletContext.xml
+++ b/runtime/org.argeo.slc.server/src/main/resources/org/argeo/slc/server/spring/servletContext.xml
@@ -1,154 +1,62 @@
 <?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:aop="http://www.springframework.org/schema/aop"
-    xmlns:tx="http://www.springframework.org/schema/tx"
-    xsi:schemaLocation="
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:aop="http://www.springframework.org/schema/aop"
+	xmlns:tx="http://www.springframework.org/schema/tx"
+	xsi:schemaLocation="
        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
        http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.5.xsd
        http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd"
-    default-lazy-init="true">
-
-    <import
-        resource="classpath:/org/argeo/slc/hibernate/spring/applicationContext.xml" />
-    <import resource="transaction.xml" />
-
-    <!--  Properties -->
-    <bean
-        class="org.springframework.web.context.support.ServletContextPropertyPlaceholderConfigurer"
-        lazy-init="false">
-        <property name="contextOverride" value="true" />
-        <property name="properties">
-            <props>
-                <prop key="sessionFactoryParentBean">
-                    slcServerDefault.sessionFactory.HSQLTest
+	default-lazy-init="false">
+
+	<!--  Properties -->
+	<bean
+		class="org.springframework.web.context.support.ServletContextPropertyPlaceholderConfigurer"
+		lazy-init="false">
+		<property name="contextOverride" value="true" />
+		<property name="properties">
+			<props>
+				<prop key="sessionFactoryParentBean">
+					slcServerDefault.sessionFactory.HSQL
                 </prop>
-            </props>
-        </property>
-    </bean>
-
-    <!-- Use session factories -->
-    <bean id="sessionFactory" parent="${sessionFactoryParentBean}" />
-
-    <!--  JNDI data source  -->
-    <bean id="slcDefault.jndiTemplate"
-        class="org.springframework.jndi.JndiTemplate">
-    </bean>
-
-    <bean id="slcDefaut.dataSourceJndi"
-        class="org.springframework.jndi.JndiObjectFactoryBean">
-        <property name="jndiTemplate" ref="slcDefault.jndiTemplate" />
-        <property name="jndiName" value="java:comp/env/jdbc/mainDs" />
-    </bean>
-
-    <!-- DB types -->
-    <bean id="slcServerDefault.sessionFactory.HSQL"
-        parent="slcTemplates.sessionFactory.hibernateBasic">
-        <property name="dataSource" ref="slcDefaut.dataSourceJndi" />
-        <property name="hibernateProperties">
-            <value><![CDATA[
-				hibernate.dialect=org.hibernate.dialect.HSQLDialect
-				hibernate.hbm2ddl.auto=update
-				hibernate.connection.autocommit=false
-			]]></value>
-        </property>
-    </bean>
-
-    <bean id="slcServerDefault.sessionFactory.HSQLTest"
-        parent="slcTemplates.sessionFactory.hibernateBasic">
-        <property name="dataSource" ref="slcDefaut.dataSourceJndi" />
-        <property name="hibernateProperties">
-            <value><![CDATA[
-				hibernate.dialect=org.hibernate.dialect.HSQLDialect
-				hibernate.hbm2ddl.auto=create
-				hibernate.generate_statistics=true
-				hibernate.connection.autocommit=false
-			]]></value>
-        </property>
-    </bean>
-
-    <bean id="slcServerDefault.sessionFactory.MySQL"
-        parent="slcTemplates.sessionFactory.hibernateBasic">
-        <property name="dataSource" ref="slcDefaut.dataSourceJndi" />
-        <property name="hibernateProperties">
-            <value><![CDATA[
-				hibernate.dialect=org.hibernate.dialect.MySQLDialect
-				hibernate.hbm2ddl.auto=update
-				hibernate.connection.autocommit=false
-			]]></value>
-        </property>
-    </bean>
-
-    <bean id="slcServerDefault.sessionFactory.MySQL5"
-        parent="slcTemplates.sessionFactory.hibernateBasic">
-        <property name="dataSource" ref="slcDefaut.dataSourceJndi" />
-        <property name="hibernateProperties">
-            <value><![CDATA[
-                hibernate.dialect=org.hibernate.dialect.MySQL5Dialect
-                hibernate.hbm2ddl.auto=update
-                hibernate.connection.autocommit=false
-            ]]></value>
-        </property>
-    </bean>
-
-    <bean id="slcServerDefault.sessionFactory.Sybase"
-        parent="slcTemplates.sessionFactory.hibernateBasic">
-        <property name="dataSource" ref="slcDefaut.dataSourceJndi" />
-        <property name="hibernateProperties">
-            <value><![CDATA[
-                hibernate.dialect=org.hibernate.dialect.SybaseDialect
-                hibernate.hbm2ddl.auto=update
-                hibernate.connection.autocommit=false
-            ]]></value>
-        </property>
-    </bean>
-
-    <!-- Services -->
-    <bean id="testManagerService"
-        class="org.argeo.slc.services.test.impl.TestManagerServiceImpl">
-        <constructor-arg ref="testResultDao" />
-        <constructor-arg ref="testRunDescriptorDao" />
-        <constructor-arg ref="slcExecutionDao" />
-        <constructor-arg ref="testResultCollectionDao" />
-    </bean>
-
-    <!-- DAOs -->
-    <bean id="hibernateTemplate"
-        class="org.springframework.orm.hibernate3.HibernateTemplate">
-        <property name="sessionFactory" ref="sessionFactory" />
-        <property name="allowCreate" value="false" />
-    </bean>
-
-    <bean id="testResultDao" parent="slcTemplates.dao.testResultDao">
-        <property name="hibernateTemplate" ref="hibernateTemplate" />
-    </bean>
-
-    <bean id="testResultCollectionDao"
-        parent="slcTemplates.dao.testResultCollectionDao">
-        <property name="hibernateTemplate" ref="hibernateTemplate" />
-    </bean>
-
-    <bean id="testRunDescriptorDao"
-        parent="slcTemplates.dao.testRunDescriptorDao">
-        <property name="hibernateTemplate" ref="hibernateTemplate" />
-    </bean>
-
-    <bean id="slcExecutionDao"
-        parent="slcTemplates.dao.slcExecutionDao">
-        <property name="hibernateTemplate" ref="hibernateTemplate" />
-    </bean>
-
-    <!-- Hibernate instrumentation -->
-    <bean id="osivInterceptor"
-        class="org.springframework.orm.hibernate3.support.OpenSessionInViewInterceptor">
-        <property name="sessionFactory" ref="sessionFactory" />
-    </bean>
-
-    <!-- Transaction -->
-    <bean id="transactionManager"
-        class="org.springframework.orm.hibernate3.HibernateTransactionManager"
-        lazy-init="false">
-        <property name="sessionFactory" ref="sessionFactory" />
-    </bean>
+			</props>
+		</property>
+		<property name="ignoreUnresolvablePlaceholders" value="true" />
+	</bean>
+
+	<import resource="transaction.xml" />
+	<import resource="db.xml" />
+	<import resource="activemq.xml" />
+
+	<!-- Services -->
+	<bean id="testManagerService" class="org.argeo.slc.services.impl.test.TestManagerServiceImpl">
+		<constructor-arg ref="testResultDao" />
+		<constructor-arg ref="testRunDescriptorDao" />
+		<constructor-arg ref="slcExecutionDao" />
+		<constructor-arg ref="testResultCollectionDao" />
+	</bean>
+
+	<bean id="agentService" class="org.argeo.slc.services.impl.runtime.AgentServiceImpl">
+		<constructor-arg ref="slcAgentDescriptorDao" />
+	</bean>
+
+	<bean id="agentService.jmsContainer.register" parent="template.jms.listenerContainer">
+		<property name="destination" ref="slcJms.destination.agent.register" />
+		<property name="messageListener">
+			<bean parent="slcTemplate.jms.listenerAdapter">
+				<constructor-arg ref="agentService" />
+				<property name="defaultListenerMethod" value="register" />
+			</bean>
+		</property>
+	</bean>
+
+	<bean id="agentService.jmsContainer.unregister" parent="template.jms.listenerContainer">
+		<property name="destination" ref="slcJms.destination.agent.unregister" />
+		<property name="messageListener">
+			<bean parent="slcTemplate.jms.listenerAdapter">
+				<constructor-arg ref="agentService" />
+				<property name="defaultListenerMethod" value="unregister" />
+			</bean>
+		</property>
+	</bean>
 
 </beans>
\ No newline at end of file