Cleanly provide agent and agent factory for RCP

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

diff --git a/demo/site/org.argeo.slc.demo.log4j/log4j.properties b/demo/site/org.argeo.slc.demo.log4j/log4j.properties
index 14e31935edd7d6ee65261c5314203f63279f8f2d..2b466919ea010a5d1203f1eb2d0d38f7936b9b56 100644 (file)
--- a/demo/site/org.argeo.slc.demo.log4j/log4j.properties
+++ b/demo/site/org.argeo.slc.demo.log4j/log4j.properties
@@ -2,23 +2,10 @@ log4j.rootLogger=WARN, console
 
 ## Levels
 log4j.logger.org.argeo=DEBUG
-log4j.logger.org.argeo.slc.service=TRACE
-log4j.logger.org.argeo.slc.execution.ExecutionParameterPostProcessor=TRACE
-log4j.logger.org.argeo.slc.execution.ExecutionContext=DEBUG
-log4j.logger.org.argeo.slc.execution.SimpleExecutionSpec=DEBUG
 log4j.logger.org.argeo.security.mvc.ArgeoRememberMeServices=WARN
-log4j.logger.org.argeo.server.mvc=TRACE
 
 log4j.logger.org.argeo.slc.client=TRACE
-log4j.logger.org.argeo.slc.services.impl=TRACE
 
-log4j.logger.org.argeo.slc.jms.JmsAgentProxy=TRACE
-#log4j.logger.org.argeo.slc.jms.JmsAgent=TRACE
-#log4j.logger.org.argeo.server.jcr.mvc.OpenSessionInViewJcrInterceptor=TRACE
-
-log4j.logger.org.argeo.slc.web.mvc=TRACE
-#log4j.logger.org.argeo.slc.jms=TRACE
-#log4j.logger.org.argeo.server.json=TRACE
 
 log4j.logger.org.hibernate=WARN
 #log4j.logger.org.hibernate.SQL=DEBUG

diff --git a/dep/org.argeo.slc.dep.eclipse/pom.xml b/dep/org.argeo.slc.dep.eclipse/pom.xml
index 685292b6715795823cb71e7c83eafe61c28f0c87..fd035bafdbe3c7f2a18e0c87ea1f24cdc1b9c20d 100644 (file)
--- a/dep/org.argeo.slc.dep.eclipse/pom.xml
+++ b/dep/org.argeo.slc.dep.eclipse/pom.xml
@@ -22,5 +22,10 @@
                        <artifactId>org.argeo.slc.client.ui</artifactId>
                        <version>${project.version}</version>
                </dependency>
+               <dependency>
+                       <groupId>org.argeo.slc.eclipse</groupId>
+                       <artifactId>org.argeo.slc.client.agent</artifactId>
+                       <version>${project.version}</version>
+               </dependency>
        </dependencies>
 </project>
\ No newline at end of file

diff --git a/eclipse/plugins/org.argeo.slc.client.agent/.project b/eclipse/plugins/org.argeo.slc.client.agent/.project
new file mode 100644 (file)
index 0000000..ea10bad
--- /dev/null
+++ b/eclipse/plugins/org.argeo.slc.client.agent/.project
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+       <name>org.argeo.slc.client.agent</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>

diff --git a/eclipse/plugins/org.argeo.slc.client.agent/.settings/org.eclipse.pde.core.prefs b/eclipse/plugins/org.argeo.slc.client.agent/.settings/org.eclipse.pde.core.prefs
new file mode 100644 (file)
index 0000000..957026b
--- /dev/null
+++ b/eclipse/plugins/org.argeo.slc.client.agent/.settings/org.eclipse.pde.core.prefs
@@ -0,0 +1,4 @@
+#Mon Sep 20 12:50:19 CEST 2010
+eclipse.preferences.version=1
+pluginProject.extensions=false
+resolve.requirebundle=false

diff --git a/eclipse/plugins/org.argeo.slc.client.agent/META-INF/MANIFEST.MF b/eclipse/plugins/org.argeo.slc.client.agent/META-INF/MANIFEST.MF
new file mode 100644 (file)
index 0000000..68a86a0
--- /dev/null
+++ b/eclipse/plugins/org.argeo.slc.client.agent/META-INF/MANIFEST.MF
@@ -0,0 +1,8 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Agent
+Bundle-SymbolicName: org.argeo.slc.client.agent
+Bundle-Version: 1.0.0.qualifier
+Import-Package: org.argeo.slc.core.runtime,
+ org.argeo.slc.execution;version="0.13.0.SNAPSHOT-r3770",
+ org.argeo.slc.runtime;version="0.13.0.SNAPSHOT-r3770"

diff --git a/eclipse/plugins/org.argeo.slc.client.agent/META-INF/spring/client-osgi.xml b/eclipse/plugins/org.argeo.slc.client.agent/META-INF/spring/client-osgi.xml
new file mode 100644 (file)
index 0000000..37c9091
--- /dev/null
+++ b/eclipse/plugins/org.argeo.slc.client.agent/META-INF/spring/client-osgi.xml
@@ -0,0 +1,15 @@
+<?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
+       <reference id="modulesManager"\r
+               interface="org.argeo.slc.execution.ExecutionModulesManager" />\r
+\r
+       <service ref="slcAgentFactory" interface="org.argeo.slc.runtime.SlcAgentFactory" />\r
+       <service ref="slcAgent" interface="org.argeo.slc.runtime.SlcAgent" />\r
+\r
+</beans:beans>
\ No newline at end of file

diff --git a/eclipse/plugins/org.argeo.slc.client.agent/META-INF/spring/client.xml b/eclipse/plugins/org.argeo.slc.client.agent/META-INF/spring/client.xml
new file mode 100644 (file)
index 0000000..ab0f408
--- /dev/null
+++ b/eclipse/plugins/org.argeo.slc.client.agent/META-INF/spring/client.xml
@@ -0,0 +1,20 @@
+<?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.xsd">
+
+
+       <!-- Temporary -->
+       <bean id="slcAgentFactory" class="org.argeo.slc.core.runtime.SimpleAgentFactory">
+               <property name="agents">
+                       <list>
+                       <ref bean="slcAgent"/>
+                       </list>
+               </property>
+       </bean>
+
+       <bean id="slcAgent" class="org.argeo.slc.core.runtime.DefaultAgent"
+               p:modulesManager-ref="modulesManager" />
+
+</beans>

diff --git a/eclipse/plugins/org.argeo.slc.client.agent/build.properties b/eclipse/plugins/org.argeo.slc.client.agent/build.properties
new file mode 100644 (file)
index 0000000..5f22cdd
--- /dev/null
+++ b/eclipse/plugins/org.argeo.slc.client.agent/build.properties
@@ -0,0 +1 @@
+bin.includes = META-INF/

diff --git a/eclipse/plugins/org.argeo.slc.client.agent/pom.xml b/eclipse/plugins/org.argeo.slc.client.agent/pom.xml
new file mode 100644 (file)
index 0000000..014dd7b
--- /dev/null
+++ b/eclipse/plugins/org.argeo.slc.client.agent/pom.xml
@@ -0,0 +1,39 @@
+<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.eclipse</groupId>
+               <artifactId>plugins</artifactId>
+               <version>0.13.0-SNAPSHOT</version>
+               <relativePath>..</relativePath>
+       </parent>
+       <artifactId>org.argeo.slc.client.agent</artifactId>
+       <name>SLC Client Agent</name>
+       <packaging>jar</packaging>
+       <dependencies>
+               <!-- SLC -->
+               <dependency>
+                       <groupId>org.argeo.slc.eclipse</groupId>
+                       <artifactId>org.argeo.slc.client.ui</artifactId>
+                       <version>${project.version}</version>
+               </dependency>
+               <!-- Eclipse -->
+               <dependency>
+                       <groupId>org.eclipse.ui</groupId>
+                       <artifactId>org.eclipse.ui</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.eclipse.core</groupId>
+                       <artifactId>org.eclipse.core.runtime</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.eclipse.swt</groupId>
+                       <artifactId>org.eclipse.swt.gtk.linux.x86_64</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.eclipse.swt</groupId>
+                       <artifactId>org.eclipse.swt.gtk.linux.x86</artifactId>
+               </dependency>
+
+       </dependencies>
+</project>

diff --git a/eclipse/plugins/org.argeo.slc.client.rcp/slc-client-rcp.product b/eclipse/plugins/org.argeo.slc.client.rcp/slc-client-rcp.product
index 27acbf345954851154df321cc17d23a921870e79..9bd3f4544417863898f4af9575510fef5bca2e52 100644 (file)
--- a/eclipse/plugins/org.argeo.slc.client.rcp/slc-client-rcp.product
+++ b/eclipse/plugins/org.argeo.slc.client.rcp/slc-client-rcp.product
@@ -147,6 +147,7 @@
       <plugin id="org.argeo.slc.agent.ext.bsf" fragment="true"/>
       <plugin id="org.argeo.slc.agent.ext.jdbc" fragment="true"/>
       <plugin id="org.argeo.slc.agent.ext.xalan" fragment="true"/>
+      <plugin id="org.argeo.slc.client.agent"/>
       <plugin id="org.argeo.slc.client.rcp"/>
       <plugin id="org.argeo.slc.client.ui"/>
       <plugin id="org.argeo.slc.core"/>
@@ -213,6 +214,7 @@
       <plugin id="org.argeo.security.manager.ldap" autoStart="true" startLevel="0" />
       <plugin id="org.argeo.security.services" autoStart="true" startLevel="0" />
       <plugin id="org.argeo.slc.agent" autoStart="true" startLevel="0" />
+      <plugin id="org.argeo.slc.client.agent" autoStart="true" startLevel="0" />
       <plugin id="org.argeo.slc.client.ui" autoStart="true" startLevel="0" />
       <plugin id="org.argeo.slc.demo.ant" autoStart="true" startLevel="0" />
       <plugin id="org.argeo.slc.demo.basic" autoStart="true" startLevel="0" />

diff --git a/eclipse/plugins/org.argeo.slc.client.ui/META-INF/spring/osgi.xml b/eclipse/plugins/org.argeo.slc.client.ui/META-INF/spring/osgi.xml
index ae273ad9bb88aa9bab6f3da0b6f7e6b9c3ab8379..43a62e390c5ceb3717ef603ba1fade6715d7aa35 100644 (file)
--- a/eclipse/plugins/org.argeo.slc.client.ui/META-INF/spring/osgi.xml
+++ b/eclipse/plugins/org.argeo.slc.client.ui/META-INF/spring/osgi.xml
@@ -6,9 +6,8 @@
        http://www.springframework.org/schema/beans   \r
        http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">\r
 \r
-       <reference id="modulesManager"\r
-               interface="org.argeo.slc.execution.ExecutionModulesManager" />\r
        <reference id="testResultCollectionDao"\r
                interface="org.argeo.slc.dao.test.tree.TreeTestResultCollectionDao" />\r
        <reference id="slcExecutionService" interface="org.argeo.slc.services.SlcExecutionService" />\r
+       <list id="slcAgents" interface="org.argeo.slc.runtime.SlcAgent" />\r
 </beans:beans>
\ No newline at end of file

diff --git a/eclipse/plugins/org.argeo.slc.client.ui/META-INF/spring/views.xml b/eclipse/plugins/org.argeo.slc.client.ui/META-INF/spring/views.xml
index 7019d7591a11a4782750c170a5ba480a0d2ff11f..f6d9914d18c7fc43672e4f5fd72681cacc605864 100644 (file)
--- a/eclipse/plugins/org.argeo.slc.client.ui/META-INF/spring/views.xml
+++ b/eclipse/plugins/org.argeo.slc.client.ui/META-INF/spring/views.xml
@@ -17,9 +17,7 @@
 
        <bean id="executionModulesContentProvider"
                class="org.argeo.slc.client.ui.views.ExecutionModulesContentProvider">
-               <property name="slcAgent" ref="slcAgent" />
+               <property name="slcAgents" ref="slcAgents" />
        </bean>
-       <bean id="slcAgent" class="org.argeo.slc.core.runtime.DefaultAgent"
-               p:modulesManager-ref="modulesManager" />
 
 </beans>

diff --git a/eclipse/plugins/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/views/ExecutionModulesContentProvider.java b/eclipse/plugins/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/views/ExecutionModulesContentProvider.java
index 3dea55524eb0b6b1c92127f6d9f59dff5359462f..4627d26def2f10a3502af74a830f768c2b67ee78 100644 (file)
--- a/eclipse/plugins/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/views/ExecutionModulesContentProvider.java
+++ b/eclipse/plugins/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/views/ExecutionModulesContentProvider.java
@@ -1,6 +1,8 @@
 package org.argeo.slc.client.ui.views;
 
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.SortedMap;
 import java.util.TreeMap;
@@ -19,7 +21,7 @@ public class ExecutionModulesContentProvider implements ITreeContentProvider {
        private final static Log log = LogFactory
                        .getLog(ExecutionModulesContentProvider.class);
 
-       private SlcAgent slcAgent;
+       private List<SlcAgent> slcAgents;
 
        public Object[] getChildren(Object parent) {
                if (parent instanceof ExecutionModuleNode) {
@@ -53,9 +55,11 @@ public class ExecutionModulesContentProvider implements ITreeContentProvider {
                } else if (parent instanceof FlowNode) {
                        return new Object[0];
                } else {
-                       log.trace(parent);
-                       Object[] arr = { new AgentNode(slcAgent) };
-                       return arr;
+                       List<AgentNode> agentNodes = new ArrayList<AgentNode>();
+                       for (SlcAgent slcAgent : slcAgents) {
+                               agentNodes.add(new AgentNode(slcAgent));
+                       }
+                       return agentNodes.toArray();
                }
        }
 
@@ -87,8 +91,8 @@ public class ExecutionModulesContentProvider implements ITreeContentProvider {
                return getChildren(parent);
        }
 
-       public void setSlcAgent(SlcAgent slcAgent) {
-               this.slcAgent = slcAgent;
+       public void setSlcAgents(List<SlcAgent> slcAgents) {
+               this.slcAgents = slcAgents;
        }
 
        public class AgentNode extends TreeParent {

diff --git a/eclipse/plugins/pom.xml b/eclipse/plugins/pom.xml
index c033575b6a5d3d20d5e97d79a8c23ba2b6f29249..98026421a059cbf1705b5b938d4140deca548419 100644 (file)
--- a/eclipse/plugins/pom.xml
+++ b/eclipse/plugins/pom.xml
@@ -13,6 +13,7 @@
        <packaging>pom</packaging>
        <modules>
                <module>org.argeo.slc.client.ui</module>
+               <module>org.argeo.slc.client.agent</module>
                <module>org.argeo.slc.client.rcp</module>
        </modules>
        <build>

diff --git a/modules/agent/org.argeo.slc.agent/META-INF/spring/agent.xml b/modules/agent/org.argeo.slc.agent/META-INF/spring/agent.xml
index b412297ab327994eb83258b263ec420c37846707..9e50d5a67b69f1d49c3d17eba07b245c4bd2b1fc 100644 (file)
--- a/modules/agent/org.argeo.slc.agent/META-INF/spring/agent.xml
+++ b/modules/agent/org.argeo.slc.agent/META-INF/spring/agent.xml
@@ -22,14 +22,4 @@
        </bean>\r
 \r
        <bean id="treeTestResultLogger" class="org.argeo.slc.core.test.tree.TreeTestResultLogger" />\r
-\r
-       <!-- Temporary -->\r
-       <bean id="slcAgentFactory" class="org.argeo.slc.core.runtime.SimpleAgentFactory">\r
-               <property name="agents">\r
-                       <list>\r
-                       </list>\r
-               </property>\r
-       </bean>\r
-\r
-\r
 </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
index 94b81c2a8651367e0be100dd1a91ff533a1f9167..f5e36ca972c0725bd766202c0e3e63383b19887f 100644 (file)
--- a/modules/agent/org.argeo.slc.agent/META-INF/spring/osgi.xml
+++ b/modules/agent/org.argeo.slc.agent/META-INF/spring/osgi.xml
@@ -20,9 +20,4 @@
        <list id="executionModulesListeners" interface="org.argeo.slc.execution.ExecutionModulesListener"\r
                cardinality="0..N" />\r
 \r
-\r
-\r
-       <!-- Temporary -->\r
-       <service ref="slcAgentFactory" interface="org.argeo.slc.runtime.SlcAgentFactory" />\r
-\r
 </beans:beans>
\ No newline at end of file

diff --git a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/services/impl/AgentServiceImpl.java b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/services/impl/AgentServiceImpl.java
index ff1b8124bba5779a8d061060efa4d60b8035eee8..5dea5c9ea895c6da230f7f7dd446840aba1373c1 100644 (file)
--- a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/services/impl/AgentServiceImpl.java
+++ b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/services/impl/AgentServiceImpl.java
@@ -106,7 +106,7 @@ public class AgentServiceImpl implements AgentService, InitializingBean,
                                        agentIds.add(ad.getUuid());
 
                                if (log.isTraceEnabled())
-                                       log.debug("Ping " + agentIds.size() + " agent.");
+                                       log.trace("Ping " + agentIds.size() + " agent(s).");
                                for (String agentId : agentIds) {
                                        SlcAgent agent = agentFactory.getAgent(agentId);
                                        if (!agent.ping()) {