From: bsinou <bsinou@argeo.org>
Date: Tue, 28 Feb 2017 10:03:47 +0000 (+0100)
Subject: Finalise package refactoring
X-Git-Tag: argeo-suite-0.1.5~15
X-Git-Url: https://git.argeo.org/?p=gpl%2Fargeo-suite.git;a=commitdiff_plain;h=07694dd6c416e5ec27a9d87bafdd92f049383f83

Finalise package refactoring
---

diff --git a/org.argeo.suite.app/META-INF/spring/osgi.xml b/org.argeo.suite.app/META-INF/spring/osgi.xml
index c71e214..0ef2a6c 100644
--- a/org.argeo.suite.app/META-INF/spring/osgi.xml
+++ b/org.argeo.suite.app/META-INF/spring/osgi.xml
@@ -31,7 +31,7 @@
 
 	<!-- Assembly of the various apps workbench services -->
 	<service ref="suiteWorkbenchService"
-		interface="org.argeo.connect.ui.workbench.AppWorkbenchService" />
+		interface="org.argeo.connect.workbench.AppWorkbenchService" />
 
 	<!-- Exposes People specific implementation of the AppWorkbenchService -->
 	<service ref="peopleWorkbenchService"
diff --git a/org.argeo.suite.app/bnd.bnd b/org.argeo.suite.app/bnd.bnd
index 792e392..6d3c6c8 100644
--- a/org.argeo.suite.app/bnd.bnd
+++ b/org.argeo.suite.app/bnd.bnd
@@ -21,8 +21,8 @@ org.argeo.documents.workbench.parts,\
 org.argeo.people.workbench.rap.views,\
 org.argeo.connect.resources,\
 org.argeo.connect.ui,\
-org.argeo.connect.ui.workbench,\
-org.argeo.connect.ui.workbench.util,\
+org.argeo.connect.workbench,\
+org.argeo.connect.workbench.util,\
 org.argeo.eclipse.spring,\
 org.argeo.node,\
 org.argeo.suite.workbench.rap,\
diff --git a/org.argeo.suite.workbench.rap/META-INF/spring/osgi.xml b/org.argeo.suite.workbench.rap/META-INF/spring/osgi.xml
index f3b222e..b0d5f19 100644
--- a/org.argeo.suite.workbench.rap/META-INF/spring/osgi.xml
+++ b/org.argeo.suite.workbench.rap/META-INF/spring/osgi.xml
@@ -17,6 +17,6 @@
 	<reference id="trackerService" interface="org.argeo.tracker.TrackerService" />
 
 	<reference id="appWorkbenchService"
-		interface="org.argeo.connect.ui.workbench.AppWorkbenchService" />
+		interface="org.argeo.connect.workbench.AppWorkbenchService" />
 
 </beans:beans>
diff --git a/org.argeo.suite.workbench.rap/bnd.bnd b/org.argeo.suite.workbench.rap/bnd.bnd
index 86a9eb4..ee9c08a 100644
--- a/org.argeo.suite.workbench.rap/bnd.bnd
+++ b/org.argeo.suite.workbench.rap/bnd.bnd
@@ -17,9 +17,9 @@ org.argeo.documents.workbench.parts,\
 org.argeo.people.workbench.rap.views,\
 org.argeo.connect.resources,\
 org.argeo.connect.ui,\
-org.argeo.connect.ui.workbench.commands,\
-org.argeo.connect.ui.workbench,\
-org.argeo.connect.ui.workbench.util,\
+org.argeo.connect.workbench.commands,\
+org.argeo.connect.workbench,\
+org.argeo.connect.workbench.util,\
 org.argeo.eclipse.spring,\
 org.argeo.node,\
 org.argeo.util,\
diff --git a/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/SuiteWorkbenchService.java b/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/SuiteWorkbenchService.java
index a7a5342..89dfc97 100644
--- a/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/SuiteWorkbenchService.java
+++ b/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/SuiteWorkbenchService.java
@@ -4,7 +4,7 @@ import java.util.List;
 
 import javax.jcr.Node;
 
-import org.argeo.connect.ui.workbench.AppWorkbenchService;
+import org.argeo.connect.workbench.AppWorkbenchService;
 import org.argeo.eclipse.ui.EclipseUiUtils;
 import org.argeo.suite.workbench.parts.DefaultDashboardEditor;
 import org.eclipse.jface.wizard.Wizard;
diff --git a/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/parts/AbstractSuiteDashboard.java b/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/parts/AbstractSuiteDashboard.java
index 67e6b91..0ec0075 100644
--- a/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/parts/AbstractSuiteDashboard.java
+++ b/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/parts/AbstractSuiteDashboard.java
@@ -12,9 +12,9 @@ import org.argeo.cms.ui.workbench.util.CommandUtils;
 import org.argeo.cms.util.CmsUtils;
 import org.argeo.connect.resources.ResourcesService;
 import org.argeo.connect.ui.ConnectUiStyles;
-import org.argeo.connect.ui.workbench.AppWorkbenchService;
-import org.argeo.connect.ui.workbench.util.EntityEditorInput;
 import org.argeo.connect.util.ConnectJcrUtils;
+import org.argeo.connect.workbench.AppWorkbenchService;
+import org.argeo.connect.workbench.util.EntityEditorInput;
 import org.argeo.documents.DocumentsService;
 import org.argeo.eclipse.ui.EclipseUiUtils;
 import org.argeo.jcr.JcrUtils;
diff --git a/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/parts/DefaultDashboardEditor.java b/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/parts/DefaultDashboardEditor.java
index 6010314..b0e03b0 100644
--- a/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/parts/DefaultDashboardEditor.java
+++ b/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/parts/DefaultDashboardEditor.java
@@ -7,9 +7,9 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.activities.ActivitiesTypes;
 import org.argeo.connect.resources.ResourcesTypes;
-import org.argeo.connect.ui.workbench.ConnectWorkbenchUtils;
-import org.argeo.connect.ui.workbench.Refreshable;
 import org.argeo.connect.util.ConnectJcrUtils;
+import org.argeo.connect.workbench.ConnectWorkbenchUtils;
+import org.argeo.connect.workbench.Refreshable;
 import org.argeo.eclipse.ui.EclipseUiUtils;
 import org.argeo.people.PeopleTypes;
 import org.argeo.suite.workbench.AsUiPlugin;
diff --git a/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/rap/AsWindowAdvisor.java b/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/rap/AsWindowAdvisor.java
index 87c4fb6..0c9c67a 100644
--- a/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/rap/AsWindowAdvisor.java
+++ b/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/rap/AsWindowAdvisor.java
@@ -2,7 +2,7 @@ package org.argeo.suite.workbench.rap;
 
 import org.argeo.cms.ui.workbench.rap.RapWindowAdvisor;
 import org.argeo.cms.ui.workbench.util.CommandUtils;
-import org.argeo.connect.ui.workbench.commands.OpenDefaultEditor;
+import org.argeo.connect.workbench.commands.OpenDefaultEditor;
 import org.eclipse.ui.application.ActionBarAdvisor;
 import org.eclipse.ui.application.IActionBarConfigurer;
 import org.eclipse.ui.application.IWorkbenchWindowConfigurer;