From 15b9d462d5607257185c7fed48cd3b44b460e0ed Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Fri, 26 Jun 2009 10:32:49 +0000
Subject: [PATCH] Introduce modules

git-svn-id: https://svn.argeo.org/slc/trunk@2590 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 .../META-INF/MANIFEST.MF                      | 20 ++++++
 .../META-INF/spring/common.xml                | 19 +++++
 .../META-INF/spring/jms.xml                   | 72 +++++++++++++++++++
 .../META-INF/spring/osgi.xml                  | 22 ++++++
 .../META-INF/spring/transport.xml             | 42 +++++++++++
 .../org.argeo.slc.agent.jms/agent.properties  |  1 +
 .../org.argeo.slc.agent/META-INF/MANIFEST.MF  |  7 ++
 .../META-INF/spring/common.xml                |  9 +++
 .../META-INF/spring/manager.xml               | 14 ++++
 .../META-INF/spring/osgi.xml                  | 19 +++++
 modules/agent/pom.xml                         | 25 +++++++
 modules/pom.xml                               | 16 +++++
 12 files changed, 266 insertions(+)
 create mode 100644 modules/agent/org.argeo.slc.agent.jms/META-INF/MANIFEST.MF
 create mode 100644 modules/agent/org.argeo.slc.agent.jms/META-INF/spring/common.xml
 create mode 100644 modules/agent/org.argeo.slc.agent.jms/META-INF/spring/jms.xml
 create mode 100644 modules/agent/org.argeo.slc.agent.jms/META-INF/spring/osgi.xml
 create mode 100644 modules/agent/org.argeo.slc.agent.jms/META-INF/spring/transport.xml
 create mode 100644 modules/agent/org.argeo.slc.agent.jms/agent.properties
 create mode 100644 modules/agent/org.argeo.slc.agent/META-INF/MANIFEST.MF
 create mode 100644 modules/agent/org.argeo.slc.agent/META-INF/spring/common.xml
 create mode 100644 modules/agent/org.argeo.slc.agent/META-INF/spring/manager.xml
 create mode 100644 modules/agent/org.argeo.slc.agent/META-INF/spring/osgi.xml
 create mode 100644 modules/agent/pom.xml
 create mode 100644 modules/pom.xml

diff --git a/modules/agent/org.argeo.slc.agent.jms/META-INF/MANIFEST.MF b/modules/agent/org.argeo.slc.agent.jms/META-INF/MANIFEST.MF
new file mode 100644
index 000000000..fbb612bd5
--- /dev/null
+++ b/modules/agent/org.argeo.slc.agent.jms/META-INF/MANIFEST.MF
@@ -0,0 +1,20 @@
+Manifest-Version: 1.0
+Require-Bundle: org.argeo.slc.specs,
+ org.argeo.slc.core,
+ org.argeo.slc.support.activemq,
+ com.springsource.org.castor
+Bundle-Version: 0.11.4.SNAPSHOT
+Bundle-Name: SLC Agent JMS
+Bundle-SymbolicName: org.argeo.slc.agent.jms
+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,
+ org.springframework.jms.listener.adapter,
+ org.springframework.oxm.castor
+
diff --git a/modules/agent/org.argeo.slc.agent.jms/META-INF/spring/common.xml b/modules/agent/org.argeo.slc.agent.jms/META-INF/spring/common.xml
new file mode 100644
index 000000000..5dfab09ad
--- /dev/null
+++ b/modules/agent/org.argeo.slc.agent.jms/META-INF/spring/common.xml
@@ -0,0 +1,19 @@
+<?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/modules/agent/org.argeo.slc.agent.jms/META-INF/spring/jms.xml b/modules/agent/org.argeo.slc.agent.jms/META-INF/spring/jms.xml
new file mode 100644
index 000000000..3349c3012
--- /dev/null
+++ b/modules/agent/org.argeo.slc.agent.jms/META-INF/spring/jms.xml
@@ -0,0 +1,72 @@
+<?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/modules/agent/org.argeo.slc.agent.jms/META-INF/spring/osgi.xml b/modules/agent/org.argeo.slc.agent.jms/META-INF/spring/osgi.xml
new file mode 100644
index 000000000..395db0502
--- /dev/null
+++ b/modules/agent/org.argeo.slc.agent.jms/META-INF/spring/osgi.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans:beans xmlns="http://www.springframework.org/schema/osgi"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"
+	xsi:schemaLocation="http://www.springframework.org/schema/osgi  
+       http://www.springframework.org/schema/osgi/spring-osgi-1.1.xsd
+       http://www.springframework.org/schema/beans   
+       http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
+
+	<bundle id="agent" action="start" symbolic-name="org.argeo.slc.agent" />
+
+	<!-- Deprecated -->
+	<service ref="resultListener"
+		interface="org.argeo.slc.core.test.tree.TreeTestResultListener" />
+	<service ref="resultListener" interface="org.argeo.slc.test.TestResultListener" />
+
+	<service ref="slcExecutionListener" interface="org.argeo.slc.process.SlcExecutionNotifier" />
+
+	<service ref="jmsAgent.attachmentUploader" interface="org.argeo.slc.core.attachment.AttachmentUploader" />
+
+	<reference id="modulesManager"
+		interface="org.argeo.slc.execution.ExecutionModulesManager" />
+</beans:beans>
\ No newline at end of file
diff --git a/modules/agent/org.argeo.slc.agent.jms/META-INF/spring/transport.xml b/modules/agent/org.argeo.slc.agent.jms/META-INF/spring/transport.xml
new file mode 100644
index 000000000..8e2c63248
--- /dev/null
+++ b/modules/agent/org.argeo.slc.agent.jms/META-INF/spring/transport.xml
@@ -0,0 +1,42 @@
+<?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/modules/agent/org.argeo.slc.agent.jms/agent.properties b/modules/agent/org.argeo.slc.agent.jms/agent.properties
new file mode 100644
index 000000000..d1afbfa54
--- /dev/null
+++ b/modules/agent/org.argeo.slc.agent.jms/agent.properties
@@ -0,0 +1 @@
+slc.server.jms.url=tcp://localhost:61616
\ No newline at end of file
diff --git a/modules/agent/org.argeo.slc.agent/META-INF/MANIFEST.MF b/modules/agent/org.argeo.slc.agent/META-INF/MANIFEST.MF
new file mode 100644
index 000000000..66421407c
--- /dev/null
+++ b/modules/agent/org.argeo.slc.agent/META-INF/MANIFEST.MF
@@ -0,0 +1,7 @@
+Manifest-Version: 1.0
+Require-Bundle: org.argeo.slc.specs,
+ org.argeo.slc.core,
+ org.argeo.slc.support.osgi
+Bundle-Version: 0.11.4.SNAPSHOT
+Bundle-Name: Argeo SLC Agent
+Bundle-SymbolicName: org.argeo.slc.agent
diff --git a/modules/agent/org.argeo.slc.agent/META-INF/spring/common.xml b/modules/agent/org.argeo.slc.agent/META-INF/spring/common.xml
new file mode 100644
index 000000000..dfb3f259a
--- /dev/null
+++ b/modules/agent/org.argeo.slc.agent/META-INF/spring/common.xml
@@ -0,0 +1,9 @@
+<?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="treeTestResultLogger" class="org.argeo.slc.core.test.tree.TreeTestResultLogger" />
+
+</beans>
\ No newline at end of file
diff --git a/modules/agent/org.argeo.slc.agent/META-INF/spring/manager.xml b/modules/agent/org.argeo.slc.agent/META-INF/spring/manager.xml
new file mode 100644
index 000000000..7e35ff63a
--- /dev/null
+++ b/modules/agent/org.argeo.slc.agent/META-INF/spring/manager.xml
@@ -0,0 +1,14 @@
+<?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:p="http://www.springframework.org/schema/p"
+	xsi:schemaLocation="
+	http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
+
+	<bean id="modulesManager" class="org.argeo.slc.osgi.OsgiExecutionModulesManager">
+		<property name="slcExecutionNotifiers" ref="slcExecutionListeners" />
+		<property name="bundlesManager" ref="bundlesManager" />
+	</bean>
+
+	<bean id="bundlesManager" class="org.argeo.slc.osgi.BundlesManager" />
+
+</beans>
\ No newline at end of file
diff --git a/modules/agent/org.argeo.slc.agent/META-INF/spring/osgi.xml b/modules/agent/org.argeo.slc.agent/META-INF/spring/osgi.xml
new file mode 100644
index 000000000..9193ad2fd
--- /dev/null
+++ b/modules/agent/org.argeo.slc.agent/META-INF/spring/osgi.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans:beans xmlns="http://www.springframework.org/schema/osgi"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"
+	xsi:schemaLocation="http://www.springframework.org/schema/osgi  
+       http://www.springframework.org/schema/osgi/spring-osgi-1.1.xsd
+       http://www.springframework.org/schema/beans   
+       http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
+
+	<!-- Deprecated -->
+	<service ref="treeTestResultLogger" interface="org.argeo.slc.test.TestResultListener" />
+	<service ref="treeTestResultLogger"
+		interface="org.argeo.slc.core.test.tree.TreeTestResultListener" />
+
+	<service ref="modulesManager" interface="org.argeo.slc.execution.ExecutionModulesManager" />
+
+	<list id="slcExecutionListeners" interface="org.argeo.slc.process.SlcExecutionNotifier"
+		cardinality="0..N" />
+
+</beans:beans>
\ No newline at end of file
diff --git a/modules/agent/pom.xml b/modules/agent/pom.xml
new file mode 100644
index 000000000..6c16c62d6
--- /dev/null
+++ b/modules/agent/pom.xml
@@ -0,0 +1,25 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.argeo.slc</groupId>
+		<artifactId>modules</artifactId>
+		<version>0.11.4-SNAPSHOT</version>
+		<relativePath>..</relativePath>
+	</parent>
+	<groupId>org.argeo.slc.modules</groupId>
+	<artifactId>agent</artifactId>
+	<packaging>bundles</packaging>
+	<name>SLC Modules Agent</name>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.argeo.maven.plugins</groupId>
+				<artifactId>maven-argeo-osgi-plugin</artifactId>
+				<extensions>true</extensions>
+				<configuration>
+					<strictManifestVersion>true</strictManifestVersion>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+</project>
\ No newline at end of file
diff --git a/modules/pom.xml b/modules/pom.xml
new file mode 100644
index 000000000..06f51df34
--- /dev/null
+++ b/modules/pom.xml
@@ -0,0 +1,16 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.argeo.slc</groupId>
+		<artifactId>argeo-slc</artifactId>
+		<version>0.11.4-SNAPSHOT</version>
+		<relativePath>..</relativePath>
+	</parent>
+	<artifactId>modules</artifactId>
+	<name>SLC Modules</name>
+	<packaging>pom</packaging>
+	<modules>
+		<module>agent</module>
+	</modules>
+</project>
-- 
2.39.2