From: Mathieu Baudier <mbaudier@argeo.org>
Date: Wed, 11 Mar 2009 14:34:24 +0000 (+0000)
Subject: Adapt for agents
X-Git-Tag: argeo-slc-2.1.7~2060
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=995d94b321ef6aba1cf2252b2087920294d525ce;p=gpl%2Fargeo-slc.git

Adapt for agents

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

diff --git a/demo/site/org.argeo.slc.demo.manager/conf/jms.xml b/demo/site/org.argeo.slc.demo.manager/conf/jms.xml
index d0ab93c18..b5f7d6719 100644
--- a/demo/site/org.argeo.slc.demo.manager/conf/jms.xml
+++ b/demo/site/org.argeo.slc.demo.manager/conf/jms.xml
@@ -5,7 +5,30 @@
 	default-lazy-init="false">
 
 	<import resource="classpath:org/argeo/slc/activemq/spring.xml" />
+	
+	
+	<bean id="slcDefault.jms.listener.newExecution" parent="slcTemplate.jms.listenerContainer">
+		<property name="connectionFactory" ref="slcDefault.jms.connectionFactory" />
+		<property name="destination" ref="slcJms.destination.agent.newExecution" />
+		<property name="messageListener">
+			<bean parent="slcTemplate.jms.listenerAdapterCastor">
+				<constructor-arg ref="modulesManager" />
+				<property name="defaultListenerMethod" value="process" />
+			</bean>
+		</property>
+		<property name="messageSelector">
+			<bean factory-bean="slcDefault.jms.agent" factory-method="getMessageSelector"/>
+		</property>
+	</bean>
+
+	<bean id="slcDefault.jms.agent" class="org.argeo.slc.jms.JmsAgent">
+		<property name="jmsTemplate" ref="slcDefault.jms.jmsTemplateCastor" />
+		<property name="agentRegister" ref="slcJms.destination.agent.register" />
+		<property name="agentUnregister" ref="slcJms.destination.agent.unregister" />
+	</bean>
 
+	
+<!-- 
 	<bean id="modulesManager.listenerContainer" parent="slcTemplate.jms.listenerContainer">
 		<property name="destination" ref="slcJms.destination.modulesManager.request" />
 		<property name="messageListener">
@@ -27,6 +50,6 @@
 			</bean>
 		</property>
 	</bean>
-
+ -->
 
 </beans>
\ No newline at end of file
diff --git a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/execution/ExecutionModulesManager.java b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/execution/ExecutionModulesManager.java
index 8182f889d..329145be8 100644
--- a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/execution/ExecutionModulesManager.java
+++ b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/execution/ExecutionModulesManager.java
@@ -2,9 +2,13 @@ package org.argeo.slc.execution;
 
 import java.util.List;
 
+import org.argeo.slc.process.SlcExecution;
+
 public interface ExecutionModulesManager {
 	public ExecutionModuleDescriptor getExecutionModuleDescriptor(
 			String moduleName, String version);
 
 	public List<ExecutionModule> listExecutionModules();
+
+	public void process(SlcExecution slcExecution);
 }
diff --git a/runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/execution.xml b/runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/execution.xml
index a0489e810..5920fea46 100644
--- a/runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/execution.xml
+++ b/runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/execution.xml
@@ -12,11 +12,11 @@
 		<field name="version" />
 		<field name="executionFlows" collection="arraylist"
 			type="org.argeo.slc.execution.ExecutionFlowDescriptor">
-			<bind-xml auto-naming="deriveByClass" location="executionFlows" />
+			<bind-xml auto-naming="deriveByClass" location="execution-flows" />
 		</field>
 		<field name="executionSpecs" collection="arraylist"
 			type="org.argeo.slc.execution.ExecutionSpec">
-			<bind-xml auto-naming="deriveByClass" location="executionSpecs" />
+			<bind-xml auto-naming="deriveByClass" location="execution-specs" />
 		</field>
 	</class>
 
@@ -93,7 +93,7 @@
 		</field>
 		<field name="value" type="string"
 			handler="org.argeo.slc.castor.execution.PrimitiveFieldHandler">
-			<bind-xml node="element" />
+			<bind-xml node="text" />
 		</field>
 	</class>
 
@@ -121,7 +121,7 @@
 		</field>
 		<field name="value" type="string"
 			handler="org.argeo.slc.castor.execution.PrimitiveFieldHandler">
-			<bind-xml node="element" />
+			<bind-xml node="text" />
 		</field>
 	</class>
 
diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/DefaultModulesManager.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/DefaultModulesManager.java
index b55a9c377..5daa5822b 100644
--- a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/DefaultModulesManager.java
+++ b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/DefaultModulesManager.java
@@ -3,12 +3,18 @@ package org.argeo.slc.core.execution;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.argeo.slc.execution.ExecutionModule;
 import org.argeo.slc.execution.ExecutionModuleDescriptor;
 import org.argeo.slc.execution.ExecutionModulesManager;
+import org.argeo.slc.process.SlcExecution;
 import org.springframework.util.Assert;
 
 public class DefaultModulesManager implements ExecutionModulesManager {
+	private final static Log log = LogFactory
+			.getLog(DefaultModulesManager.class);
+
 	private List<ExecutionModule> executionModules = new ArrayList<ExecutionModule>();
 
 	public ExecutionModuleDescriptor getExecutionModuleDescriptor(
@@ -26,17 +32,18 @@ public class DefaultModulesManager implements ExecutionModulesManager {
 
 		return module.getDescriptor();
 	}
-	
-	
 
 	public List<ExecutionModule> listExecutionModules() {
 		return executionModules;
 	}
 
-
-
 	public void setExecutionModules(List<ExecutionModule> executionModules) {
 		this.executionModules = executionModules;
 	}
 
+	public void process(SlcExecution slcExecution) {
+		log.info("SlcExecution " + slcExecution);
+
+	}
+
 }
diff --git a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.hibernate/META-INF/spring/db.xml b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.hibernate/META-INF/spring/db.xml
index 5e098a61f..39070f397 100644
--- a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.hibernate/META-INF/spring/db.xml
+++ b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.hibernate/META-INF/spring/db.xml
@@ -8,11 +8,9 @@
        http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd"
 	default-lazy-init="false">
 
-	<!--
 		<import
 		resource="classpath:/org/argeo/slc/hibernate/spring/applicationContext.xml"
 		/>
-	-->
 
 	<!--
 		Use session factories <bean id="sessionFactory"
@@ -72,105 +70,4 @@
 		<property name="hibernateTemplate" ref="hibernateTemplate" />
 	</bean>
 
-
-
-	<!-- IMPORTED -->
-	
-	<!-- 
-	<bean id="slcDefault.dataSource.inMemoryTestHSQL"
-		class="org.springframework.jdbc.datasource.SingleConnectionDataSource"
-		destroy-method="destroy">
-		<property name="driverClassName" value="org.hsqldb.jdbcDriver" />
-		<property name="url" value="jdbc:hsqldb:mem:test" />
-		<property name="username" value="sa" />
-		<property name="password" value="" />
-		<property name="suppressClose" value="true" />
-	</bean>
- -->
-	<bean id="slcTemplates.sessionFactory.hibernateBasic" abstract="true"
-		class="org.springframework.orm.hibernate3.LocalSessionFactoryBean">
-		<property name="mappingResources">
-			<list>
-				<value>
-					org/argeo/slc/hibernate/structure/SimpleSElement.hbm.xml
-				</value>
-				<value>
-					org/argeo/slc/hibernate/test/SimpleResultPart.hbm.xml
-				</value>
-				<value>
-					org/argeo/slc/hibernate/test/tree/TreeTestResult.hbm.xml
-				</value>
-				<value>
-					org/argeo/slc/hibernate/test/tree/TreeTestResultCollection.hbm.xml
-				</value>
-				<value>
-					org/argeo/slc/hibernate/test/tree/PartSubList.hbm.xml
-				</value>
-				<value>
-					org/argeo/slc/hibernate/test/TestRunDescriptor.hbm.xml
-				</value>
-				<value>
-					org/argeo/slc/hibernate/process/SlcExecution.hbm.xml
-				</value>
-				<value>
-					org/argeo/slc/hibernate/process/SlcExecutionStep.hbm.xml
-				</value>
-				<value>
-					org/argeo/slc/hibernate/process/SlcExecutionSpec.hbm.xml
-				</value>
-				<value>
-					org/argeo/slc/hibernate/runtime/SlcAgentDescriptor.hbm.xml
-				</value>
-			</list>
-		</property>
-		<property name="cacheProvider" ref="slcDefault.cacheProvider.ehCache" />
-	</bean>
-
-	<bean id="slcDefault.cacheProvider.ehCache" class="net.sf.ehcache.hibernate.SingletonEhCacheProvider"
-		depends-on="slcDefault.cacheProvider.ehCacheManager">
-	</bean>
-
-	<bean id="slcDefault.cacheProvider.ehCacheManager"
-		class="org.springframework.cache.ehcache.EhCacheManagerFactoryBean">
-		<property name="shared" value="true" />
-		<property name="configLocation"
-			value="classpath:/org/argeo/slc/hibernate/cache/ehcache.xml" />
-	</bean>
-<!-- 
-	<bean id="slcDefault.sessionFactory.hibernateTestHSQL" parent="slcTemplates.sessionFactory.hibernateBasic">
-		<property name="dataSource" ref="slcDefault.dataSource.inMemoryTestHSQL" />
-		<property name="hibernateProperties">
-			<value><![CDATA[
-				hibernate.dialect=org.hibernate.dialect.HSQLDialect
-				hibernate.hbm2ddl.auto=create
-				hibernate.current_session_context_class=thread
-			]]></value>
-		</property>
-	</bean>
- -->
-	<bean id="slcTemplates.dao.testResultDao"
-		class="org.argeo.slc.hibernate.test.tree.TreeTestResultDaoHibernate"
-		abstract="true">
-	</bean>
-
-	<bean id="slcTemplates.dao.testResultCollectionDao"
-		class="org.argeo.slc.hibernate.test.tree.TreeTestResultCollectionDaoHibernate"
-		abstract="true">
-	</bean>
-
-	<bean id="slcTemplates.dao.testRunDescriptorDao"
-		class="org.argeo.slc.hibernate.test.TestRunDescriptorDaoHibernate"
-		abstract="true">
-	</bean>
-
-	<bean id="slcTemplates.dao.slcExecutionDao"
-		class="org.argeo.slc.hibernate.process.SlcExecutionDaoHibernate"
-		abstract="true">
-	</bean>
-
-	<bean id="slcTemplates.dao.slcAgentDescriptorDao"
-		class="org.argeo.slc.hibernate.runtime.SlcAgentDescriptorDaoHibernate"
-		abstract="true">
-	</bean>
-
 </beans>
\ No newline at end of file