Adapt after connect refactoring

diff --git a/org.argeo.suite.web/META-INF/spring/application.xml b/org.argeo.suite.web/META-INF/spring/application.xml
index b339e44a0af2781aa8a54a16d0e42e504a52ab36..59fd51c5fec3203e2c04c540ee2f2551a5af7493 100644 (file)
--- 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. -->
 
        <!-- 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>
 
                scope="prototype">
        </bean>
 

diff --git a/org.argeo.suite.web/pom.xml b/org.argeo.suite.web/pom.xml
index 952c005681e793965b00cc53878503b06f76a1c1..3d1b6104cf3fd69fb0dc07309e5f6622a6fb68ed 100644 (file)
--- 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>
                        <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>
                <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 4439ee60e24dd847d4c494c56ab25302ecb1a802..efc2cf5dbb267134e89eb3ea075a6dabde4fd322 100644 (file)
--- 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,\
 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,\
 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 b252909b674e455eaa3e9a5c38fc0a47fbed94d6..b36f2a2bab4cc079db0b58110cb9d90f524a3029 100644 (file)
--- 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>
        <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>
                <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>
                        <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>
        </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 71fb19c6fdaabbab402d97d3a98ee5bee095e23e..a05594c3de4240423c7a5aabbf4392d4286c7e64 100644 (file)
--- 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;
 
 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;
 import org.eclipse.ui.IFolderLayout;
 import org.eclipse.ui.IPageLayout;
 import org.eclipse.ui.IPerspectiveFactory;

diff --git a/pom.xml b/pom.xml
index 77b12822ce40f07d25bea0416b4c766c9007f18e..8d6854bbe2cf22409d43f746da321c488d63754b 100644 (file)
--- 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>
        <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>
                <version.argeo-tp-extras>2.1.9</version.argeo-tp-extras>
                <git.rw />
        </properties>