From f9efee01e7838b9747c712383f6d2e600b378c90 Mon Sep 17 00:00:00 2001
From: bsinou <bsinou@argeo.org>
Date: Fri, 27 Jan 2017 14:38:47 +0100
Subject: [PATCH] Adapt after connect refactoring

---
 org.argeo.suite.web/META-INF/spring/application.xml  |  2 +-
 org.argeo.suite.web/pom.xml                          |  5 -----
 org.argeo.suite.workbench.rap/bnd.bnd                |  2 +-
 org.argeo.suite.workbench.rap/pom.xml                | 12 +-----------
 .../argeo/suite/workbench/DashboardPerspective.java  |  4 ++--
 pom.xml                                              |  2 +-
 6 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/org.argeo.suite.web/META-INF/spring/application.xml b/org.argeo.suite.web/META-INF/spring/application.xml
index b339e44..59fd51c 100644
--- a/org.argeo.suite.web/META-INF/spring/application.xml
+++ b/org.argeo.suite.web/META-INF/spring/application.xml
@@ -22,7 +22,7 @@
 
 	<!-- The UI Service - Enables among other definition of specific commands 
 		and editors. -->
-	<bean id="peopleWbService" class="org.argeo.connect.people.rap.PeopleWbServiceImpl"
+	<bean id="peopleWbService" class="org.argeo.connect.people.workbench.rap.PeopleWbServiceImpl"
 		scope="prototype">
 	</bean>
 
diff --git a/org.argeo.suite.web/pom.xml b/org.argeo.suite.web/pom.xml
index 952c005..3d1b610 100644
--- a/org.argeo.suite.web/pom.xml
+++ b/org.argeo.suite.web/pom.xml
@@ -18,11 +18,6 @@
 			<artifactId>org.argeo.connect.people.web</artifactId>
 			<version>${version.argeo-connect}</version>
 		</dependency>
-		<dependency>
-			<groupId>org.argeo.connect</groupId>
-			<artifactId>org.argeo.connect.people.rap</artifactId>
-			<version>${version.argeo-connect}</version>
-		</dependency>
 		<dependency>
 			<groupId>org.argeo.connect</groupId>
 			<artifactId>org.argeo.connect.ui</artifactId>
diff --git a/org.argeo.suite.workbench.rap/bnd.bnd b/org.argeo.suite.workbench.rap/bnd.bnd
index 4439ee6..efc2cf5 100644
--- a/org.argeo.suite.workbench.rap/bnd.bnd
+++ b/org.argeo.suite.workbench.rap/bnd.bnd
@@ -11,7 +11,7 @@ javax.jcr.nodetype,\
 javax.jcr.security,\
 org.argeo.cms,\
 org.argeo.cms.ui.workbench,\
-org.argeo.connect.people.rap.views,\
+org.argeo.connect.people.workbench.rap.views,\
 org.argeo.eclipse.spring,\
 org.argeo.node,\
 org.argeo.util,\
diff --git a/org.argeo.suite.workbench.rap/pom.xml b/org.argeo.suite.workbench.rap/pom.xml
index b252909..b36f2a2 100644
--- a/org.argeo.suite.workbench.rap/pom.xml
+++ b/org.argeo.suite.workbench.rap/pom.xml
@@ -11,20 +11,10 @@
 	<name>Argeo Suite Rap Workbench</name>
 	<packaging>jar</packaging>
 	<dependencies>
-		<dependency>
-			<groupId>org.argeo.suite</groupId>
-			<artifactId>org.argeo.suite.web</artifactId>
-			<version>0.1.1-SNAPSHOT</version>
-		</dependency>
 		<dependency>
 			<groupId>org.argeo.connect</groupId>
-			<artifactId>org.argeo.connect.people.rap</artifactId>
+			<artifactId>org.argeo.connect.people.workbench.rap</artifactId>
 			<version>${version.argeo-connect}</version>
 		</dependency>
-<!-- 		<dependency> -->
-<!-- 			<groupId>org.argeo.commons</groupId> -->
-<!-- 			<artifactId>org.argeo.cms.ui.workbench.rap</artifactId> -->
-<!-- 			<version>${version.argeo-commons}</version> -->
-<!-- 		</dependency> -->
 	</dependencies>
 </project>
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 71fb19c..a05594c 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,7 +1,7 @@
 package org.argeo.suite.workbench;
 
-import org.argeo.connect.people.rap.views.MyTasksView;
-import org.argeo.connect.people.rap.views.PeopleDefaultView;
+import org.argeo.connect.people.workbench.rap.views.MyTasksView;
+import org.argeo.connect.people.workbench.rap.views.PeopleDefaultView;
 import org.eclipse.ui.IFolderLayout;
 import org.eclipse.ui.IPageLayout;
 import org.eclipse.ui.IPerspectiveFactory;
diff --git a/pom.xml b/pom.xml
index 77b1282..8d6854b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
 	<properties>
 		<version.argeo-suite>0.1.1-SNAPSHOT</version.argeo-suite>
 		<developmentCycle.argeo-suite>0.1</developmentCycle.argeo-suite>
-		<version.argeo-connect>2.1.63</version.argeo-connect>
+		<version.argeo-connect>2.1.64-SNAPSHOT</version.argeo-connect>
 		<version.argeo-tp-extras>2.1.9</version.argeo-tp-extras>
 		<git.rw />
 	</properties>
-- 
2.30.2