From: Mathieu Baudier Date: Thu, 28 Apr 2011 15:42:29 +0000 (+0000) Subject: Deactivate bundles used for RCP prototype X-Git-Tag: argeo-slc-2.1.7~960 X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=b26f6f65dd1da46a675c618c39194ae534e040bb;p=gpl%2Fargeo-slc.git Deactivate bundles used for RCP prototype ASSIGNED - 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@4488 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- diff --git a/eclipse/plugins/org.argeo.slc.client.rcp/META-INF/spring/osgi.xml b/eclipse/plugins/org.argeo.slc.client.rcp/META-INF/spring/osgi.xml index a945cdcbe..dd631ecfc 100644 --- a/eclipse/plugins/org.argeo.slc.client.rcp/META-INF/spring/osgi.xml +++ b/eclipse/plugins/org.argeo.slc.client.rcp/META-INF/spring/osgi.xml @@ -20,24 +20,22 @@ - - - - + + + + + + + + - + + + - - - - - + + + + + - - + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/eclipse/plugins/org.argeo.slc.client.ui/META-INF/spring/controllers.xml b/eclipse/plugins/org.argeo.slc.client.ui/META-INF/spring/controllers.xml index 62154375e..866c7f473 100644 --- a/eclipse/plugins/org.argeo.slc.client.ui/META-INF/spring/controllers.xml +++ b/eclipse/plugins/org.argeo.slc.client.ui/META-INF/spring/controllers.xml @@ -5,6 +5,6 @@ http://www.springframework.org/schema/beans/spring-beans.xsd"> - + diff --git a/eclipse/plugins/org.argeo.slc.client.ui/META-INF/spring/listeners.xml b/eclipse/plugins/org.argeo.slc.client.ui/META-INF/spring/listeners.xml index 509fe8127..42ed1408a 100644 --- a/eclipse/plugins/org.argeo.slc.client.ui/META-INF/spring/listeners.xml +++ b/eclipse/plugins/org.argeo.slc.client.ui/META-INF/spring/listeners.xml @@ -4,13 +4,13 @@ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> - - - + + + + - - - + + + 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 67caaabde..311b9bd2e 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 @@ -23,15 +23,15 @@ - - + + + - - - + + + - + + + - + + - + + - - - - - + + + + + + + + + + + - + \ 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 a4c7634e4..8fb16bda3 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 @@ -5,51 +5,51 @@ http://www.springframework.org/schema/beans/spring-beans.xsd"> - - - - - + + + + + + - - - + + + + - - - - - - - - - - + + + + + + + + + + + + - - - - + + + + + - - - - - + + + + + + - - + + + - - - + + + + diff --git a/eclipse/plugins/org.argeo.slc.client.ui/plugin.xml b/eclipse/plugins/org.argeo.slc.client.ui/plugin.xml index 0b7d2f012..01b2efc3c 100644 --- a/eclipse/plugins/org.argeo.slc.client.ui/plugin.xml +++ b/eclipse/plugins/org.argeo.slc.client.ui/plugin.xml @@ -6,30 +6,38 @@ + + - - + --> - + - - + --> + + --> + + --> + + @@ -218,6 +201,7 @@ tooltip="Remove selected process from process builder view."> + --> diff --git a/modules/agent/org.argeo.slc.agent.jcr/META-INF/MANIFEST.MF b/modules/agent/org.argeo.slc.agent.jcr/META-INF/MANIFEST.MF index 19a0f4f8f..74d3b33a7 100644 --- a/modules/agent/org.argeo.slc.agent.jcr/META-INF/MANIFEST.MF +++ b/modules/agent/org.argeo.slc.agent.jcr/META-INF/MANIFEST.MF @@ -7,6 +7,7 @@ Import-Package: javax.jcr, org.argeo.security, org.argeo.security.core, org.argeo.security.jcr, + org.argeo.slc.core.attachment, org.argeo.slc.core.test.tree, org.argeo.slc.execution, org.argeo.slc.jcr, diff --git a/modules/agent/org.argeo.slc.agent.jcr/META-INF/spring/jcr-osgi.xml b/modules/agent/org.argeo.slc.agent.jcr/META-INF/spring/jcr-osgi.xml index 525c16437..bfe2ecb32 100644 --- a/modules/agent/org.argeo.slc.agent.jcr/META-INF/spring/jcr-osgi.xml +++ b/modules/agent/org.argeo.slc.agent.jcr/META-INF/spring/jcr-osgi.xml @@ -23,6 +23,7 @@ + diff --git a/modules/agent/org.argeo.slc.agent.jcr/META-INF/spring/jcr.xml b/modules/agent/org.argeo.slc.agent.jcr/META-INF/spring/jcr.xml index 6c1f43c42..307708520 100644 --- a/modules/agent/org.argeo.slc.agent.jcr/META-INF/spring/jcr.xml +++ b/modules/agent/org.argeo.slc.agent.jcr/META-INF/spring/jcr.xml @@ -21,6 +21,10 @@ + + + + diff --git a/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/execution/JcrAttachmentUploader.java b/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/execution/JcrAttachmentUploader.java new file mode 100644 index 000000000..f2e6258fd --- /dev/null +++ b/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/execution/JcrAttachmentUploader.java @@ -0,0 +1,22 @@ +package org.argeo.slc.jcr.execution; + +import javax.jcr.Session; + +import org.argeo.slc.core.attachment.Attachment; +import org.argeo.slc.core.attachment.AttachmentUploader; +import org.springframework.core.io.Resource; + +/** JCR based attachment uploader */ +public class JcrAttachmentUploader implements AttachmentUploader { + private Session session; + + public void upload(Attachment attachment, Resource resource) { + session.toString(); + // not yet implemented, need to review the interface + } + + public void setSession(Session session) { + this.session = session; + } + +} diff --git a/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/execution/JcrProcessThread.java b/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/execution/JcrProcessThread.java index de023cefa..9d838b39f 100644 --- a/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/execution/JcrProcessThread.java +++ b/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/execution/JcrProcessThread.java @@ -13,7 +13,6 @@ import org.argeo.slc.SlcException; import org.argeo.slc.core.execution.DefaultExecutionSpec; import org.argeo.slc.core.execution.PrimitiveSpecAttribute; import org.argeo.slc.core.execution.PrimitiveUtils; -import org.argeo.slc.core.execution.PrimitiveValue; import org.argeo.slc.core.execution.ProcessThread; import org.argeo.slc.execution.ExecutionFlowDescriptor; import org.argeo.slc.execution.ExecutionModulesManager; diff --git a/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/execution/JcrResultListener.java b/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/execution/JcrResultListener.java index 8cd72efc7..7f7244e13 100644 --- a/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/execution/JcrResultListener.java +++ b/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/execution/JcrResultListener.java @@ -6,7 +6,6 @@ import java.util.HashMap; import java.util.Map; import javax.jcr.Node; -import javax.jcr.Property; import javax.jcr.RepositoryException; import javax.jcr.Session; import javax.jcr.query.Query;