X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc.webapp%2Fsrc%2Fmain%2Fwebapp%2FWEB-INF%2FapplicationContext.xml;h=97ca543651d7e69223068de9c98a28cb4a291001;hb=ab459c7e28f29c0695d159f7971337e3b5884c6e;hp=0177380d39e2465bae432eff390685bef4695615;hpb=d07d365ea50eb5385baef04d235bfda8f92086cb;p=gpl%2Fargeo-slc.git

diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/applicationContext.xml b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/applicationContext.xml
index 0177380d3..97ca54365 100644
--- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/applicationContext.xml
@@ -1,52 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
-
-	<import resource="classpath:/org/argeo/slc/spring/templates.xml" />
-
-	<bean
-		class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
-		<property name="locations">
-			<value>WEB-INF/local.properties</value>
-		</property>
-		<property name="properties">
-			<props>
-				<prop key="${dataSourceBean}">
-					slcTemplates.dataSource.inMemoryTestHSQL
-				</prop>
-			</props>
-		</property>
-	</bean>
-
-	<bean id="sessionFactory"
-		parent="slcTemplates.sessionFactory.hibernateBasic">
-		<property name="dataSource" ref="${dataSourceBean}" />
-		<property name="hibernateProperties">
-			<value><![CDATA[
-				hibernate.dialect=org.hibernate.dialect.HSQLDialect
-				hibernate.hbm2ddl.auto=update
-			]]></value>
-		</property>
-	</bean>
-
-	<bean id="persistentDataSource"
-		class="org.springframework.jdbc.datasource.SingleConnectionDataSource"
-		destroy-method="destroy">
-		<property name="driverClassName" value="org.hsqldb.jdbcDriver" />
-		<property name="url" value="${jdbcUrl}" />
-		<property name="username" value="sa" />
-		<property name="password" value="" />
-		<property name="suppressClose" value="true" />
-	</bean>
-
-	<bean id="testResultDao"
-		class="org.argeo.slc.hibernate.test.tree.TestResultDaoHibernate">
-		<property name="sessionFactory" ref="sessionFactory" />
-	</bean>
-
-	<bean id="slcExecutionDao"
-		class="org.argeo.slc.hibernate.process.SlcExecutionDaoHibernate">
-		<property name="sessionFactory" ref="sessionFactory" />
-	</bean>
+<?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="
+       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/servletContext.xml" />
+
+	<!--
+		<import resource="classpath:/org/argeo/slc/server/spring/jmx.xml" />
+	-->
+
+	<!--
+	<bean id="activemqBroker" class="org.apache.activemq.xbean.BrokerFactoryBean">
+		<property name="config" value="WEB-INF/activemq.xml" />
+		<property name="start" value="true" />
+	</bean>
+-->
 </beans>
\ No newline at end of file