X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=server%2Forg.argeo.slc.siteserver%2Fbundles%2Forg.argeo.slc.webapp.war%2FWEB-INF%2FapplicationContext.xml;h=703e681a76d30c8b7dbd47307cef1c74e745b5e7;hb=96f732785d5236ab435f6be5da3d53ba66c9b86d;hp=61b8a81c0cd6a41e225f9251c4afce312f8f8bd3;hpb=2ad1acc6a405415f6456c5547ad6ec2a87438fec;p=gpl%2Fargeo-slc.git

diff --git a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/WEB-INF/applicationContext.xml b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/WEB-INF/applicationContext.xml
index 61b8a81c0..703e681a7 100644
--- a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/WEB-INF/applicationContext.xml
+++ b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/WEB-INF/applicationContext.xml
@@ -6,93 +6,39 @@
        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">
-	<import resource="classpath:/org/argeo/slc/server/spring/transaction.xml" />
 
 	<!--
 		<import resource="classpath:/org/argeo/slc/server/spring/jmx.xml" />
 	-->
-	
-	<import resource="osgi.xml"/>
-	
-		<!--
-		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>
-	
-	
-	
-	<!--
-	<bean id="activemqBroker" class="org.apache.activemq.xbean.BrokerFactoryBean">
-		<property name="config" value="WEB-INF/activemq.xml" />
-		<property name="start" value="true" />
+	<import resource="osgi.xml" />
+
+	<!-- Hibernate instrumentation-->
+	<bean id="osivInterceptor"
+		class="org.springframework.orm.hibernate3.support.OpenSessionInViewInterceptor">
+		<property name="sessionFactory" ref="sessionFactory" />
 	</bean>
--->
+
 
 	<!--  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>
 		<property name="ignoreUnresolvablePlaceholders" value="true" />
 	</bean>
 
-	<import resource="classpath:org/argeo/slc/activemq/spring.xml" />
-
-	<!-- ActiveMQ -->
-	<bean id="template.jms.listenerContainer" parent="slcTemplate.jms.listenerContainer"
-		abstract="true">
-	</bean>
-
-	<bean id="template.jms.listenerAdapter" parent="slcTemplate.jms.listenerAdapterCastor"
-		abstract="true">
-	</bean>
-
-
-	<!-- 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="template.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="template.jms.listenerAdapter">
-				<constructor-arg ref="agentService" />
-				<property name="defaultListenerMethod" value="unregister" />
-			</bean>
-		</property>
-	</bean>
+	<!-- Web Services transactions -->
+	<aop:config>
+		<aop:pointcut id="epMethods"
+			expression="execution(* org.springframework.web.servlet.mvc.Controller.handleRequest(..))" />
+		<aop:advisor advice-ref="epAdvice" pointcut-ref="epMethods" />
+	</aop:config>
 
+	<tx:advice id="epAdvice" transaction-manager="hibernateTransactionManager">
+		<tx:attributes>
+			<tx:method name="*" propagation="REQUIRED" />
+		</tx:attributes>
+	</tx:advice>
 
 </beans>
\ No newline at end of file