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 a945cdcbe7d8421928d5e3555bd02482723b5819..dd631ecfc2c577bad9c9825f9b77089e392c1572 100644 (file)
--- 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 @@
        <!-- SLC Runtime -->
        <bundle id="slc.agent" symbolic-name="org.argeo.slc.agent"
                action="start" />
-       <bundle id="slc.server.castor" symbolic-name="org.argeo.slc.server.castor"
-               action="start" />
-       <bundle id="slc.server.h2" symbolic-name="org.argeo.slc.server.h2"
-               action="start" />
-       <bundle id="slc.server.hibernate" symbolic-name="org.argeo.slc.server.hibernate"
-               action="start" />
-       <bundle id="slc.server.services" symbolic-name="org.argeo.slc.server.services"
-               action="start" />
+<!--   <bundle id="slc.server.castor" symbolic-name="org.argeo.slc.server.castor" -->
+<!--           action="start" /> -->
+<!--   <bundle id="slc.server.h2" symbolic-name="org.argeo.slc.server.h2" -->
+<!--           action="start" /> -->
+<!--   <bundle id="slc.server.hibernate" symbolic-name="org.argeo.slc.server.hibernate" -->
+<!--           action="start" /> -->
+<!--   <bundle id="slc.server.services" symbolic-name="org.argeo.slc.server.services" -->
+<!--           action="start" /> -->
 
        <!-- UI Components -->
        <bundle id="slc.node.jackrabbit" symbolic-name="org.argeo.slc.node.jackrabbit"
                action="start" />
-<!--   <bundle id="slc.client.agent" symbolic-name="org.argeo.slc.client.agent" -->
+<!--   <bundle id="slc.client.hibernate" symbolic-name="org.argeo.slc.client.hibernate" -->
+<!--           action="start" /> -->
+<!--   <bundle id="slc.client.oxm" symbolic-name="org.argeo.slc.client.oxm" -->
 <!--           action="start" /> -->
-       <bundle id="slc.client.hibernate" symbolic-name="org.argeo.slc.client.hibernate"
-               action="start" />
-       <bundle id="slc.client.oxm" symbolic-name="org.argeo.slc.client.oxm"
-               action="start" />
        <bundle id="slc.client.rcp" symbolic-name="org.argeo.slc.client.rcp"
                action="start" />
        <bundle id="slc.client.ui" symbolic-name="org.argeo.slc.client.ui"

diff --git a/eclipse/plugins/org.argeo.slc.client.ui/META-INF/spring/commands.xml b/eclipse/plugins/org.argeo.slc.client.ui/META-INF/spring/commands.xml
index 76fee46810b197b4e5564f43820d606cf4bade16..45f09032638ea16ea61d4c84b3fd18443d5ebedb 100644 (file)
--- a/eclipse/plugins/org.argeo.slc.client.ui/META-INF/spring/commands.xml
+++ b/eclipse/plugins/org.argeo.slc.client.ui/META-INF/spring/commands.xml
@@ -4,47 +4,45 @@
        xsi:schemaLocation="http://www.springframework.org/schema/beans
         http://www.springframework.org/schema/beans/spring-beans.xsd">
 
-       <!-- Result list view commands -->
-       <bean id="org.argeo.slc.client.ui.refreshResultList"
-               class="org.argeo.slc.client.ui.commands.ResultListViewRefreshHandler"
-               scope="prototype">
-       </bean>
+       <!-- Result list view commands-->
+<!--   <bean id="org.argeo.slc.client.ui.refreshResultList" -->
+<!--           class="org.argeo.slc.client.ui.commands.ResultListViewRefreshHandler" -->
+<!--           scope="prototype"> -->
+<!--   </bean> -->
 
-       <bean id="org.argeo.slc.client.ui.removeSelectedResultFromResultList"
-               class="org.argeo.slc.client.ui.commands.RemoveSelectedResultFromResultList"
-               scope="prototype">
-       </bean>
+<!--   <bean id="org.argeo.slc.client.ui.removeSelectedResultFromResultList" -->
+<!--           class="org.argeo.slc.client.ui.commands.RemoveSelectedResultFromResultList" -->
+<!--           scope="prototype"> -->
+<!--   </bean> -->
 
 
-       <bean id="org.argeo.slc.client.ui.refreshExecutionModulesView"
-               class="org.argeo.slc.client.ui.commands.ExecutionModulesViewRefreshHandler"
-               scope="prototype">
-       </bean>
-       <bean id="org.argeo.slc.client.ui.refreshProcessList"
-               class="org.argeo.slc.client.ui.commands.ProcessListViewRefreshHandler"
-               scope="prototype">
-       </bean>
-       <bean id="org.argeo.slc.client.ui.displayProcessDetails"
-               class="org.argeo.slc.client.ui.commands.ProcessDetailsDisplayHandler"
-               scope="prototype">
-       </bean>
-       <bean id="org.argeo.slc.client.ui.displayResultDetails"
-               class="org.argeo.slc.client.ui.commands.ResultDetailsDisplayHandler"
-               scope="prototype">
-       </bean>
-       <!-- <bean id="org.argeo.slc.client.ui.displayResultDetailsWithExcel" class="org.argeo.slc.client.ui.commands.ResultDetailsExcelHandler" 
-               scope="prototype"> </bean> -->
-       <bean id="org.argeo.slc.client.ui.launchBatch" class="org.argeo.slc.client.ui.commands.LaunchBatchHandler"
-               scope="prototype">
-       </bean>
-       <bean id="org.argeo.slc.client.ui.removeSelectedFromBatch"
-               class="org.argeo.slc.client.ui.commands.RemoveSelectedProcessFromBatchHandler"
-               scope="prototype">
-       </bean>
-       <bean id="org.argeo.slc.client.ui.clearBatch" class="org.argeo.slc.client.ui.commands.ClearBatchHandler"
-               scope="prototype">
-       </bean>
-       <bean id="org.argeo.slc.client.ui.manageBundles" class="org.argeo.slc.client.ui.commands.ManageBundlesHandler"
-               scope="prototype">
-       </bean>
+<!--   <bean id="org.argeo.slc.client.ui.refreshExecutionModulesView" -->
+<!--           class="org.argeo.slc.client.ui.commands.ExecutionModulesViewRefreshHandler" -->
+<!--           scope="prototype"> -->
+<!--   </bean> -->
+<!--   <bean id="org.argeo.slc.client.ui.refreshProcessList" -->
+<!--           class="org.argeo.slc.client.ui.commands.ProcessListViewRefreshHandler" -->
+<!--           scope="prototype"> -->
+<!--   </bean> -->
+<!--   <bean id="org.argeo.slc.client.ui.displayProcessDetails" -->
+<!--           class="org.argeo.slc.client.ui.commands.ProcessDetailsDisplayHandler" -->
+<!--           scope="prototype"> -->
+<!--   </bean> -->
+<!--   <bean id="org.argeo.slc.client.ui.displayResultDetails" -->
+<!--           class="org.argeo.slc.client.ui.commands.ResultDetailsDisplayHandler" -->
+<!--           scope="prototype"> -->
+<!--   </bean> -->
+<!--   <bean id="org.argeo.slc.client.ui.launchBatch" class="org.argeo.slc.client.ui.commands.LaunchBatchHandler" -->
+<!--           scope="prototype"> -->
+<!--   </bean> -->
+<!--   <bean id="org.argeo.slc.client.ui.removeSelectedFromBatch" -->
+<!--           class="org.argeo.slc.client.ui.commands.RemoveSelectedProcessFromBatchHandler" -->
+<!--           scope="prototype"> -->
+<!--   </bean> -->
+<!--   <bean id="org.argeo.slc.client.ui.clearBatch" class="org.argeo.slc.client.ui.commands.ClearBatchHandler" -->
+<!--           scope="prototype"> -->
+<!--   </bean> -->
+<!--   <bean id="org.argeo.slc.client.ui.manageBundles" class="org.argeo.slc.client.ui.commands.ManageBundlesHandler" -->
+<!--           scope="prototype"> -->
+<!--   </bean>  -->
 </beans>

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 62154375eca6863ad24d8fba67a88994d1a27cc9..866c7f4736703a613c0fc617420dab327f31ef56 100644 (file)
--- 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">
 
        <bean id="processController" class="org.argeo.slc.client.ui.controllers.ProcessController">
-               <property name="slcExecutionService" ref="slcExecutionService" />
+<!--           <property name="slcExecutionService" ref="slcExecutionService" /> -->
        </bean>
 </beans>

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 509fe81278d60779ef0701c1382debd49ebf9e64..42ed1408a5087f8a5f999981322280534aeb1074 100644 (file)
--- 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">
 
-       <bean id="testManagerServiceAdapter"
-               class="org.argeo.slc.client.ui.listeners.TestManagerServiceAdapter">
-               <property name="testManagerService" ref="testManagerService" />
-       </bean>
+<!--   <bean id="testManagerServiceAdapter" -->
+<!--           class="org.argeo.slc.client.ui.listeners.TestManagerServiceAdapter"> -->
+<!--           <property name="testManagerService" ref="testManagerService" /> -->
+<!--   </bean> -->
 
-       <bean id="slcExecutionServiceAdapter" class="org.argeo.slc.services.impl.SlcExecutionServiceAdapter">
-               <property name="slcExecutionService" ref="slcExecutionService" />
-       </bean>
+<!--   <bean id="slcExecutionServiceAdapter" class="org.argeo.slc.services.impl.SlcExecutionServiceAdapter"> -->
+<!--           <property name="slcExecutionService" ref="slcExecutionService" /> -->
+<!--   </bean> -->
 
 </beans>

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 67caaabde35f36ecdedb060925603a188962fb8d..311b9bd2ee02ec385bda7c869ae657a16d758aaf 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
@@ -23,15 +23,15 @@
        <!-- Services exposed by the current bundle -->\r
 \r
        <!-- Listeners used by the execution modules -->\r
-       <service ref="testManagerServiceAdapter"\r
-               interface="org.argeo.slc.core.test.tree.TreeTestResultListener" />\r
-       <service ref="slcExecutionServiceAdapter" interface="org.argeo.slc.process.SlcExecutionNotifier" />\r
+<!--   <service ref="testManagerServiceAdapter" -->\r
+<!--           interface="org.argeo.slc.core.test.tree.TreeTestResultListener" /> -->\r
+<!--   <service ref="slcExecutionServiceAdapter" interface="org.argeo.slc.process.SlcExecutionNotifier" /> -->\r
 \r
 \r
 \r
-       <reference id="slcExecutionService" interface="org.argeo.slc.services.SlcExecutionService" />\r
-       <reference id="testManagerService" interface="org.argeo.slc.services.TestManagerService" />\r
-       <reference id="oxmBean" interface="org.argeo.slc.client.oxm.OxmInterface" />\r
+<!--   <reference id="slcExecutionService" interface="org.argeo.slc.services.SlcExecutionService" /> -->\r
+<!--   <reference id="testManagerService" interface="org.argeo.slc.services.TestManagerService" /> -->\r
+<!--   <reference id="oxmBean" interface="org.argeo.slc.client.oxm.OxmInterface" /> -->\r
 \r
        <!-- References Needed -->\r
        <!-- <reference id="marshaller" interface="org.springframework.oxm.Marshaller" \r
@@ -39,33 +39,33 @@
                /> -->\r
 \r
        <!-- DAO -->\r
-       <reference id="testResultCollectionDao"\r
-               interface="org.argeo.slc.dao.test.tree.TreeTestResultCollectionDao"\r
-               context-class-loader="service-provider" />\r
+<!--   <reference id="testResultCollectionDao" -->\r
+<!--           interface="org.argeo.slc.dao.test.tree.TreeTestResultCollectionDao" -->\r
+<!--           context-class-loader="service-provider" /> -->\r
 \r
-       <reference id="treeTestResultDao" interface="org.argeo.slc.dao.test.tree.TreeTestResultDao"\r
-               context-class-loader="service-provider" />\r
+<!--   <reference id="treeTestResultDao" interface="org.argeo.slc.dao.test.tree.TreeTestResultDao" -->\r
+<!--           context-class-loader="service-provider" /> -->\r
 \r
 \r
-       <reference id="slcExecutionDao" interface="org.argeo.slc.dao.process.SlcExecutionDao"\r
-               context-class-loader="service-provider" />\r
+<!--   <reference id="slcExecutionDao" interface="org.argeo.slc.dao.process.SlcExecutionDao" -->\r
+<!--           context-class-loader="service-provider" /> -->\r
 \r
        <!-- Content providers are deported in an other bundle for UI not to depend \r
                on DB used implementation. We use bean-name reference because interface is \r
                not enough to choose between various been with same interface -->\r
-       <reference id="processListTableLabelProvider" interface="org.eclipse.jface.viewers.ITableLabelProvider"\r
-               bean-name="processListTableLabelProvider" />\r
-       <reference id="processListStructuredContentProvider"\r
-               interface="org.eclipse.jface.viewers.IStructuredContentProvider"\r
-               bean-name="processListStructuredContentProvider" />\r
-       <reference id="processDetailContentProvider"\r
-               interface="org.eclipse.jface.viewers.ITreeContentProvider" bean-name="processDetailContentProvider" />\r
-       <reference id="resultDetailContentProvider"\r
-               interface="org.eclipse.jface.viewers.ITreeContentProvider" bean-name="resultDetailContentProvider" />\r
-       <reference id="resultDetailLabelProvider" interface="org.eclipse.jface.viewers.ITableLabelProvider"\r
-               bean-name="resultDetailLabelProvider" />\r
+<!--   <reference id="processListTableLabelProvider" interface="org.eclipse.jface.viewers.ITableLabelProvider" -->\r
+<!--           bean-name="processListTableLabelProvider" /> -->\r
+<!--   <reference id="processListStructuredContentProvider" -->\r
+<!--           interface="org.eclipse.jface.viewers.IStructuredContentProvider" -->\r
+<!--           bean-name="processListStructuredContentProvider" /> -->\r
+<!--   <reference id="processDetailContentProvider" -->\r
+<!--           interface="org.eclipse.jface.viewers.ITreeContentProvider" bean-name="processDetailContentProvider" /> -->\r
+<!--   <reference id="resultDetailContentProvider" -->\r
+<!--           interface="org.eclipse.jface.viewers.ITreeContentProvider" bean-name="resultDetailContentProvider" /> -->\r
+<!--   <reference id="resultDetailLabelProvider" interface="org.eclipse.jface.viewers.ITableLabelProvider" -->\r
+<!--           bean-name="resultDetailLabelProvider" /> -->\r
 \r
 \r
        <!-- TODO : what is it for ? -->\r
-       <list id="slcAgents" interface="org.argeo.slc.runtime.SlcAgent" />\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 a4c7634e442ec52a1a8ffef7393fdf14218b9150..8fb16bda3135fbb3a55c093f1badde34126afeaa 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
@@ -5,51 +5,51 @@
         http://www.springframework.org/schema/beans/spring-beans.xsd">
 
        <!-- Views -->
-       <bean id="executionModulesView" class="org.argeo.slc.client.ui.views.ExecutionModulesView"
-               scope="prototype">
-               <property name="contentProvider" ref="executionModulesContentProvider" />
-               <property name="processController" ref="processController" />
-               <property name="oxmBean" ref="oxmBean" />
-       </bean>
+<!--   <bean id="executionModulesView" class="org.argeo.slc.client.ui.views.ExecutionModulesView" -->
+<!--           scope="prototype"> -->
+<!--           <property name="contentProvider" ref="executionModulesContentProvider" /> -->
+<!--           <property name="processController" ref="processController" /> -->
+<!--           <property name="oxmBean" ref="oxmBean" /> -->
+<!--   </bean> -->
 
-       <bean id="resultListView" class="org.argeo.slc.client.ui.views.ResultListView"
-               scope="prototype">
-               <property name="testResultCollectionDao" ref="testResultCollectionDao" />
-       </bean>
+<!--   <bean id="resultListView" class="org.argeo.slc.client.ui.views.ResultListView" -->
+<!--           scope="prototype"> -->
+<!--           <property name="testResultCollectionDao" ref="testResultCollectionDao" /> -->
+<!--   </bean> -->
 
-       <bean id="resultDetailView" class="org.argeo.slc.client.ui.views.ResultDetailView"
-               scope="prototype">
-               <property name="treeTestResultDao" ref="treeTestResultDao" />
-               <property name="contentProvider" ref="resultDetailContentProvider" />
-               <property name="labelProvider" ref="resultDetailLabelProvider" />
-       </bean>
-       <bean id="processListView" class="org.argeo.slc.client.ui.views.ProcessListView"
-               scope="prototype">
-               <property name="slcExecutionDao" ref="slcExecutionDao" />
-               <property name="structuredContentProvider" ref="processListStructuredContentProvider" />
-               <property name="tableLabelProvider" ref="processListTableLabelProvider" />
-       </bean>
+<!--   <bean id="resultDetailView" class="org.argeo.slc.client.ui.views.ResultDetailView" -->
+<!--           scope="prototype"> -->
+<!--           <property name="treeTestResultDao" ref="treeTestResultDao" /> -->
+<!--           <property name="contentProvider" ref="resultDetailContentProvider" /> -->
+<!--           <property name="labelProvider" ref="resultDetailLabelProvider" /> -->
+<!--   </bean> -->
+<!--   <bean id="processListView" class="org.argeo.slc.client.ui.views.ProcessListView" -->
+<!--           scope="prototype"> -->
+<!--           <property name="slcExecutionDao" ref="slcExecutionDao" /> -->
+<!--           <property name="structuredContentProvider" ref="processListStructuredContentProvider" /> -->
+<!--           <property name="tableLabelProvider" ref="processListTableLabelProvider" /> -->
+<!--   </bean> -->
 
-       <bean id="processDetailView" class="org.argeo.slc.client.ui.views.ProcessDetailView"
-               scope="prototype">
-               <property name="slcExecutionDao" ref="slcExecutionDao" />
-               <property name="contentProvider" ref="processDetailContentProvider" />
-       </bean>
+<!--   <bean id="processDetailView" class="org.argeo.slc.client.ui.views.ProcessDetailView" -->
+<!--           scope="prototype"> -->
+<!--           <property name="slcExecutionDao" ref="slcExecutionDao" /> -->
+<!--           <property name="contentProvider" ref="processDetailContentProvider" /> -->
+<!--   </bean> -->
 
-       <bean id="processBuilderView" class="org.argeo.slc.client.ui.views.ProcessBuilderView"
-               scope="prototype">
-               <property name="processController" ref="processController" />
-               <property name="oxmBean" ref="oxmBean" />
-               <property name="slcAgents" ref="slcAgents" />
-       </bean>
+<!--   <bean id="processBuilderView" class="org.argeo.slc.client.ui.views.ProcessBuilderView" -->
+<!--           scope="prototype"> -->
+<!--           <property name="processController" ref="processController" /> -->
+<!--           <property name="oxmBean" ref="oxmBean" /> -->
+<!--           <property name="slcAgents" ref="slcAgents" /> -->
+<!--   </bean> -->
 
-       <bean id="processParametersView" class="org.argeo.slc.client.ui.views.ProcessParametersView"
-               scope="prototype">
-       </bean>
+<!--   <bean id="processParametersView" class="org.argeo.slc.client.ui.views.ProcessParametersView" -->
+<!--           scope="prototype"> -->
+<!--   </bean> -->
 
        <!-- Providers. -->
-       <bean id="executionModulesContentProvider"
-               class="org.argeo.slc.client.ui.providers.ExecutionModulesContentProvider">
-               <property name="slcAgents" ref="slcAgents" />
-       </bean>
+<!--   <bean id="executionModulesContentProvider" -->
+<!--           class="org.argeo.slc.client.ui.providers.ExecutionModulesContentProvider"> -->
+<!--           <property name="slcAgents" ref="slcAgents" /> -->
+<!--   </bean> -->
 </beans>

diff --git a/eclipse/plugins/org.argeo.slc.client.ui/plugin.xml b/eclipse/plugins/org.argeo.slc.client.ui/plugin.xml
index 0b7d2f0120b337cf9105da12301ace3912c61956..01b2efc3cc4d5c343947cc35bc0df96a8475aadc 100644 (file)
--- a/eclipse/plugins/org.argeo.slc.client.ui/plugin.xml
+++ b/eclipse/plugins/org.argeo.slc.client.ui/plugin.xml
@@ -6,30 +6,38 @@
    <extension
          point="org.eclipse.ui.views">
           <view
+                id="org.argeo.slc.client.ui.jcrExecutionModulesView"
                 class="org.argeo.eclipse.spring.SpringExtensionFactory"
                 icon="icons/execution_module.gif"
-                id="org.argeo.slc.client.ui.executionModulesView"
                 name="Execution Modules"
                 restorable="true">
           </view>
           <view
+                id="org.argeo.slc.client.ui.jcrResultListView"
                 class="org.argeo.eclipse.spring.SpringExtensionFactory"
-                icon="icons/execution_module.gif"
-                id="org.argeo.slc.client.ui.jcrExecutionModulesView"
-                name="Execution Modules"
+                icon="icons/results.gif"
+                name="Results"
                 restorable="true">
           </view>
           <view
+                id="org.argeo.slc.client.ui.jcrProcessListView"
                 class="org.argeo.eclipse.spring.SpringExtensionFactory"
-                icon="icons/results.gif"
-                id="org.argeo.slc.client.ui.resultListView"
-                name="Results"
+                name="Processes"
+                icon="icons/processes.gif"
+                restorable="true">
+          </view>
+          <!--
+          <view
+                id="org.argeo.slc.client.ui.executionModulesView"
+                class="org.argeo.eclipse.spring.SpringExtensionFactory"
+                icon="icons/execution_module.gif"
+                name="Execution Modules"
                 restorable="true">
           </view>
           <view
                 class="org.argeo.eclipse.spring.SpringExtensionFactory"
                 icon="icons/results.gif"
-                id="org.argeo.slc.client.ui.jcrResultListView"
+                id="org.argeo.slc.client.ui.resultListView"
                 name="Results"
                 restorable="true">
           </view>
@@ -41,14 +49,6 @@
                 name="Result details"
                 restorable="true">
           </view>
-        <!--  <view
-                allowMultiple="true"
-                class="org.argeo.eclipse.spring.SpringExtensionFactory"
-                icon="icons/excel.png"
-                id="org.argeo.slc.client.ui.resultExcelView"
-                name="Result details (Excel)"
-                restorable="true">
-          </view> -->
           <view
                 id="org.argeo.slc.client.ui.processListView"
                 class="org.argeo.eclipse.spring.SpringExtensionFactory"
@@ -56,13 +56,6 @@
                 icon="icons/processes.gif"
                 restorable="true">
           </view>
-          <view
-                id="org.argeo.slc.client.ui.jcrProcessListView"
-                class="org.argeo.eclipse.spring.SpringExtensionFactory"
-                name="Processes"
-                icon="icons/processes.gif"
-                restorable="true">
-          </view>
           <view
                 allowMultiple="true"
                 class="org.argeo.eclipse.spring.SpringExtensionFactory"
@@ -85,12 +78,13 @@
                 name="Batch"
                 restorable="true">
           </view>
+          -->
    </extension>
        
        <!-- Commands definitions --> 
        <extension
        point="org.eclipse.ui.commands">
-           <!-- Result List -->
+           <!-- Result List
                <command
                defaultHandler="org.argeo.eclipse.spring.SpringCommandHandler"
                id="org.argeo.slc.client.ui.refreshResultList"
@@ -105,23 +99,16 @@
                defaultHandler="org.argeo.eclipse.spring.SpringCommandHandler"
                id="org.argeo.slc.client.ui.displayResultDetails"
                name="Display Result Details">
-                       <!-- <commandParameter
-                       id="org.argeo.slc.client.commands.resultUuid"
-                       name="Result UUID">
-                       </commandParameter>
-                       <commandParameter
-                       id="org.argeo.slc.client.commands.resultName"
-                       name="Result Name">
-                       </commandParameter> -->
                </command>
-       
-           <!-- Execution Modules -->
+        -->
+           <!-- Execution Modules
            <command
                defaultHandler="org.argeo.eclipse.spring.SpringCommandHandler"
                id="org.argeo.slc.client.ui.refreshExecutionModulesView"
                name="Refresh Execution Modules View">
                </command>
-           <!-- Batch -->
+                -->
+           <!-- Batch
            <command
                defaultHandler="org.argeo.eclipse.spring.SpringCommandHandler"
                id="org.argeo.slc.client.ui.launchBatch"
@@ -137,7 +124,8 @@
                id="org.argeo.slc.client.ui.clearBatch"
                name="Clear Batch">
                </command>
-           <!-- Process List -->
+                -->
+           <!-- Process List
            <command
                defaultHandler="org.argeo.eclipse.spring.SpringCommandHandler"
                id="org.argeo.slc.client.ui.refreshProcessList"
@@ -157,21 +145,16 @@
                id="org.argeo.slc.client.ui.manageBundles"
                name="Manage Bundles">
                </command>
+                -->
     </extension>
    
        <!-- Menu definitions -->
        <extension
        id="menu:org.eclipse.ui.main.menu"
         point="org.eclipse.ui.menus">
+        <!--
                <menuContribution
                locationURI="menu:fileMenu">
-            <!-- Should be implemented in later version.
-            <command
-                  commandId="org.argeo.slc.client.ui.manageBundles"
-                  label="Manage Bundles"
-                  style="push"
-                  tooltip="Add or remove plugins at run time">
-            </command> -->
                </menuContribution>
                <menuContribution
                        locationURI="toolbar:org.argeo.slc.client.ui.resultListView">
@@ -218,6 +201,7 @@
                                tooltip="Remove selected process from process builder view.">
                        </command>
                </menuContribution>
+               -->
        </extension>
    <extension
          point="org.eclipse.ui.perspectives">

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 19a0f4f8fbb4b74f2100175c7fd9c0cff9cf1ad1..74d3b33a7e2d5950123e3d0dec0d669e313e962a 100644 (file)
--- 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 525c1643768539246ec55102ed182aacfaf8699b..bfe2ecb32243deeef5d07bf2b809ba31c2c0182d 100644 (file)
--- 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 @@
        <service ref="resultListener"\r
                interface="org.argeo.slc.core.test.tree.TreeTestResultListener" />\r
        <service ref="resultListener" interface="org.argeo.slc.test.TestResultListener" />\r
+       <service ref="attachmentUploader" interface="org.argeo.slc.core.attachment.AttachmentUploader" />\r
        \r
        <service interface="org.argeo.slc.execution.ExecutionModulesListener"\r
                ref="executionModulesListener" />\r

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 6c1f43c42803bc253bf18778b9dcd037e9880215..307708520b4d8dbf16888ff7dc869c0f5df4a278 100644 (file)
--- 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 @@
                <property name="session" ref="session" />\r
        </bean>\r
 \r
+       <bean id="attachmentUploader" class="org.argeo.slc.jcr.execution.JcrAttachmentUploader">\r
+               <property name="session" ref="session" />\r
+       </bean>\r
+\r
 \r
        <bean id="session" class="org.argeo.security.jcr.SecureThreadBoundSession">\r
                <property name="repository" ref="repository" />\r

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 (file)
index 0000000..f2e6258
--- /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 de023cefa1ed1f3b42e829a003bb8655125e9959..9d838b39f03ee93eccad654f1eaa84954aa70f80 100644 (file)
--- 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 8cd72efc7bbd42436a24ca97af8556571bf2b27d..7f7244e13ac31f2327ca90b32ebdd44c10bf4be7 100644 (file)
--- 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;