From a079c6989755e998714b7d9fd0598737cb768aea Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Mon, 20 Sep 2010 11:41:53 +0000 Subject: [PATCH] Cleanly provide agent and agent factory for RCP git-svn-id: https://svn.argeo.org/slc/trunk@3779 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- .../org.argeo.slc.demo.log4j/log4j.properties | 13 ------- dep/org.argeo.slc.dep.eclipse/pom.xml | 5 +++ .../org.argeo.slc.client.agent/.project | 22 +++++++++++ .../.settings/org.eclipse.pde.core.prefs | 4 ++ .../META-INF/MANIFEST.MF | 8 ++++ .../META-INF/spring/client-osgi.xml | 15 +++++++ .../META-INF/spring/client.xml | 20 ++++++++++ .../build.properties | 1 + .../org.argeo.slc.client.agent/pom.xml | 39 +++++++++++++++++++ .../slc-client-rcp.product | 2 + .../META-INF/spring/osgi.xml | 3 +- .../META-INF/spring/views.xml | 4 +- .../ExecutionModulesContentProvider.java | 16 +++++--- eclipse/plugins/pom.xml | 1 + .../META-INF/spring/agent.xml | 10 ----- .../META-INF/spring/osgi.xml | 5 --- .../slc/services/impl/AgentServiceImpl.java | 2 +- 17 files changed, 130 insertions(+), 40 deletions(-) create mode 100644 eclipse/plugins/org.argeo.slc.client.agent/.project create mode 100644 eclipse/plugins/org.argeo.slc.client.agent/.settings/org.eclipse.pde.core.prefs create mode 100644 eclipse/plugins/org.argeo.slc.client.agent/META-INF/MANIFEST.MF create mode 100644 eclipse/plugins/org.argeo.slc.client.agent/META-INF/spring/client-osgi.xml create mode 100644 eclipse/plugins/org.argeo.slc.client.agent/META-INF/spring/client.xml create mode 100644 eclipse/plugins/org.argeo.slc.client.agent/build.properties create mode 100644 eclipse/plugins/org.argeo.slc.client.agent/pom.xml diff --git a/demo/site/org.argeo.slc.demo.log4j/log4j.properties b/demo/site/org.argeo.slc.demo.log4j/log4j.properties index 14e31935e..2b466919e 100644 --- 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 685292b67..fd035bafd 100644 --- a/dep/org.argeo.slc.dep.eclipse/pom.xml +++ b/dep/org.argeo.slc.dep.eclipse/pom.xml @@ -22,5 +22,10 @@ org.argeo.slc.client.ui ${project.version} + + org.argeo.slc.eclipse + org.argeo.slc.client.agent + ${project.version} + \ 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 index 000000000..ea10bad43 --- /dev/null +++ b/eclipse/plugins/org.argeo.slc.client.agent/.project @@ -0,0 +1,22 @@ + + + org.argeo.slc.client.agent + + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + + org.eclipse.pde.PluginNature + + 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 index 000000000..957026bad --- /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 index 000000000..68a86a0f2 --- /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 index 000000000..37c9091f4 --- /dev/null +++ b/eclipse/plugins/org.argeo.slc.client.agent/META-INF/spring/client-osgi.xml @@ -0,0 +1,15 @@ + + + + + + + + + \ 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 index 000000000..ab0f40886 --- /dev/null +++ b/eclipse/plugins/org.argeo.slc.client.agent/META-INF/spring/client.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + 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 index 000000000..5f22cdd44 --- /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 index 000000000..014dd7b00 --- /dev/null +++ b/eclipse/plugins/org.argeo.slc.client.agent/pom.xml @@ -0,0 +1,39 @@ + + 4.0.0 + + org.argeo.slc.eclipse + plugins + 0.13.0-SNAPSHOT + .. + + org.argeo.slc.client.agent + SLC Client Agent + jar + + + + org.argeo.slc.eclipse + org.argeo.slc.client.ui + ${project.version} + + + + org.eclipse.ui + org.eclipse.ui + + + org.eclipse.core + org.eclipse.core.runtime + + + org.eclipse.swt + org.eclipse.swt.gtk.linux.x86_64 + + + org.eclipse.swt + org.eclipse.swt.gtk.linux.x86 + + + + 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 27acbf345..9bd3f4544 100644 --- 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 @@ + @@ -213,6 +214,7 @@ + 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 ae273ad9b..43a62e390 100644 --- 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 http://www.springframework.org/schema/beans/spring-beans-2.5.xsd"> - + \ 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 7019d7591..f6d9914d1 100644 --- 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 @@ - + - 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 3dea55524..4627d26de 100644 --- 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 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 agentNodes = new ArrayList(); + 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 slcAgents) { + this.slcAgents = slcAgents; } public class AgentNode extends TreeParent { diff --git a/eclipse/plugins/pom.xml b/eclipse/plugins/pom.xml index c033575b6..98026421a 100644 --- a/eclipse/plugins/pom.xml +++ b/eclipse/plugins/pom.xml @@ -13,6 +13,7 @@ pom org.argeo.slc.client.ui + org.argeo.slc.client.agent org.argeo.slc.client.rcp 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 b412297ab..9e50d5a67 100644 --- 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 @@ - - - - - - - - - - \ 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 94b81c2a8..f5e36ca97 100644 --- 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 @@ - - - - - \ 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 ff1b8124b..5dea5c9ea 100644 --- 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()) { -- 2.39.2