org.argeo.slc.server.services,
org.argeo.slc.server.jms,
org.argeo.slc.webapp,
- org.argeo.slc.ria,
- org.argeo.slc.support.equinox,
- org.argeo.slc.demo.basic,
- org.argeo.slc.demo.manager
+ org.argeo.slc.ria
</slc.osgi.start>
</systemProperties>
</configuration>
<slc.osgi.start>
org.springframework.osgi.extender,
org.argeo.slc.support.equinox,
+ org.argeo.slc.agent,
org.argeo.slc.demo.basic,
- org.argeo.slc.demo.agent,
org.argeo.slc.demo.manager
</slc.osgi.start>
</systemProperties>
Bundle-SymbolicName: org.argeo.slc.demo.agent
Bundle-Version: 0.11.3.qualifier
+Fragment-Host: org.argeo.slc.agent
Bundle-Name: Argeo SLC Demo Agent
-Import-Package:
- javax.jms,
- org.apache.activemq,
- org.apache.activemq.command,
- org.springframework.jms.connection,
- org.springframework.jms.core,
- org.springframework.jms.listener,
- org.springframework.jms.listener.adapter,
- org.springframework.oxm.castor
-Require-Bundle:
- org.argeo.slc.support.activemq,
- org.argeo.slc.specs,
- org.argeo.slc.support.simple,
- com.springsource.org.castor
+++ /dev/null
-<?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.5.xsd"
- default-lazy-init="false">
-
- <import resource="classpath:org/argeo/slc/activemq/spring.xml" />
-
-
- <bean
- class="org.springframework.jms.listener.DefaultMessageListenerContainer">
- <property name="connectionFactory" ref="jmsConnectionFactory" />
- <property name="destination" ref="slcJms.destination.agent.request" />
- <property name="messageListener" ref="jmsAgent" />
- <property name="messageSelector">
- <bean factory-bean="jmsAgent" factory-method="getMessageSelector" />
- </property>
- </bean>
-
- <bean id="jmsAgent.listener.newExecution"
- class="org.springframework.jms.listener.DefaultMessageListenerContainer">
- <property name="connectionFactory" ref="jmsConnectionFactory" />
- <property name="destination" ref="slcJms.destination.agent.newExecution" />
- <property name="messageListener">
- <bean parent="slcTemplate.jms.listenerAdapterCastor">
- <constructor-arg ref="jmsAgent" />
- <property name="defaultListenerMethod" value="runSlcExecution" />
- </bean>
- </property>
- <property name="messageSelector">
- <bean factory-bean="jmsAgent" factory-method="getMessageSelector" />
- </property>
- </bean>
-
- <bean id="jmsAgent" class="org.argeo.slc.jms.JmsAgent">
- <property name="connectionFactory" ref="jmsConnectionFactory" />
- <property name="agentRegister" ref="slcJms.destination.agent.register" />
- <property name="agentUnregister" ref="slcJms.destination.agent.unregister" />
- <property name="messageConverter" ref="slcDefault.jms.castorMessageConverter" />
- <property name="modulesManager" ref="modulesManager" />
- <property name="responseDestination" ref="slcJms.destination.agent.response" />
- </bean>
-
- <!-- TreeTestResult Listener -->
- <bean id="resultListener" class="org.argeo.slc.jms.JmsTreeTestResultListener">
- <property name="createDestination" ref="slcJms.destination.test.create" />
- <property name="addResultPartDestination" ref="slcJms.destination.test.addResultPart" />
- <property name="closeDestination" ref="slcJms.destination.test.close" />
- <property name="jmsTemplate">
- <bean class="org.springframework.jms.core.JmsTemplate">
- <property name="messageConverter" ref="slcDefault.jms.castorMessageConverter" />
- <property name="connectionFactory" ref="jmsConnectionFactory" />
- </bean>
- </property>
- </bean>
-
- <!-- SLC Execution Listener -->
- <bean id="slcExecutionListener" class="org.argeo.slc.jms.JmsSlcExecutionNotifier">
- <property name="updateStatusDestination" ref="slcJms.destination.slcExecution.updateStatus" />
- <property name="jmsTemplate">
- <bean class="org.springframework.jms.core.JmsTemplate">
- <property name="messageConverter" ref="slcDefault.jms.castorMessageConverter" />
- <property name="connectionFactory" ref="jmsConnectionFactory" />
- </bean>
- </property>
- </bean>
-</beans>
\ No newline at end of file
+++ /dev/null
-<?xml version="1.0" encoding="UTF-8"?>\r
-<beans:beans xmlns="http://www.springframework.org/schema/osgi"\r
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"\r
- xsi:schemaLocation="http://www.springframework.org/schema/osgi \r
- http://www.springframework.org/schema/osgi/spring-osgi-1.1.xsd\r
- http://www.springframework.org/schema/beans \r
- http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">\r
-\r
- <service ref="resultListener" interface="org.argeo.slc.test.TestResultListener" />\r
- <service ref="slcExecutionListener" interface="org.argeo.slc.process.SlcExecutionNotifier" />\r
-\r
- <reference id="modulesManager"\r
- interface="org.argeo.slc.execution.ExecutionModulesManager" />\r
-\r
-</beans:beans>
\ No newline at end of file
+++ /dev/null
-<?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.5.xsd"
- default-lazy-init="false">
-
- <bean id="jmsConnectionFactory"
- class="org.springframework.jms.connection.SingleConnectionFactory">
- <property name="targetConnectionFactory">
- <bean id="slcDefault.jms.amqConnectionFactory" class="org.apache.activemq.ActiveMQConnectionFactory">
- <property name="brokerURL">
- <value>tcp://localhost:61616</value>
- </property>
- </bean>
- </property>
- </bean>
-
-</beans>
\ No newline at end of file
+++ /dev/null
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.argeo.slc.demo.manager</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
+++ /dev/null
-#Fri Mar 13 15:28:46 CET 2009
-eclipse.preferences.version=1
-pluginProject.equinox=false
-pluginProject.extensions=false
-resolve.requirebundle=false
+++ /dev/null
-Bundle-Name: Manager Plug-in
-Bundle-SymbolicName: org.argeo.slc.demo.manager
-Bundle-Version: 0.11.3.qualifier
-Spring-Context: conf/*
-Require-Bundle:
- org.argeo.slc.specs,
- org.argeo.slc.support.simple
+++ /dev/null
-bin.includes = META-INF/
+++ /dev/null
-<?xml version="1.0" encoding="UTF-8"?>\r
-<beans:beans xmlns="http://www.springframework.org/schema/osgi"\r
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"\r
- xsi:schemaLocation="http://www.springframework.org/schema/osgi \r
- http://www.springframework.org/schema/osgi/spring-osgi-1.1.xsd\r
- http://www.springframework.org/schema/beans \r
- http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">\r
-\r
- <list id="executionModules" interface="org.argeo.slc.execution.ExecutionModule"\r
- cardinality="0..N" />\r
-\r
- <service ref="modulesManager" interface="org.argeo.slc.execution.ExecutionModulesManager" />\r
-\r
- <service interface="org.argeo.slc.test.TestResultListener">\r
- <beans:bean class="org.argeo.slc.core.test.tree.TreeTestResultLogger" />\r
- </service>\r
-\r
- <list id="slcExecutionListeners" interface="org.argeo.slc.process.SlcExecutionNotifier" cardinality="0..N"/>\r
-</beans:beans>
\ No newline at end of file
+++ /dev/null
-<?xml version="1.0" encoding="UTF-8"?>\r
-<beans xmlns="http://www.springframework.org/schema/beans"\r
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"\r
- xsi:schemaLocation="\r
- http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">\r
-\r
- <bean id="modulesManager" class="org.argeo.slc.core.execution.DefaultModulesManager">\r
- <property name="executionModules" ref="executionModules" />\r
- <property name="slcExecutionNotifiers" ref="slcExecutionListeners" />\r
- </bean>\r
-</beans>
\ No newline at end of file
<artifactId>com.springsource.javax.mail</artifactId>
<version>1.4.1</version>
</dependency>
- <!--
- Required by ActiveMQ admin <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>org.springframework.web</artifactId>
- <version>${version.spring}</version> </dependency> <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>org.springframework.web.servlet</artifactId>
- <version>${version.spring}</version> </dependency> <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>com.springsource.org.apache.activemq.web</artifactId>
- <version>${version.activemq}</version> </dependency> <dependency>
- <groupId>javax.jms</groupId>
- <artifactId>com.springsource.javax.jms</artifactId>
- <version>1.1.0</version> </dependency> <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>com.springsource.javax.management.j2ee</artifactId>
- <version>1.0.1</version> </dependency> <dependency>
- <groupId>com.opensymphony.sitemesh</groupId>
- <artifactId>com.springsource.com.opensymphony.sitemesh</artifactId>
- <version>2.3.0</version> </dependency>
- -->
</dependencies>
</plugin>
<plugin>
<artifactId>org.argeo.dep.osgi.commons.cli</artifactId>
<version>1.1</version>
</dependency>
-
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>com.springsource.org.apache.commons.pool</artifactId>
+ <version>1.4.0</version>
+ </dependency>
<!-- DB Drivers -->
<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>org.argeo.dep.osgi.activemq</artifactId>
<version>${version.activemq}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>com.springsource.org.apache.activemq.pool</artifactId>
+ <version>5.2.0</version>
+ </dependency>
<dependency>
<groupId>org.argeo.dep.osgi</groupId>
<artifactId>org.argeo.dep.osgi.activemq.web</artifactId>
<groupId>org.argeo.dep.osgi</groupId>
<artifactId>org.argeo.dep.osgi.activemq</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>com.springsource.org.apache.activemq.pool</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>com.springsource.org.apache.commons.pool</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>com.springsource.javax.management.j2ee</artifactId>
<groupId>javax.xml.soap</groupId>
<artifactId>com.springsource.javax.xml.soap</artifactId>
</dependency>
-
+
<!--
- <dependency>
- <groupId>javax.xml.stream</groupId>
+ <dependency> <groupId>javax.xml.stream</groupId>
<artifactId>com.springsource.javax.xml.stream</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.xalan</groupId>
+ </dependency> <dependency> <groupId>org.apache.xalan</groupId>
<artifactId>com.springsource.org.apache.xalan</artifactId>
- </dependency>
- -->
+ </dependency>
+ -->
</dependencies>
</project>
\ No newline at end of file
import java.util.List;
import java.util.UUID;
-import javax.jms.ConnectionFactory;
import javax.jms.Destination;
import javax.jms.JMSException;
import javax.jms.Message;
import org.argeo.slc.core.runtime.AbstractAgent;
import org.argeo.slc.execution.ExecutionModule;
import org.argeo.slc.execution.ExecutionModuleDescriptor;
-import org.argeo.slc.msg.ObjectList;
+import org.argeo.slc.process.SlcExecution;
import org.argeo.slc.runtime.SlcAgent;
import org.argeo.slc.runtime.SlcAgentDescriptor;
import org.springframework.beans.factory.DisposableBean;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.jms.core.JmsTemplate;
import org.springframework.jms.listener.SessionAwareMessageListener;
-import org.springframework.jms.support.converter.MessageConverter;
+import org.springframework.jms.support.converter.MessageConversionException;
/** JMS based implementation of SLC Agent. */
public class JmsAgent extends AbstractAgent implements SlcAgent,
private final static Log log = LogFactory.getLog(JmsAgent.class);
private final SlcAgentDescriptor agentDescriptor;
- private ConnectionFactory connectionFactory;
+ // private ConnectionFactory connectionFactory;
private JmsTemplate jmsTemplate;
private Destination agentRegister;
private Destination agentUnregister;
// private Destination requestDestination;
private Destination responseDestination;
- private MessageConverter messageConverter;
+ // private MessageConverter messageConverter;
public JmsAgent() {
try {
public void afterPropertiesSet() throws Exception {
// Initialize JMS Template
- jmsTemplate = new JmsTemplate(connectionFactory);
- jmsTemplate.setMessageConverter(messageConverter);
+ // jmsTemplate = new JmsTemplate(connectionFactory);
+ // jmsTemplate.setMessageConverter(messageConverter);
jmsTemplate.convertAndSend(agentRegister, agentDescriptor);
log.info("Agent #" + agentDescriptor.getUuid() + " registered to "
String version = message.getStringProperty("version");
ExecutionModuleDescriptor emd = getExecutionModuleDescriptor(
moduleName, version);
- responseMsg = messageConverter.toMessage(emd, session);
+ responseMsg = jmsTemplate.getMessageConverter().toMessage(emd,
+ session);
} else if ("listExecutionModuleDescriptors".equals(query)) {
List<ExecutionModuleDescriptor> lst = listExecutionModuleDescriptors();
SlcAgentDescriptor agentDescriptorToSend = new SlcAgentDescriptor(
agentDescriptor);
agentDescriptorToSend.setModuleDescriptors(lst);
- responseMsg = messageConverter.toMessage(agentDescriptorToSend,
- session);
+ responseMsg = jmsTemplate.getMessageConverter().toMessage(
+ agentDescriptorToSend, session);
} else {
- throw new SlcException("Unsupported query " + query);
+ try {
+ //FIXME: generalize
+ SlcExecution slcExecution = (SlcExecution) jmsTemplate
+ .getMessageConverter().fromMessage(message);
+ runSlcExecution(slcExecution);
+ } catch (MessageConversionException e) {
+ if (log.isDebugEnabled())
+ log.debug("Unsupported query " + query, e);
+ }
+ return;
}
if (responseMsg != null) {
}
- public void setMessageConverter(MessageConverter messageConverter) {
- this.messageConverter = messageConverter;
- }
-
- public void setConnectionFactory(ConnectionFactory connectionFactory) {
- this.connectionFactory = connectionFactory;
- }
-
public ExecutionModuleDescriptor getExecutionModuleDescriptor(
String moduleName, String version) {
return getModulesManager().getExecutionModuleDescriptor(moduleName,
this.responseDestination = responseDestination;
}
+ public void setJmsTemplate(JmsTemplate jmsTemplate) {
+ this.jmsTemplate = jmsTemplate;
+ }
+
}
-Bundle-SymbolicName: org.argeo.slc.demo.agent
+Bundle-SymbolicName: org.argeo.slc.agent
Bundle-Version: 0.11.3.qualifier
-Bundle-Name: Argeo SLC Demo Agent
+Bundle-Name: Argeo SLC Agent
Import-Package:
javax.jms,
org.apache.activemq,
org.apache.activemq.command,
+ org.apache.activemq.pool,
+ org.apache.commons.pool,
+ org.springframework.beans.factory.config,
org.springframework.jms.connection,
org.springframework.jms.core,
org.springframework.jms.listener,
--- /dev/null
+<?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.5.xsd"
+ default-lazy-init="false">
+
+ <bean
+ class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+ <property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE" />
+ <property name="ignoreUnresolvablePlaceholders" value="true" />
+ <property name="locations">
+ <value>osgibundle:agent.properties
+ </value>
+ </property>
+ </bean>
+</beans>
\ No newline at end of file
class="org.springframework.jms.listener.DefaultMessageListenerContainer">
<property name="connectionFactory" ref="jmsConnectionFactory" />
<property name="destination" ref="slcJms.destination.agent.newExecution" />
- <property name="messageListener">
+ <property name="messageListener" ref="jmsAgent" />
+ <!-- <property name="messageListener">
<bean parent="slcTemplate.jms.listenerAdapterCastor">
<constructor-arg ref="jmsAgent" />
<property name="defaultListenerMethod" value="runSlcExecution" />
</bean>
- </property>
+ </property> -->
<property name="messageSelector">
<bean factory-bean="jmsAgent" factory-method="getMessageSelector" />
</property>
</bean>
<bean id="jmsAgent" class="org.argeo.slc.jms.JmsAgent">
- <property name="connectionFactory" ref="jmsConnectionFactory" />
<property name="agentRegister" ref="slcJms.destination.agent.register" />
<property name="agentUnregister" ref="slcJms.destination.agent.unregister" />
- <property name="messageConverter" ref="slcDefault.jms.castorMessageConverter" />
<property name="modulesManager" ref="modulesManager" />
<property name="responseDestination" ref="slcJms.destination.agent.response" />
+ <property name="jmsTemplate" ref="jmsTemplate" />
</bean>
<!-- TreeTestResult Listener -->
<property name="createDestination" ref="slcJms.destination.test.create" />
<property name="addResultPartDestination" ref="slcJms.destination.test.addResultPart" />
<property name="closeDestination" ref="slcJms.destination.test.close" />
- <property name="jmsTemplate">
- <bean class="org.springframework.jms.core.JmsTemplate">
- <property name="messageConverter" ref="slcDefault.jms.castorMessageConverter" />
- <property name="connectionFactory" ref="jmsConnectionFactory" />
- </bean>
- </property>
+ <property name="jmsTemplate" ref="jmsTemplate" />
</bean>
<!-- SLC Execution Listener -->
<bean id="slcExecutionListener" class="org.argeo.slc.jms.JmsSlcExecutionNotifier">
<property name="updateStatusDestination" ref="slcJms.destination.slcExecution.updateStatus" />
- <property name="jmsTemplate">
- <bean class="org.springframework.jms.core.JmsTemplate">
- <property name="messageConverter" ref="slcDefault.jms.castorMessageConverter" />
- <property name="connectionFactory" ref="jmsConnectionFactory" />
- </bean>
- </property>
+ <property name="jmsTemplate" ref="jmsTemplate" />
</bean>
+
+ <!-- Common -->
+ <bean id="jmsTemplate" class="org.springframework.jms.core.JmsTemplate">
+ <property name="messageConverter" ref="slcDefault.jms.castorMessageConverter" />
+ <property name="connectionFactory" ref="jmsConnectionFactory" />
+ </bean>
+
+
</beans>
\ No newline at end of file
--- /dev/null
+<?xml version="1.0" encoding="UTF-8"?>\r
+<beans xmlns="http://www.springframework.org/schema/beans"\r
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"\r
+ xsi:schemaLocation="\r
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">\r
+\r
+ <bean id="modulesManager" class="org.argeo.slc.core.execution.DefaultModulesManager">\r
+ <property name="executionModules" ref="executionModules" />\r
+ <property name="slcExecutionNotifiers" ref="slcExecutionListeners" />\r
+ </bean>\r
+</beans>
\ No newline at end of file
<service ref="resultListener" interface="org.argeo.slc.test.TestResultListener" />\r
<service ref="slcExecutionListener" interface="org.argeo.slc.process.SlcExecutionNotifier" />\r
\r
- <reference id="modulesManager"\r
- interface="org.argeo.slc.execution.ExecutionModulesManager" />\r
+ <!-- Manager -->\r
+ <list id="executionModules" interface="org.argeo.slc.execution.ExecutionModule"\r
+ cardinality="0..N" />\r
+\r
+ <service ref="modulesManager" interface="org.argeo.slc.execution.ExecutionModulesManager" />\r
+\r
+ <service interface="org.argeo.slc.test.TestResultListener">\r
+ <beans:bean class="org.argeo.slc.core.test.tree.TreeTestResultLogger" />\r
+ </service>\r
+\r
+ <list id="slcExecutionListeners" interface="org.argeo.slc.process.SlcExecutionNotifier"\r
+ cardinality="0..N" />\r
\r
</beans:beans>
\ No newline at end of file
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd"
default-lazy-init="false">
+<!--
<bean id="jmsConnectionFactory"
class="org.springframework.jms.connection.SingleConnectionFactory">
<property name="targetConnectionFactory">
<bean id="slcDefault.jms.amqConnectionFactory" class="org.apache.activemq.ActiveMQConnectionFactory">
<property name="brokerURL">
- <value>tcp://localhost:61616</value>
+ <value>${slc.server.jmsurl}</value>
+ </property>
+ </bean>
+ </property>
+ </bean>
+ -->
+ <bean id="jmsConnectionFactory" class="org.apache.activemq.pool.PooledConnectionFactory"
+ destroy-method="stop">
+ <property name="connectionFactory">
+ <bean class="org.apache.activemq.ActiveMQConnectionFactory">
+ <property name="brokerURL">
+ <value>${slc.server.jms.url}</value>
</property>
</bean>
</property>
--- /dev/null
+slc.server.jms.url=tcp://localhost:61616
\ No newline at end of file
Bundle-Version: 0.11.3.qualifier
Import-Package: javax.jms,
javax.management.j2ee.statistics,
- org.apache.commons.logging
+ org.apache.commons.logging,
+ org.apache.activemq.pool,
+ org.apache.commons.pool
Require-Bundle: org.argeo.slc.server,
org.argeo.slc.support.activemq,
org.springframework.core,
<import resource="classpath:org/argeo/slc/activemq/spring.xml" />
+ <bean
+ class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+ <property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE" />
+ <property name="ignoreUnresolvablePlaceholders" value="true" />
+ <property name="locations">
+ <value>osgibundle:activemq.properties
+ </value>
+ </property>
+ </bean>
+
<!-- Embedded broker -->
<amq:broker useJmx="false" persistent="false">
<amq:transportConnectors>
- <amq:transportConnector uri="tcp://localhost:61616" />
+ <amq:transportConnector uri="${slc.server.jms.url}" />
</amq:transportConnectors>
</amq:broker>
<!-- Connection Factory -->
- <bean id="jmsConnectionFactory"
+ <!-- <bean id="jmsConnectionFactory"
class="org.springframework.jms.connection.SingleConnectionFactory">
<property name="targetConnectionFactory">
<bean id="slcDefault.jms.amqConnectionFactory" class="org.apache.activemq.ActiveMQConnectionFactory">
<property name="brokerURL">
- <value>tcp://localhost:61616</value>
+ <value>vm://localhost</value>
+ </property>
+ </bean>
+ </property>
+ </bean> -->
+
+ <bean id="jmsConnectionFactory" class="org.apache.activemq.pool.PooledConnectionFactory"
+ destroy-method="stop">
+ <property name="connectionFactory">
+ <bean class="org.apache.activemq.ActiveMQConnectionFactory">
+ <property name="brokerURL">
+ <value>vm://localhost</value>
</property>
</bean>
</property>
--- /dev/null
+slc.server.jms.url=tcp://localhost:61616
org.springframework.cache.ehcache,
net.sf.ehcache.hibernate,
org.hsqldb.jdbc,
- org.hibernate
+ org.hibernate,
+ org.springframework.beans.factory.config
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"
- />
+ <import
+ resource="classpath:/org/argeo/slc/hibernate/spring/applicationContext.xml" />
+
+ <bean
+ class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+ <property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE" />
+ <property name="ignoreUnresolvablePlaceholders" value="true" />
+ <property name="locations">
+ <value>osgibundle:hsqldb.properties
+ </value>
+ </property>
+ </bean>
<bean id="sessionFactory" parent="slcTemplates.sessionFactory.hibernateBasic">
<property name="dataSource" ref="dataSource" />
</bean>
<bean id="dataSource" class="org.hsqldb.jdbc.jdbcDataSource">
- <property name="database" value="jdbc:hsqldb:mem:test"/>
- <property name="user" value="sa"/>
- <property name="password" value=""/>
-
+ <property name="database" value="${slc.server.hsqldb.url}" />
+ <property name="user" value="sa" />
+ <property name="password" value="" />
+
</bean>
</beans>
\ No newline at end of file
--- /dev/null
+slc.server.hsqldb.url=jdbc:hsqldb:mem:test
\ No newline at end of file
<property name="jmsTemplate">
<bean class="org.springframework.jms.core.JmsTemplate">
<property name="connectionFactory" ref="jmsConnectionFactory" />
- <property name="receiveTimeout" value="10000" />
+ <property name="receiveTimeout" value="20000" />
</bean>
</property>
<property name="messageConverter" ref="slcDefault.jms.castorMessageConverter" />
\r
<reference interface="org.hibernate.SessionFactory" id="sessionFactory" />\r
\r
+<!-- \r
<reference interface="org.argeo.slc.execution.ExecutionModulesManager"\r
id="modulesManager" />\r
-\r
+ -->\r
<reference id="testManagerService"\r
interface="org.argeo.slc.services.test.TestManagerService" />\r
<reference id="agentService" interface="org.argeo.slc.services.runtime.AgentService" />\r