Remove dependency of client.rcp on client.ui
authorMathieu Baudier <mbaudier@argeo.org>
Wed, 22 Sep 2010 15:39:20 +0000 (15:39 +0000)
committerMathieu Baudier <mbaudier@argeo.org>
Wed, 22 Sep 2010 15:39:20 +0000 (15:39 +0000)
git-svn-id: https://svn.argeo.org/slc/trunk@3796 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

eclipse/plugins/org.argeo.slc.client.rcp/META-INF/MANIFEST.MF
eclipse/plugins/org.argeo.slc.client.rcp/META-INF/spring/rcp-osgi.xml [deleted file]
eclipse/plugins/org.argeo.slc.client.rcp/META-INF/spring/rcp.xml [deleted file]
eclipse/plugins/org.argeo.slc.client.rcp/plugin.xml
eclipse/plugins/org.argeo.slc.client.rcp/src/org/argeo/slc/client/rcp/Perspective.java
eclipse/plugins/org.argeo.slc.client.ui/META-INF/MANIFEST.MF
eclipse/plugins/org.argeo.slc.client.ui/META-INF/spring/listeners.xml [new file with mode: 0644]
eclipse/plugins/org.argeo.slc.client.ui/META-INF/spring/osgi.xml
eclipse/plugins/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/listeners/TestManagerServiceAdapter.java [new file with mode: 0644]
eclipse/plugins/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/services/TestManagerServiceAdapter.java [deleted file]

index ed9125eeefc71fbdbd25e9648d602dff6cfdb911..56d20f9cbe48cbf8aee9e4907a1fc6755a964558 100644 (file)
@@ -8,9 +8,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Import-Package: org.argeo.slc.client.ui.services,
- org.argeo.slc.client.ui.views,
- org.argeo.slc.core.test.tree;version="0.13.0.SNAPSHOT-r3768",
+Import-Package: org.argeo.slc.core.test.tree;version="0.13.0.SNAPSHOT-r3768",
  org.argeo.slc.execution;version="0.13.0.SNAPSHOT-r3770",
  org.argeo.slc.process;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.rcp/META-INF/spring/rcp-osgi.xml b/eclipse/plugins/org.argeo.slc.client.rcp/META-INF/spring/rcp-osgi.xml
deleted file mode 100644 (file)
index b171bae..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-<?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="testManagerService" interface="org.argeo.slc.services.TestManagerService" />\r
-       <reference id="slcExecutionService" interface="org.argeo.slc.services.SlcExecutionService" />\r
-\r
-       <reference id="modulesManager"\r
-               interface="org.argeo.slc.execution.ExecutionModulesManager" />\r
-\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
-       <!-- Bundles to start -->\r
-       <bundle id="security.manager.ldap" symbolic-name="org.argeo.security.manager.ldap"\r
-               action="start" />\r
-       <bundle id="security.services" symbolic-name="org.argeo.security.services"\r
-               action="start" />\r
-       <bundle id="slc.server.h2" symbolic-name="org.argeo.slc.server.h2"\r
-               action="start" />\r
-       <bundle id="slc.server.hibernate" symbolic-name="org.argeo.slc.server.hibernate"\r
-               action="start" />\r
-       <bundle id="slc.server.services" symbolic-name="org.argeo.slc.server.services"\r
-               action="start" />\r
-\r
-</beans:beans>
\ No newline at end of file
diff --git a/eclipse/plugins/org.argeo.slc.client.rcp/META-INF/spring/rcp.xml b/eclipse/plugins/org.argeo.slc.client.rcp/META-INF/spring/rcp.xml
deleted file mode 100644 (file)
index e3cdd91..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-<?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">
-
-       <bean id="testManagerServiceAdapter"
-               class="org.argeo.slc.client.ui.services.TestManagerServiceAdapter">
-               <property name="testManagerService" ref="testManagerService" />
-       </bean>
-
-       <bean id="slcExecutionServiceAdapter" class="org.argeo.slc.services.impl.SlcExecutionServiceAdapter">
-               <property name="slcExecutionService" ref="slcExecutionService" />
-       </bean>
-
-</beans>
index 2df055019699324297dc4c23fc36d5a87055193a..41eb2daa3cfa3acd9e5e00746e2b101efc568928 100644 (file)
             name="Exit">
       </command>
    </extension>
+   <extension
+         id="product"
+         point="org.eclipse.core.runtime.products">
+      <product
+            application="org.argeo.slc.client.rcp.application"
+            name="SLC">
+         <property
+               name="windowImages"
+               value="icons/argeo-icon-256.png">
+         </property>
+      </product>
+   </extension>
    <!-- <extension
          id="product"
          point="org.eclipse.core.runtime.products">
index 857ce722e9fd2efc34ea01da8eb8e96681681a72..c5b83678429aa9e9bcd49d75f96776b681ca0fbb 100644 (file)
@@ -1,9 +1,5 @@
 package org.argeo.slc.client.rcp;
 
-import org.argeo.slc.client.ui.views.ExecutionModulesView;
-import org.argeo.slc.client.ui.views.ProcessBuilderView;
-import org.argeo.slc.client.ui.views.ResultListView;
-import org.argeo.slc.client.ui.views.ProcessListView;
 import org.eclipse.ui.IFolderLayout;
 import org.eclipse.ui.IPageLayout;
 import org.eclipse.ui.IPerspectiveFactory;
@@ -17,21 +13,19 @@ public class Perspective implements IPerspectiveFactory {
 
                IFolderLayout topLeft = layout.createFolder("topLeft",
                                IPageLayout.LEFT, 0.5f, editorArea);
-               topLeft.addView(ExecutionModulesView.ID);
+               topLeft.addView("org.argeo.slc.client.ui.executionModulesView");
 
                IFolderLayout topRight = layout.createFolder("topRight",
                                IPageLayout.RIGHT, 0.5f, editorArea);
-               topRight.addView(ResultListView.ID);
+               topRight.addView("org.argeo.slc.client.ui.resultListView");
 
                IFolderLayout bottomRight = layout.createFolder("bottomRight",
                                IPageLayout.BOTTOM, 0.6f, "topRight");
-               bottomRight.addView(ProcessListView.ID);
+               bottomRight.addView("org.argeo.slc.client.ui.processListView");
 
                IFolderLayout bottomLeft = layout.createFolder("bottomLeft",
                                IPageLayout.BOTTOM, 0.6f, "topLeft");
-               bottomLeft.addView(ProcessBuilderView.ID);
-               // layout.addStandaloneView(SlcExecutionListView.ID, false,
-               // IPageLayout.BOTTOM, 0.5f, editorArea);
+               bottomLeft.addView("org.argeo.slc.client.ui.processBuilderView");
        }
 
 }
index 52cb4d9f73af713191b3c169bc5df1185569f793..25a4ede3aa23e107113e9d224888de60776adef2 100644 (file)
@@ -11,7 +11,7 @@ Require-Bundle: org.eclipse.ui;resolution:=optional,
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Export-Package: org.argeo.slc.client.ui,
- org.argeo.slc.client.ui.services,
+ org.argeo.slc.client.ui.listeners,
  org.argeo.slc.client.ui.views
 Import-Package: org.apache.commons.io;version="1.4.0",
  org.apache.commons.logging;version="1.1.1",
@@ -29,6 +29,7 @@ Import-Package: org.apache.commons.io;version="1.4.0",
  org.argeo.slc.process;version="0.13.0.SNAPSHOT-r3685",
  org.argeo.slc.runtime;version="0.13.0.SNAPSHOT-r3685",
  org.argeo.slc.services;version="0.13.0.SNAPSHOT-r3773",
+ org.argeo.slc.services.impl;version="0.13.0.SNAPSHOT-r3777",
  org.argeo.slc.test,
  org.hibernate.hql.ast,
  org.hibernate.jdbc,
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
new file mode 100644 (file)
index 0000000..509fe81
--- /dev/null
@@ -0,0 +1,16 @@
+<?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">
+
+       <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>
+
+</beans>
index 20357075094f7b68f6c8354eb7c4589c594d5430..e73da5a8e7e28822201a5dec5ae8682c41f5c3d8 100644 (file)
@@ -13,6 +13,7 @@
 \r
        <!-- Services -->\r
        <reference id="slcExecutionService" interface="org.argeo.slc.services.SlcExecutionService" />\r
+       <reference id="testManagerService" interface="org.argeo.slc.services.TestManagerService" />\r
 \r
        <!-- Session (to insure transactional management) -->\r
        <!-- <reference id="sessionFactory" interface="org.hibernate.SessionFactory" \r
        <!-- Proxy object to try solving transaction & session problem caused by \r
                using hibernate -->\r
        <reference id="processListTableContent" interface="org.argeo.slc.client.core.TableContent" />\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
+\r
 </beans:beans>
\ No newline at end of file
diff --git a/eclipse/plugins/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/listeners/TestManagerServiceAdapter.java b/eclipse/plugins/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/listeners/TestManagerServiceAdapter.java
new file mode 100644 (file)
index 0000000..6189591
--- /dev/null
@@ -0,0 +1,100 @@
+package org.argeo.slc.client.ui.listeners;
+
+import org.argeo.slc.SlcException;
+import org.argeo.slc.client.ui.ClientUiPlugin;
+import org.argeo.slc.core.attachment.Attachment;
+import org.argeo.slc.core.attachment.SimpleAttachment;
+import org.argeo.slc.core.test.tree.TreeTestResult;
+import org.argeo.slc.core.test.tree.TreeTestResultListener;
+import org.argeo.slc.msg.test.tree.AddTreeTestResultAttachmentRequest;
+import org.argeo.slc.msg.test.tree.CloseTreeTestResultRequest;
+import org.argeo.slc.msg.test.tree.CreateTreeTestResultRequest;
+import org.argeo.slc.msg.test.tree.ResultPartRequest;
+import org.argeo.slc.services.TestManagerService;
+import org.argeo.slc.test.TestResultPart;
+import org.eclipse.ui.handlers.IHandlerService;
+
+/** In memory access to a test manager service */
+public class TestManagerServiceAdapter implements TreeTestResultListener {
+       // private static final Log log = LogFactory
+       // .getLog(TestManagerServiceAdapter.class);
+
+       private Boolean onlyOnClose = false;
+
+       private TestManagerService testManagerService;
+
+       public void resultPartAdded(TreeTestResult testResult,
+                       TestResultPart testResultPart) {
+               if (onlyOnClose)
+                       return;
+
+               if (testResult.getResultParts().size() == 1
+                               && testResult.getResultParts().values().iterator().next()
+                                               .getParts().size() == 1) {
+                       CreateTreeTestResultRequest req = new CreateTreeTestResultRequest(
+                                       testResult);
+                       testManagerService.createTreeTestResult(req);
+               } else {
+                       ResultPartRequest req = new ResultPartRequest(testResult);
+                       testManagerService.addResultPart(req);
+               }
+       }
+
+       public void close(TreeTestResult testResult) {
+
+               if (onlyOnClose) {
+                       CreateTreeTestResultRequest req = new CreateTreeTestResultRequest(
+                                       testResult);
+                       testManagerService.createTreeTestResult(req);
+               } else {
+                       CloseTreeTestResultRequest req = new CloseTreeTestResultRequest(
+                                       testResult);
+                       testManagerService.closeTreeTestResult(req);
+               }
+
+               // TODO : clean this -> pb of thread && commandID hardCoded.
+               // We force the refresh of the list view.
+               ClientUiPlugin.getDefault().getWorkbench().getDisplay().syncExec(
+                               new Runnable() {
+                                       public void run() {
+                                               IHandlerService handlerService = (IHandlerService) ClientUiPlugin
+                                                               .getDefault().getWorkbench().getService(
+                                                                               IHandlerService.class);
+                                               try {
+                                                       handlerService
+                                                                       .executeCommand(
+                                                                                       "org.argeo.slc.client.ui.RefreshResultList",
+                                                                                       null);
+                                               } catch (Exception e) {
+                                                       e.printStackTrace();
+                                                       throw new SlcException(
+                                                                       "Problem while rendering result. "
+                                                                                       + e.getMessage());
+                                               }
+                                       }
+                               }
+
+               );
+
+       }
+
+       public void addAttachment(TreeTestResult testResult, Attachment attachment) {
+               if (onlyOnClose)
+                       return;
+               AddTreeTestResultAttachmentRequest req = new AddTreeTestResultAttachmentRequest();
+               req.setResultUuid(testResult.getUuid());
+               req.setAttachment((SimpleAttachment) attachment);
+               testManagerService.addAttachment(req);
+
+       }
+
+       /** Publishes the test result only when it gets closed. */
+       public void setOnlyOnClose(Boolean onlyOnClose) {
+               this.onlyOnClose = onlyOnClose;
+       }
+
+       public void setTestManagerService(TestManagerService testManagerService) {
+               this.testManagerService = testManagerService;
+       }
+
+}
diff --git a/eclipse/plugins/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/services/TestManagerServiceAdapter.java b/eclipse/plugins/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/services/TestManagerServiceAdapter.java
deleted file mode 100644 (file)
index 15de03a..0000000
+++ /dev/null
@@ -1,100 +0,0 @@
-package org.argeo.slc.client.ui.services;
-
-import org.argeo.slc.SlcException;
-import org.argeo.slc.client.ui.ClientUiPlugin;
-import org.argeo.slc.core.attachment.Attachment;
-import org.argeo.slc.core.attachment.SimpleAttachment;
-import org.argeo.slc.core.test.tree.TreeTestResult;
-import org.argeo.slc.core.test.tree.TreeTestResultListener;
-import org.argeo.slc.msg.test.tree.AddTreeTestResultAttachmentRequest;
-import org.argeo.slc.msg.test.tree.CloseTreeTestResultRequest;
-import org.argeo.slc.msg.test.tree.CreateTreeTestResultRequest;
-import org.argeo.slc.msg.test.tree.ResultPartRequest;
-import org.argeo.slc.services.TestManagerService;
-import org.argeo.slc.test.TestResultPart;
-import org.eclipse.ui.handlers.IHandlerService;
-
-/** In memory access to a test manager service */
-public class TestManagerServiceAdapter implements TreeTestResultListener {
-       // private static final Log log = LogFactory
-       // .getLog(TestManagerServiceAdapter.class);
-
-       private Boolean onlyOnClose = false;
-
-       private TestManagerService testManagerService;
-
-       public void resultPartAdded(TreeTestResult testResult,
-                       TestResultPart testResultPart) {
-               if (onlyOnClose)
-                       return;
-
-               if (testResult.getResultParts().size() == 1
-                               && testResult.getResultParts().values().iterator().next()
-                                               .getParts().size() == 1) {
-                       CreateTreeTestResultRequest req = new CreateTreeTestResultRequest(
-                                       testResult);
-                       testManagerService.createTreeTestResult(req);
-               } else {
-                       ResultPartRequest req = new ResultPartRequest(testResult);
-                       testManagerService.addResultPart(req);
-               }
-       }
-
-       public void close(TreeTestResult testResult) {
-
-               if (onlyOnClose) {
-                       CreateTreeTestResultRequest req = new CreateTreeTestResultRequest(
-                                       testResult);
-                       testManagerService.createTreeTestResult(req);
-               } else {
-                       CloseTreeTestResultRequest req = new CloseTreeTestResultRequest(
-                                       testResult);
-                       testManagerService.closeTreeTestResult(req);
-               }
-
-               // TODO : clean this -> pb of thread && commandID hardCoded.
-               // We force the refresh of the list view.
-               ClientUiPlugin.getDefault().getWorkbench().getDisplay().syncExec(
-                               new Runnable() {
-                                       public void run() {
-                                               IHandlerService handlerService = (IHandlerService) ClientUiPlugin
-                                                               .getDefault().getWorkbench().getService(
-                                                                               IHandlerService.class);
-                                               try {
-                                                       handlerService
-                                                                       .executeCommand(
-                                                                                       "org.argeo.slc.client.ui.RefreshResultList",
-                                                                                       null);
-                                               } catch (Exception e) {
-                                                       e.printStackTrace();
-                                                       throw new SlcException(
-                                                                       "Problem while rendering result. "
-                                                                                       + e.getMessage());
-                                               }
-                                       }
-                               }
-
-               );
-
-       }
-
-       public void addAttachment(TreeTestResult testResult, Attachment attachment) {
-               if (onlyOnClose)
-                       return;
-               AddTreeTestResultAttachmentRequest req = new AddTreeTestResultAttachmentRequest();
-               req.setResultUuid(testResult.getUuid());
-               req.setAttachment((SimpleAttachment) attachment);
-               testManagerService.addAttachment(req);
-
-       }
-
-       /** Publishes the test result only when it gets closed. */
-       public void setOnlyOnClose(Boolean onlyOnClose) {
-               this.onlyOnClose = onlyOnClose;
-       }
-
-       public void setTestManagerService(TestManagerService testManagerService) {
-               this.testManagerService = testManagerService;
-       }
-
-}