From 8d63b14238448a9d11481e4071eba9d20e161ae2 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Wed, 22 Sep 2010 15:39:20 +0000
Subject: [PATCH] Remove dependency of client.rcp on client.ui

git-svn-id: https://svn.argeo.org/slc/trunk@3796 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 .../META-INF/MANIFEST.MF                      |  4 +--
 .../META-INF/spring/rcp-osgi.xml              | 31 -------------------
 .../org.argeo.slc.client.rcp/plugin.xml       | 12 +++++++
 .../org/argeo/slc/client/rcp/Perspective.java | 14 +++------
 .../META-INF/MANIFEST.MF                      |  3 +-
 .../META-INF/spring/listeners.xml}            |  2 +-
 .../META-INF/spring/osgi.xml                  |  7 +++++
 .../TestManagerServiceAdapter.java            |  2 +-
 8 files changed, 28 insertions(+), 47 deletions(-)
 delete mode 100644 eclipse/plugins/org.argeo.slc.client.rcp/META-INF/spring/rcp-osgi.xml
 rename eclipse/plugins/{org.argeo.slc.client.rcp/META-INF/spring/rcp.xml => org.argeo.slc.client.ui/META-INF/spring/listeners.xml} (90%)
 rename eclipse/plugins/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/{services => listeners}/TestManagerServiceAdapter.java (98%)

diff --git a/eclipse/plugins/org.argeo.slc.client.rcp/META-INF/MANIFEST.MF b/eclipse/plugins/org.argeo.slc.client.rcp/META-INF/MANIFEST.MF
index ed9125eee..56d20f9cb 100644
--- a/eclipse/plugins/org.argeo.slc.client.rcp/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.argeo.slc.client.rcp/META-INF/MANIFEST.MF
@@ -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
index b171bae91..000000000
--- a/eclipse/plugins/org.argeo.slc.client.rcp/META-INF/spring/rcp-osgi.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans:beans xmlns="http://www.springframework.org/schema/osgi"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"
-	xsi:schemaLocation="http://www.springframework.org/schema/osgi  
-       http://www.springframework.org/schema/osgi/spring-osgi-1.1.xsd
-       http://www.springframework.org/schema/beans   
-       http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
-
-	<reference id="testManagerService" interface="org.argeo.slc.services.TestManagerService" />
-	<reference id="slcExecutionService" interface="org.argeo.slc.services.SlcExecutionService" />
-
-	<reference id="modulesManager"
-		interface="org.argeo.slc.execution.ExecutionModulesManager" />
-
-	<service ref="testManagerServiceAdapter"
-		interface="org.argeo.slc.core.test.tree.TreeTestResultListener" />
-	<service ref="slcExecutionServiceAdapter" interface="org.argeo.slc.process.SlcExecutionNotifier" />
-
-	<!-- Bundles to start -->
-	<bundle id="security.manager.ldap" symbolic-name="org.argeo.security.manager.ldap"
-		action="start" />
-	<bundle id="security.services" symbolic-name="org.argeo.security.services"
-		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" />
-
-</beans:beans>
\ No newline at end of file
diff --git a/eclipse/plugins/org.argeo.slc.client.rcp/plugin.xml b/eclipse/plugins/org.argeo.slc.client.rcp/plugin.xml
index 2df055019..41eb2daa3 100644
--- a/eclipse/plugins/org.argeo.slc.client.rcp/plugin.xml
+++ b/eclipse/plugins/org.argeo.slc.client.rcp/plugin.xml
@@ -59,6 +59,18 @@
             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">
diff --git a/eclipse/plugins/org.argeo.slc.client.rcp/src/org/argeo/slc/client/rcp/Perspective.java b/eclipse/plugins/org.argeo.slc.client.rcp/src/org/argeo/slc/client/rcp/Perspective.java
index 857ce722e..c5b836784 100644
--- a/eclipse/plugins/org.argeo.slc.client.rcp/src/org/argeo/slc/client/rcp/Perspective.java
+++ b/eclipse/plugins/org.argeo.slc.client.rcp/src/org/argeo/slc/client/rcp/Perspective.java
@@ -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");
 	}
 
 }
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 52cb4d9f7..25a4ede3a 100644
--- a/eclipse/plugins/org.argeo.slc.client.ui/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.argeo.slc.client.ui/META-INF/MANIFEST.MF
@@ -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.rcp/META-INF/spring/rcp.xml b/eclipse/plugins/org.argeo.slc.client.ui/META-INF/spring/listeners.xml
similarity index 90%
rename from eclipse/plugins/org.argeo.slc.client.rcp/META-INF/spring/rcp.xml
rename to eclipse/plugins/org.argeo.slc.client.ui/META-INF/spring/listeners.xml
index e3cdd91ee..509fe8127 100644
--- a/eclipse/plugins/org.argeo.slc.client.rcp/META-INF/spring/rcp.xml
+++ b/eclipse/plugins/org.argeo.slc.client.ui/META-INF/spring/listeners.xml
@@ -5,7 +5,7 @@
         http://www.springframework.org/schema/beans/spring-beans.xsd">
 
 	<bean id="testManagerServiceAdapter"
-		class="org.argeo.slc.client.ui.services.TestManagerServiceAdapter">
+		class="org.argeo.slc.client.ui.listeners.TestManagerServiceAdapter">
 		<property name="testManagerService" ref="testManagerService" />
 	</bean>
 
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 203570750..e73da5a8e 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
@@ -13,6 +13,7 @@
 
 	<!-- Services -->
 	<reference id="slcExecutionService" interface="org.argeo.slc.services.SlcExecutionService" />
+	<reference id="testManagerService" interface="org.argeo.slc.services.TestManagerService" />
 
 	<!-- Session (to insure transactional management) -->
 	<!-- <reference id="sessionFactory" interface="org.hibernate.SessionFactory" 
@@ -24,4 +25,10 @@
 	<!-- Proxy object to try solving transaction & session problem caused by 
 		using hibernate -->
 	<reference id="processListTableContent" interface="org.argeo.slc.client.core.TableContent" />
+
+	<!-- Listeners used by the execution modules -->
+	<service ref="testManagerServiceAdapter"
+		interface="org.argeo.slc.core.test.tree.TreeTestResultListener" />
+	<service ref="slcExecutionServiceAdapter" interface="org.argeo.slc.process.SlcExecutionNotifier" />
+
 </beans:beans>
\ No newline at end of file
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/listeners/TestManagerServiceAdapter.java
similarity index 98%
rename from eclipse/plugins/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/services/TestManagerServiceAdapter.java
rename to eclipse/plugins/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/listeners/TestManagerServiceAdapter.java
index 15de03a1d..6189591cb 100644
--- 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/listeners/TestManagerServiceAdapter.java
@@ -1,4 +1,4 @@
-package org.argeo.slc.client.ui.services;
+package org.argeo.slc.client.ui.listeners;
 
 import org.argeo.slc.SlcException;
 import org.argeo.slc.client.ui.ClientUiPlugin;
-- 
2.39.2