From 1fedf2405784de0e795835d823c32e0e437c58d3 Mon Sep 17 00:00:00 2001
From: bsinou <bsinou@argeo.org>
Date: Tue, 28 Feb 2017 00:58:08 +0100
Subject: [PATCH] Adapt after bundle name shortening

---
 .../META-INF/spring/backend-services.xml      |  8 ++---
 .../META-INF/spring/maintenance-services.xml  |  6 ++--
 org.argeo.suite.app/META-INF/spring/osgi.xml  | 10 +++---
 .../META-INF/spring/ui-people.xml             | 34 +++++++++----------
 .../META-INF/spring/workbench-services.xml    |  6 ++--
 org.argeo.suite.app/bnd.bnd                   |  8 ++---
 .../org/argeo/suite/web/DefaultDashboard.java |  6 ++--
 .../org/argeo/suite/web/DefaultMainPage.java  |  4 +--
 .../META-INF/spring/osgi.xml                  |  8 ++---
 org.argeo.suite.workbench.rap/bnd.bnd         |  8 ++---
 .../suite/workbench/DashboardPerspective.java |  6 ++--
 .../parts/AbstractSuiteDashboard.java         |  6 ++--
 .../parts/DefaultDashboardEditor.java         |  4 +--
 13 files changed, 57 insertions(+), 57 deletions(-)

diff --git a/org.argeo.suite.app/META-INF/spring/backend-services.xml b/org.argeo.suite.app/META-INF/spring/backend-services.xml
index b33afca..e0c9d98 100644
--- a/org.argeo.suite.app/META-INF/spring/backend-services.xml
+++ b/org.argeo.suite.app/META-INF/spring/backend-services.xml
@@ -13,21 +13,21 @@
 
 	<bean id="resourcesService" class="org.argeo.connect.resources.core.ResourcesServiceImpl" />
 
-	<bean id="activitiesService" class="org.argeo.connect.activities.core.ActivitiesServiceImpl">
+	<bean id="activitiesService" class="org.argeo.activities.core.ActivitiesServiceImpl">
 		<property name="userAdminService" ref="userAdminService" />
 		<property name="resourcesService" ref="resourcesService" />
 	</bean>
 
-	<bean id="peopleService" class="org.argeo.connect.people.core.PeopleServiceImpl"
+	<bean id="peopleService" class="org.argeo.people.core.PeopleServiceImpl"
 		init-method="init">
 		<property name="resourcesService" ref="resourcesService" />
 	</bean>
 
-	<bean id="trackerService" class="org.argeo.connect.tracker.core.TrackerServiceImpl">
+	<bean id="trackerService" class="org.argeo.tracker.core.TrackerServiceImpl">
 		<property name="activitiesService" ref="activitiesService" />
 	</bean>
 
-	<bean id="documentsService" class="org.argeo.connect.documents.DocumentsService" />
+	<bean id="documentsService" class="org.argeo.documents.DocumentsService" />
 
 	<!--order is important -->
 	<util:list id="knownAppServices">
diff --git a/org.argeo.suite.app/META-INF/spring/maintenance-services.xml b/org.argeo.suite.app/META-INF/spring/maintenance-services.xml
index 81e4332..42e9bad 100644
--- a/org.argeo.suite.app/META-INF/spring/maintenance-services.xml
+++ b/org.argeo.suite.app/META-INF/spring/maintenance-services.xml
@@ -9,12 +9,12 @@
 		class="org.argeo.connect.resources.core.ResourcesMaintenanceService" />
 
 	<bean id="activitiesMaintenanceService"
-		class="org.argeo.connect.activities.core.ActivitiesMaintenanceService" />
+		class="org.argeo.activities.core.ActivitiesMaintenanceService" />
 
-	<bean id="peopleMaintenanceService" class="org.argeo.connect.people.core.PeopleMaintenanceService" />
+	<bean id="peopleMaintenanceService" class="org.argeo.people.core.PeopleMaintenanceService" />
 
 	<bean id="trackerMaintenanceService"
-		class="org.argeo.connect.tracker.core.TrackerMaintenanceService" />
+		class="org.argeo.tracker.core.TrackerMaintenanceService" />
 
 	<!-- There is no maintenance Service for the Documents App yet -->
 	<!-- Order is important -->
diff --git a/org.argeo.suite.app/META-INF/spring/osgi.xml b/org.argeo.suite.app/META-INF/spring/osgi.xml
index c3ef50f..c71e214 100644
--- a/org.argeo.suite.app/META-INF/spring/osgi.xml
+++ b/org.argeo.suite.app/META-INF/spring/osgi.xml
@@ -24,10 +24,10 @@
 	<service ref="suiteAppService" interface="org.argeo.connect.AppService" />
 	<!-- App specific services -->
 	<service ref="resourcesService" interface="org.argeo.connect.resources.ResourcesService" />
-	<service ref="activitiesService" interface="org.argeo.connect.activities.ActivitiesService" />
-	<service ref="peopleService" interface="org.argeo.connect.people.PeopleService" />
-	<service ref="trackerService" interface="org.argeo.connect.tracker.TrackerService" />
-	<service ref="documentsService" interface="org.argeo.connect.documents.DocumentsService" />
+	<service ref="activitiesService" interface="org.argeo.activities.ActivitiesService" />
+	<service ref="peopleService" interface="org.argeo.people.PeopleService" />
+	<service ref="trackerService" interface="org.argeo.tracker.TrackerService" />
+	<service ref="documentsService" interface="org.argeo.documents.DocumentsService" />
 
 	<!-- Assembly of the various apps workbench services -->
 	<service ref="suiteWorkbenchService"
@@ -35,6 +35,6 @@
 
 	<!-- Exposes People specific implementation of the AppWorkbenchService -->
 	<service ref="peopleWorkbenchService"
-		interface="org.argeo.connect.people.workbench.PeopleWorkbenchService" />
+		interface="org.argeo.people.workbench.PeopleWorkbenchService" />
 
 </beans:beans>
diff --git a/org.argeo.suite.app/META-INF/spring/ui-people.xml b/org.argeo.suite.app/META-INF/spring/ui-people.xml
index 4149f5e..e2c6081 100644
--- a/org.argeo.suite.app/META-INF/spring/ui-people.xml
+++ b/org.argeo.suite.app/META-INF/spring/ui-people.xml
@@ -6,7 +6,7 @@
 	 http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.5.xsd">
 
 	<!-- People UI -->
-	<bean id="people.mainPage" class="org.argeo.connect.people.web.pages.PeopleDynamicPages">
+	<bean id="people.mainPage" class="org.argeo.people.web.pages.PeopleDynamicPages">
 		<property name="dynamicPages" ref="people.dynamicPages" />
 		<property name="peopleService" ref="peopleService" />
 		<property name="resourcesService" ref="resourcesService" />
@@ -39,9 +39,9 @@
 	<util:map id="people.dynamicPages">
 		<entry>
 			<key>
-				<util:constant static-field="org.argeo.connect.people.PeopleTypes.PEOPLE_PERSON" />
+				<util:constant static-field="org.argeo.people.PeopleTypes.PEOPLE_PERSON" />
 			</key>
-			<bean class="org.argeo.connect.people.web.pages.PersonPage">
+			<bean class="org.argeo.people.web.pages.PersonPage">
 				<property name="personHeaderPart" ref="personHeaderPart" />
 				<property name="contactsWithNotePart" ref="contactsWithNotePart" />
 				<property name="activitiesPart" ref="activitiesPart" />
@@ -49,9 +49,9 @@
 		</entry>
 		<entry>
 			<key>
-				<util:constant static-field="org.argeo.connect.people.PeopleTypes.PEOPLE_ORG" />
+				<util:constant static-field="org.argeo.people.PeopleTypes.PEOPLE_ORG" />
 			</key>
-			<bean class="org.argeo.connect.people.web.pages.OrgPage">
+			<bean class="org.argeo.people.web.pages.OrgPage">
 				<property name="orgHeaderPart" ref="orgHeaderPart" />
 				<property name="contactsWithNotePart" ref="contactsWithNotePart" />
 				<property name="activitiesPart" ref="activitiesPart" />
@@ -62,7 +62,7 @@
 				<util:constant
 					static-field="org.argeo.connect.resources.ResourcesTypes.RESOURCES_TAG" />
 			</key>
-			<bean class="org.argeo.connect.people.web.pages.TagLikeInstancePage">
+			<bean class="org.argeo.people.web.pages.TagLikeInstancePage">
 				<property name="peopleService" ref="peopleService" />
 				<property name="resourcesService" ref="resourcesService" />
 				<property name="iconPathes" ref="peopleEntityIcons" />
@@ -72,9 +72,9 @@
 		<entry>
 			<key>
 				<util:constant
-					static-field="org.argeo.connect.people.PeopleTypes.PEOPLE_MAILING_LIST" />
+					static-field="org.argeo.people.PeopleTypes.PEOPLE_MAILING_LIST" />
 			</key>
-			<bean class="org.argeo.connect.people.web.pages.TagLikeInstancePage">
+			<bean class="org.argeo.people.web.pages.TagLikeInstancePage">
 				<property name="resourcesService" ref="resourcesService" />
 				<property name="peopleService" ref="peopleService" />
 				<property name="iconPathes" ref="peopleEntityIcons" />
@@ -84,14 +84,14 @@
 	</util:map>
 
 	<!-- Various headers -->
-	<bean id="personHeaderPart" class="org.argeo.connect.people.web.parts.PersonHeaderPart">
+	<bean id="personHeaderPart" class="org.argeo.people.web.parts.PersonHeaderPart">
 		<property name="resourcesService" ref="resourcesService" />
 		<property name="peopleService" ref="peopleService" />
 		<property name="tagsPart" ref="tagsPart" />
 		<property name="mailingListsPart" ref="mailingListsPart" />
 	</bean>
 
-	<bean id="orgHeaderPart" class="org.argeo.connect.people.web.parts.OrgHeaderPart">
+	<bean id="orgHeaderPart" class="org.argeo.people.web.parts.OrgHeaderPart">
 		<property name="resourcesService" ref="resourcesService" />
 		<property name="peopleService" ref="peopleService" />
 		<property name="tagsPart" ref="tagsPart" />
@@ -99,30 +99,30 @@
 	</bean>
 
 	<!-- Contacts -->
-	<bean id="contactsWithNotePart" class="org.argeo.connect.people.web.parts.ContactsWithNotePart">
+	<bean id="contactsWithNotePart" class="org.argeo.people.web.parts.ContactsWithNotePart">
 		<property name="singleContactPart" ref="singleContactPart" />
 	</bean>
-	<bean id="singleContactPart" class="org.argeo.connect.people.web.parts.SingleContactPart">
+	<bean id="singleContactPart" class="org.argeo.people.web.parts.SingleContactPart">
 		<property name="resourcesService" ref="resourcesService" />
 		<property name="contactButtonsPart" ref="contactButtonsPart" />
 	</bean>
-	<bean id="contactButtonsPart" class="org.argeo.connect.people.web.parts.ContactButtonsPart">
+	<bean id="contactButtonsPart" class="org.argeo.people.web.parts.ContactButtonsPart">
 	</bean>
 
 	<!-- Activities and workflows -->
-	<bean id="activitiesPart" class="org.argeo.connect.people.web.parts.ActivitiesPart">
+	<bean id="activitiesPart" class="org.argeo.people.web.parts.ActivitiesPart">
 	</bean>
 
 	<!-- Tag like properties -->
-	<bean id="tagsPart" class="org.argeo.connect.people.web.parts.TagLikeValuesPart">
+	<bean id="tagsPart" class="org.argeo.people.web.parts.TagLikeValuesPart">
 		<property name="propertyName">
 			<util:constant static-field="org.argeo.connect.ConnectNames.CONNECT_TAGS" />
 		</property>
 	</bean>
-	<bean id="mailingListsPart" class="org.argeo.connect.people.web.parts.TagLikeValuesPart">
+	<bean id="mailingListsPart" class="org.argeo.people.web.parts.TagLikeValuesPart">
 		<property name="propertyName">
 			<util:constant
-				static-field="org.argeo.connect.people.PeopleNames.PEOPLE_MAILING_LISTS" />
+				static-field="org.argeo.people.PeopleNames.PEOPLE_MAILING_LISTS" />
 		</property>
 	</bean>
 </beans>
diff --git a/org.argeo.suite.app/META-INF/spring/workbench-services.xml b/org.argeo.suite.app/META-INF/spring/workbench-services.xml
index 79f7df1..19f1bf8 100644
--- a/org.argeo.suite.app/META-INF/spring/workbench-services.xml
+++ b/org.argeo.suite.app/META-INF/spring/workbench-services.xml
@@ -8,13 +8,13 @@
 		class="org.argeo.connect.resources.workbench.ResourcesWorkbenchService" />
 
 	<bean id="activitiesWorkbenchService"
-		class="org.argeo.connect.activities.workbench.ActivitiesWorkbenchService" />
+		class="org.argeo.activities.workbench.ActivitiesWorkbenchService" />
 
 	<bean id="peopleWorkbenchService"
-		class="org.argeo.connect.people.workbench.rap.PeopleWorkbenchServiceImpl" />
+		class="org.argeo.people.workbench.rap.PeopleWorkbenchServiceImpl" />
 
 	<bean id="documentsWorkbenchService"
-		class="org.argeo.connect.documents.workbench.DocumentsWorkbenchService" />
+		class="org.argeo.documents.workbench.DocumentsWorkbenchService" />
 
 	<!--order is important -->
 	<util:list id="knownWbServices">
diff --git a/org.argeo.suite.app/bnd.bnd b/org.argeo.suite.app/bnd.bnd
index b56de96..792e392 100644
--- a/org.argeo.suite.app/bnd.bnd
+++ b/org.argeo.suite.app/bnd.bnd
@@ -15,10 +15,10 @@ org.argeo.cms,\
 org.argeo.cms.ui.workbench,\
 org.argeo.cms.ui.workbench.jcr,\
 org.argeo.connect,\
-org.argeo.connect.activities,\
-org.argeo.connect.activities.workbench.parts,\
-org.argeo.connect.documents.workbench.parts,\
-org.argeo.connect.people.workbench.rap.views,\
+org.argeo.activities,\
+org.argeo.activities.workbench.parts,\
+org.argeo.documents.workbench.parts,\
+org.argeo.people.workbench.rap.views,\
 org.argeo.connect.resources,\
 org.argeo.connect.ui,\
 org.argeo.connect.ui.workbench,\
diff --git a/org.argeo.suite.web/src/org/argeo/suite/web/DefaultDashboard.java b/org.argeo.suite.web/src/org/argeo/suite/web/DefaultDashboard.java
index e1085f4..d3692fd 100644
--- a/org.argeo.suite.web/src/org/argeo/suite/web/DefaultDashboard.java
+++ b/org.argeo.suite.web/src/org/argeo/suite/web/DefaultDashboard.java
@@ -7,11 +7,11 @@ import javax.jcr.RepositoryException;
 
 import org.argeo.cms.ui.CmsUiProvider;
 import org.argeo.cms.util.CmsUtils;
-import org.argeo.connect.people.PeopleException;
-import org.argeo.connect.people.PeopleService;
-import org.argeo.connect.people.web.parts.PeopleSearchCmp;
 import org.argeo.connect.resources.ResourcesService;
 import org.argeo.eclipse.ui.EclipseUiUtils;
+import org.argeo.people.PeopleException;
+import org.argeo.people.PeopleService;
+import org.argeo.people.web.parts.PeopleSearchCmp;
 import org.eclipse.jface.viewers.DoubleClickEvent;
 import org.eclipse.jface.viewers.IDoubleClickListener;
 import org.eclipse.jface.viewers.IStructuredSelection;
diff --git a/org.argeo.suite.web/src/org/argeo/suite/web/DefaultMainPage.java b/org.argeo.suite.web/src/org/argeo/suite/web/DefaultMainPage.java
index 5a48487..9ead94a 100644
--- a/org.argeo.suite.web/src/org/argeo/suite/web/DefaultMainPage.java
+++ b/org.argeo.suite.web/src/org/argeo/suite/web/DefaultMainPage.java
@@ -17,10 +17,10 @@ import org.argeo.cms.ui.LifeCycleUiProvider;
 import org.argeo.cms.util.CmsUtils;
 import org.argeo.cms.widgets.auth.CmsLogin;
 import org.argeo.connect.ConnectTypes;
-import org.argeo.connect.people.PeopleService;
-import org.argeo.connect.people.web.pages.PeopleDefaultPage;
 import org.argeo.connect.resources.ResourcesService;
 import org.argeo.eclipse.ui.EclipseUiUtils;
+import org.argeo.people.PeopleService;
+import org.argeo.people.web.pages.PeopleDefaultPage;
 import org.argeo.suite.web.fs.MyFilesBrowserPage;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionListener;
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 acdb67a..f3b222e 100644
--- a/org.argeo.suite.workbench.rap/META-INF/spring/osgi.xml
+++ b/org.argeo.suite.workbench.rap/META-INF/spring/osgi.xml
@@ -11,10 +11,10 @@
 		filter="(cn=home)" />
 	<reference id="resourcesService" interface="org.argeo.connect.resources.ResourcesService" />
 	<reference id="activitiesService"
-		interface="org.argeo.connect.activities.ActivitiesService" />
-	<reference id="peopleService" interface="org.argeo.connect.people.PeopleService" />
-	<reference id="documentsService" interface="org.argeo.connect.documents.DocumentsService" />
-	<reference id="trackerService" interface="org.argeo.connect.tracker.TrackerService" />
+		interface="org.argeo.activities.ActivitiesService" />
+	<reference id="peopleService" interface="org.argeo.people.PeopleService" />
+	<reference id="documentsService" interface="org.argeo.documents.DocumentsService" />
+	<reference id="trackerService" interface="org.argeo.tracker.TrackerService" />
 
 	<reference id="appWorkbenchService"
 		interface="org.argeo.connect.ui.workbench.AppWorkbenchService" />
diff --git a/org.argeo.suite.workbench.rap/bnd.bnd b/org.argeo.suite.workbench.rap/bnd.bnd
index 794e0e3..86a9eb4 100644
--- a/org.argeo.suite.workbench.rap/bnd.bnd
+++ b/org.argeo.suite.workbench.rap/bnd.bnd
@@ -11,10 +11,10 @@ org.argeo.cms,\
 org.argeo.cms.ui.workbench,\
 org.argeo.cms.ui.workbench.jcr,\
 org.argeo.connect,\
-org.argeo.connect.activities,\
-org.argeo.connect.activities.workbench.parts,\
-org.argeo.connect.documents.workbench.parts,\
-org.argeo.connect.people.workbench.rap.views,\
+org.argeo.activities,\
+org.argeo.activities.workbench.parts,\
+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,\
diff --git a/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/DashboardPerspective.java b/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/DashboardPerspective.java
index 9b50d3e..91ca7d5 100644
--- a/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/DashboardPerspective.java
+++ b/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/DashboardPerspective.java
@@ -1,8 +1,8 @@
 package org.argeo.suite.workbench;
 
-import org.argeo.connect.activities.workbench.parts.MyTodoListView;
-import org.argeo.connect.documents.workbench.parts.MyFilesView;
-import org.argeo.connect.people.workbench.rap.views.QuickSearchView;
+import org.argeo.activities.workbench.parts.MyTodoListView;
+import org.argeo.documents.workbench.parts.MyFilesView;
+import org.argeo.people.workbench.rap.views.QuickSearchView;
 import org.eclipse.ui.IFolderLayout;
 import org.eclipse.ui.IPageLayout;
 import org.eclipse.ui.IPerspectiveFactory;
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 5e7d4be..67e6b91 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
@@ -7,18 +7,18 @@ import javax.jcr.Node;
 import javax.jcr.Repository;
 import javax.jcr.Session;
 
+import org.argeo.activities.ActivitiesService;
 import org.argeo.cms.ui.workbench.util.CommandUtils;
 import org.argeo.cms.util.CmsUtils;
-import org.argeo.connect.activities.ActivitiesService;
-import org.argeo.connect.documents.DocumentsService;
-import org.argeo.connect.people.PeopleService;
 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.documents.DocumentsService;
 import org.argeo.eclipse.ui.EclipseUiUtils;
 import org.argeo.jcr.JcrUtils;
+import org.argeo.people.PeopleService;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
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 4582f77..6010314 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
@@ -5,13 +5,13 @@ import javax.jcr.NodeIterator;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.argeo.connect.activities.ActivitiesTypes;
-import org.argeo.connect.people.PeopleTypes;
+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.eclipse.ui.EclipseUiUtils;
+import org.argeo.people.PeopleTypes;
 import org.argeo.suite.workbench.AsUiPlugin;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;
-- 
2.30.2