Separate agent modules

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

diff --git a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.agent/META-INF/MANIFEST.MF b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.agent/META-INF/MANIFEST.MF
deleted file mode 100644 (file)
index f50101b..0000000
--- a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.agent/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,21 +0,0 @@
-Manifest-Version: 1.0\r
-Require-Bundle: org.argeo.slc.support.activemq,\r
- org.argeo.slc.specs,\r
- org.argeo.slc.core,\r
- com.springsource.org.castor,\r
- org.argeo.slc.support.osgi\r
-Bundle-Version: 0.11.4.SNAPSHOT\r
-Bundle-Name: Argeo SLC Agent\r
-Bundle-SymbolicName: org.argeo.slc.agent\r
-Import-Package: javax.jms,\r
- org.apache.activemq,\r
- org.apache.activemq.command,\r
- org.apache.activemq.pool,\r
- org.apache.commons.pool,\r
- org.springframework.beans.factory.config,\r
- org.springframework.jms.connection,\r
- org.springframework.jms.core,\r
- org.springframework.jms.listener,\r
- org.springframework.jms.listener.adapter,\r
- org.springframework.oxm.castor\r
-\r

diff --git a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.agent/META-INF/spring/common.xml b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.agent/META-INF/spring/common.xml
deleted file mode 100644 (file)
index 5dfab09..0000000
--- a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.agent/META-INF/spring/common.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?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>
-
-       <bean id="treeTestResultLogger" class="org.argeo.slc.core.test.tree.TreeTestResultLogger" />
-
-</beans>
\ No newline at end of file

diff --git a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.agent/META-INF/spring/jms.xml b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.agent/META-INF/spring/jms.xml
deleted file mode 100644 (file)
index 3349c30..0000000
--- a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.agent/META-INF/spring/jms.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?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 id="jmsAgent.listener.request" parent="jmsAgent.listener.template">
-               <property name="destination" ref="slcJms.destination.agent.request" />
-               <property name="messageSelector">
-                       <bean factory-bean="jmsAgent" factory-method="getMessageSelector" />
-               </property>
-       </bean>
-
-       <bean id="jmsAgent.attachmentUploader" class="org.argeo.slc.jms.JmsAttachmentUploader">
-               <property name="destination" ref="slcJms.destination.attachment.add" />
-               <property name="jmsTemplate" ref="jmsTemplate" />
-       </bean>
-
-       <bean id="jmsAgent.listener.pingAll" parent="jmsAgent.listener.template">
-               <property name="destination" ref="slcJms.destination.agent.pingAll" />
-               <property name="messageListener" ref="jmsAgent" />
-       </bean>
-
-       <bean id="jmsAgent" class="org.argeo.slc.jms.JmsAgent">
-               <property name="agentRegister" ref="slcJms.destination.agent.register" />
-               <property name="agentUnregister" ref="slcJms.destination.agent.unregister" />
-               <property name="modulesManager" ref="modulesManager" />
-               <property name="responseDestination" ref="slcJms.destination.agent.response" />
-               <property name="jmsTemplate" ref="jmsTemplate" />
-       </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="executionEventDestination" ref="slcJms.destination.execution.event" />
-               <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" ref="jmsTemplate" />
-               <property name="executionEventDestination" ref="slcJms.destination.execution.event" />
-       </bean>
-
-       <!-- Common -->
-       <bean id="jmsTemplate" class="org.springframework.jms.core.JmsTemplate">
-               <property name="messageConverter" ref="slcDefault.jms.castorMessageConverter" />
-               <property name="connectionFactory" ref="jmsConnectionFactory" />
-       </bean>
-
-       <bean id="jmsTransactionManager"
-               class="org.springframework.jms.connection.JmsTransactionManager">
-               <property name="connectionFactory" ref="jmsConnectionFactory" />
-       </bean>
-
-       <bean id="jmsAgent.listener.template"
-               class="org.springframework.jms.listener.DefaultMessageListenerContainer"
-               abstract="true">
-               <property name="connectionFactory" ref="jmsConnectionFactory" />
-               <property name="messageListener" ref="jmsAgent" />
-               <property name="transactionManager" ref="jmsTransactionManager" />
-       </bean>
-
-
-</beans>
\ No newline at end of file

diff --git a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.agent/META-INF/spring/manager.xml b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.agent/META-INF/spring/manager.xml
deleted file mode 100644 (file)
index 7e35ff6..0000000
--- a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.agent/META-INF/spring/manager.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?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.osgi.OsgiExecutionModulesManager">\r
-               <property name="slcExecutionNotifiers" ref="slcExecutionListeners" />\r
-               <property name="bundlesManager" ref="bundlesManager" />\r
-       </bean>\r
-\r
-       <bean id="bundlesManager" class="org.argeo.slc.osgi.BundlesManager" />\r
-\r
-</beans>
\ No newline at end of file

diff --git a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.agent/META-INF/spring/osgi.xml b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.agent/META-INF/spring/osgi.xml
deleted file mode 100644 (file)
index 0e92b5c..0000000
--- a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.agent/META-INF/spring/osgi.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?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
-       <!-- Deprecated -->\r
-       <service ref="resultListener"\r
-               interface="org.argeo.slc.core.test.tree.TreeTestResultListener" />\r
-       <service ref="resultListener" interface="org.argeo.slc.test.TestResultListener" />\r
-\r
-       <!-- Deprecated -->\r
-       <service ref="treeTestResultLogger" interface="org.argeo.slc.test.TestResultListener" />\r
-       <service ref="treeTestResultLogger"\r
-               interface="org.argeo.slc.core.test.tree.TreeTestResultListener" />\r
-\r
-       <service ref="slcExecutionListener" interface="org.argeo.slc.process.SlcExecutionNotifier" />\r
-\r
-       <service ref="modulesManager" interface="org.argeo.slc.execution.ExecutionModulesManager" />\r
-\r
-       <service ref="jmsAgent.attachmentUploader" interface="org.argeo.slc.core.attachment.AttachmentUploader" />\r
-\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

diff --git a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.agent/META-INF/spring/transport.xml b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.agent/META-INF/spring/transport.xml
deleted file mode 100644 (file)
index 8e2c632..0000000
--- a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.agent/META-INF/spring/transport.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?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.CachingConnectionFactory">
-               <property name="targetConnectionFactory">
-                       <bean class="org.apache.activemq.ActiveMQConnectionFactory">
-                               <property name="brokerURL">
-                                       <value>${slc.server.jms.url}</value>
-                               </property>
-                       </bean>
-               </property>
-       </bean>
-
-<!-- 
-       <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>${slc.server.jms.url}</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>
-       </bean>
- -->
-</beans>
\ No newline at end of file

diff --git a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.agent/agent.properties b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.agent/agent.properties
deleted file mode 100644 (file)
index d1afbfa..0000000
--- a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.agent/agent.properties
+++ /dev/null
@@ -1 +0,0 @@
-slc.server.jms.url=tcp://localhost:61616
\ No newline at end of file