Fix Maven build issues

NEW - bug 17: Generalize agent management and registration beyond JMS
https://bugzilla.argeo.org/show_bug.cgi?id=17

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

diff --git a/eclipse/plugins/org.argeo.slc.client.ui/META-INF/MANIFEST.MF b/eclipse/plugins/org.argeo.slc.client.ui/META-INF/MANIFEST.MF
index 4b677086c4f78a39bde78e3dd326b02990075a39..e2a3d55829f9192ab9c619964dd9867f0daf554e 100644 (file)
--- a/eclipse/plugins/org.argeo.slc.client.ui/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.argeo.slc.client.ui/META-INF/MANIFEST.MF
@@ -7,8 +7,7 @@ Bundle-Activator: org.argeo.slc.client.ui.ClientUiPlugin
 Require-Bundle: org.eclipse.ui;resolution:=optional,
  org.eclipse.core.runtime;resolution:=optional,
  org.eclipse.rap.ui;resolution:=optional,
- org.eclipse.rap.ui.workbench;resolution:=optional,
- org.eclipse.ui.forms
+ org.eclipse.rap.ui.workbench;resolution:=optional
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Export-Package: org.argeo.slc.client.ui,
@@ -48,6 +47,9 @@ Import-Package: javax.jcr;version="2.0.0",
  org.argeo.slc.services.impl,
  org.argeo.slc.test,
  org.eclipse.core.expressions,
+ org.eclipse.ui.forms,
+ org.eclipse.ui.forms.editor,
+ org.eclipse.ui.forms.widgets,
  org.eclipse.ui.plugin,
  org.springframework.beans.factory,
  org.springframework.context,

diff --git a/eclipse/plugins/org.argeo.slc.client.ui/pom.xml b/eclipse/plugins/org.argeo.slc.client.ui/pom.xml
index 7d70d7b1421a4285733676d66bc2675dea4c8119..1003ec754391864b5880d76ef57b619f29626220 100644 (file)
--- a/eclipse/plugins/org.argeo.slc.client.ui/pom.xml
+++ b/eclipse/plugins/org.argeo.slc.client.ui/pom.xml
@@ -31,6 +31,11 @@
                        <artifactId>org.argeo.slc.core</artifactId>
                        <version>${version.slc}</version>
                </dependency>
+               <dependency>
+                       <groupId>org.argeo.slc.runtime</groupId>
+                       <artifactId>org.argeo.slc.support.jcr</artifactId>
+                       <version>${version.slc}</version>
+               </dependency>
 
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
@@ -38,12 +43,17 @@
                        <version>${version.slc}</version>
                </dependency>
 
-               <!-- Spring -->
+               <!-- Argeo Eclipse -->
                <dependency>
                        <groupId>org.argeo.commons.eclipse</groupId>
                        <artifactId>org.argeo.eclipse.ui</artifactId>
                        <version>${version.argeo-commons}</version>
                </dependency>
+               <dependency>
+                       <groupId>org.argeo.commons.eclipse</groupId>
+                       <artifactId>org.argeo.eclipse.ui.jcr</artifactId>
+                       <version>${version.argeo-commons}</version>
+               </dependency>
 
                <!-- Eclipse and RCP only dependency, needed at compile time -->
                <dependency>

diff --git a/runtime/org.argeo.slc.launcher/src/main/java/org/argeo/slc/server/client/impl/SlcServerHttpClientImpl.java b/runtime/org.argeo.slc.launcher/src/main/java/org/argeo/slc/server/client/impl/SlcServerHttpClientImpl.java
index 84e0e0767b150a7299b7a37a211f88c8a7fd1c00..ec38c3b72d878075e58001fd27f67ebfa62781f7 100644 (file)
--- a/runtime/org.argeo.slc.launcher/src/main/java/org/argeo/slc/server/client/impl/SlcServerHttpClientImpl.java
+++ b/runtime/org.argeo.slc.launcher/src/main/java/org/argeo/slc/server/client/impl/SlcServerHttpClientImpl.java
@@ -49,7 +49,7 @@ public class SlcServerHttpClientImpl extends AbstractHttpServicesClient
 
        public void waitForSlcExecutionFinished(SlcExecution slcExecution,
                        Long timeout) {
-               if (slcExecution.getStatus().equals(SlcExecution.STATUS_FINISHED))
+               if (slcExecution.getStatus().equals(SlcExecution.COMPLETED))
                        return;
 
                long begin = System.currentTimeMillis();
@@ -60,7 +60,7 @@ public class SlcServerHttpClientImpl extends AbstractHttpServicesClient
                        String status = event.getHeaders().get(
                                        MsgConstants.PROPERTY_SLC_EXECUTION_STATUS);
                        if (slcExecutionId.equals(slcExecution.getUuid())
-                                       && status.equals(SlcExecution.STATUS_FINISHED)) {
+                                       && status.equals(SlcExecution.COMPLETED)) {
                                return;
                        }
                }

diff --git a/runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/msg.xml b/runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/msg.xml
index 4cb74398a122510d6603203bc13a0a2f6aa196fa..542d26e41e10a20471cf4dfcb73f6058ac1fa9e4 100644 (file)
--- a/runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/msg.xml
+++ b/runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/msg.xml
@@ -43,12 +43,6 @@
                extends="org.argeo.slc.BasicNameVersion">
                <map-to ns-uri="http://argeo.org/projects/slc/schemas"
                        ns-prefix="slc" />
-               <field name="name">
-                       <bind-xml name="name" node="attribute" />
-               </field>
-               <field name="version">
-                       <bind-xml name="version" node="attribute" />
-               </field>
                <field name="modulesDescriptors" collection="map">
                        <bind-xml name="modulesDescriptor" location="modulesDescriptors">
                                <class name="org.exolab.castor.mapping.MapItem">

diff --git a/runtime/org.argeo.slc.support.ws.client/src/main/java/org/argeo/slc/ws/process/WebServiceSlcExecutionNotifier.java b/runtime/org.argeo.slc.support.ws.client/src/main/java/org/argeo/slc/ws/process/WebServiceSlcExecutionNotifier.java
index cae997b689a3653749d841c536ce3f508f94889e..f6b9dee14d425c4cf488900a550c0b42cc94d7ff 100644 (file)
--- a/runtime/org.argeo.slc.support.ws.client/src/main/java/org/argeo/slc/ws/process/WebServiceSlcExecutionNotifier.java
+++ b/runtime/org.argeo.slc.support.ws.client/src/main/java/org/argeo/slc/ws/process/WebServiceSlcExecutionNotifier.java
@@ -23,6 +23,7 @@ import org.apache.commons.logging.LogFactory;
 import org.argeo.slc.msg.process.SlcExecutionRequest;\r
 import org.argeo.slc.msg.process.SlcExecutionStatusRequest;\r
 import org.argeo.slc.msg.process.SlcExecutionStepsRequest;\r
+import org.argeo.slc.execution.ExecutionProcess;\r
 import org.argeo.slc.process.SlcExecution;\r
 import org.argeo.slc.process.SlcExecutionNotifier;\r
 import org.argeo.slc.process.SlcExecutionStep;\r
@@ -38,7 +39,8 @@ public class WebServiceSlcExecutionNotifier implements SlcExecutionNotifier {
 \r
        private Boolean cannotConnect = false;\r
 \r
-       public void newExecution(SlcExecution slcExecution) {\r
+       public void newExecution(ExecutionProcess process) {\r
+               SlcExecution slcExecution= (SlcExecution)process;\r
                if (cannotConnect)\r
                        return;\r
 \r
@@ -74,8 +76,9 @@ public class WebServiceSlcExecutionNotifier implements SlcExecutionNotifier {
                }\r
        }\r
 \r
-       public void updateStatus(SlcExecution slcExecution, String oldStatus,\r
+       public void updateStatus(ExecutionProcess process, String oldStatus,\r
                        String newStatus) {\r
+               SlcExecution slcExecution= (SlcExecution)process;\r
                if (cannotConnect)\r
                        return;\r
 \r
@@ -93,8 +96,9 @@ public class WebServiceSlcExecutionNotifier implements SlcExecutionNotifier {
                }\r
        }\r
 \r
-       public void addSteps(SlcExecution slcExecution,\r
+       public void addSteps(ExecutionProcess process,\r
                        List<SlcExecutionStep> additionalSteps) {\r
+               SlcExecution slcExecution= (SlcExecution)process;\r
                if (cannotConnect)\r
                        return;\r
 \r