Adapt after bundle name shortening

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 b33afcaf07bc5b181a67bd310a97e10e5254212b..e0c9d98f2179052c3f60a945a709f84cc549ca8d 100644 (file)
--- 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 @@
 \r
        <bean id="resourcesService" class="org.argeo.connect.resources.core.ResourcesServiceImpl" />\r
 \r
 \r
        <bean id="resourcesService" class="org.argeo.connect.resources.core.ResourcesServiceImpl" />\r
 \r

-       <bean id="activitiesService" class="org.argeo.connect.activities.core.ActivitiesServiceImpl">\r
+       <bean id="activitiesService" class="org.argeo.activities.core.ActivitiesServiceImpl">\r

                <property name="userAdminService" ref="userAdminService" />\r
                <property name="resourcesService" ref="resourcesService" />\r
        </bean>\r
 \r
                <property name="userAdminService" ref="userAdminService" />\r
                <property name="resourcesService" ref="resourcesService" />\r
        </bean>\r
 \r

-       <bean id="peopleService" class="org.argeo.connect.people.core.PeopleServiceImpl"\r
+       <bean id="peopleService" class="org.argeo.people.core.PeopleServiceImpl"\r

                init-method="init">\r
                <property name="resourcesService" ref="resourcesService" />\r
        </bean>\r
 \r
                init-method="init">\r
                <property name="resourcesService" ref="resourcesService" />\r
        </bean>\r
 \r

-       <bean id="trackerService" class="org.argeo.connect.tracker.core.TrackerServiceImpl">\r
+       <bean id="trackerService" class="org.argeo.tracker.core.TrackerServiceImpl">\r

                <property name="activitiesService" ref="activitiesService" />\r
        </bean>\r
 \r
                <property name="activitiesService" ref="activitiesService" />\r
        </bean>\r
 \r

-       <bean id="documentsService" class="org.argeo.connect.documents.DocumentsService" />\r
+       <bean id="documentsService" class="org.argeo.documents.DocumentsService" />\r

 \r
        <!--order is important -->\r
        <util:list id="knownAppServices">\r
 \r
        <!--order is important -->\r
        <util:list id="knownAppServices">\r

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 81e4332fce557ac9c9841fcbda77284d5faca62a..42e9bad1a1fc826ecd85d04a0badb5dd9e92b4b2 100644 (file)
--- 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" />\r
 \r
        <bean id="activitiesMaintenanceService"\r
                class="org.argeo.connect.resources.core.ResourcesMaintenanceService" />\r
 \r
        <bean id="activitiesMaintenanceService"\r

-               class="org.argeo.connect.activities.core.ActivitiesMaintenanceService" />\r
+               class="org.argeo.activities.core.ActivitiesMaintenanceService" />\r

 \r
 \r

-       <bean id="peopleMaintenanceService" class="org.argeo.connect.people.core.PeopleMaintenanceService" />\r
+       <bean id="peopleMaintenanceService" class="org.argeo.people.core.PeopleMaintenanceService" />\r

 \r
        <bean id="trackerMaintenanceService"\r
 \r
        <bean id="trackerMaintenanceService"\r

-               class="org.argeo.connect.tracker.core.TrackerMaintenanceService" />\r
+               class="org.argeo.tracker.core.TrackerMaintenanceService" />\r

 \r
        <!-- There is no maintenance Service for the Documents App yet -->\r
        <!-- Order is important -->\r
 \r
        <!-- There is no maintenance Service for the Documents App yet -->\r
        <!-- Order is important -->\r

diff --git a/org.argeo.suite.app/META-INF/spring/osgi.xml b/org.argeo.suite.app/META-INF/spring/osgi.xml
index c3ef50f6b69d0f9bda3a05e4f1dfe805ed8dda37..c71e21462046779dec1946f9cc1f547cfe13e237 100644 (file)
--- 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" />\r
        <!-- App specific services -->\r
        <service ref="resourcesService" interface="org.argeo.connect.resources.ResourcesService" />\r
        <service ref="suiteAppService" interface="org.argeo.connect.AppService" />\r
        <!-- App specific services -->\r
        <service ref="resourcesService" interface="org.argeo.connect.resources.ResourcesService" />\r

-       <service ref="activitiesService" interface="org.argeo.connect.activities.ActivitiesService" />\r
-       <service ref="peopleService" interface="org.argeo.connect.people.PeopleService" />\r
-       <service ref="trackerService" interface="org.argeo.connect.tracker.TrackerService" />\r
-       <service ref="documentsService" interface="org.argeo.connect.documents.DocumentsService" />\r
+       <service ref="activitiesService" interface="org.argeo.activities.ActivitiesService" />\r
+       <service ref="peopleService" interface="org.argeo.people.PeopleService" />\r
+       <service ref="trackerService" interface="org.argeo.tracker.TrackerService" />\r
+       <service ref="documentsService" interface="org.argeo.documents.DocumentsService" />\r

 \r
        <!-- Assembly of the various apps workbench services -->\r
        <service ref="suiteWorkbenchService"\r
 \r
        <!-- Assembly of the various apps workbench services -->\r
        <service ref="suiteWorkbenchService"\r


@@ -35,6 +35,6 @@
 \r
        <!-- Exposes People specific implementation of the AppWorkbenchService -->\r
        <service ref="peopleWorkbenchService"\r
 \r
        <!-- Exposes People specific implementation of the AppWorkbenchService -->\r
        <service ref="peopleWorkbenchService"\r

-               interface="org.argeo.connect.people.workbench.PeopleWorkbenchService" />\r
+               interface="org.argeo.people.workbench.PeopleWorkbenchService" />\r

 \r
 </beans:beans>\r
 \r
 </beans:beans>\r

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 4149f5e2b9e3f4e4791caa121699e81cd0c07f69..e2c608197dbb1345d465c1560458e1bbb8c6b8be 100644 (file)
--- 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 -->
         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" />
                <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: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>
                        </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" />
                                <property name="personHeaderPart" ref="personHeaderPart" />
                                <property name="contactsWithNotePart" ref="contactsWithNotePart" />
                                <property name="activitiesPart" ref="activitiesPart" />


@@ -49,9 +49,9 @@
                </entry>
                <entry>
                        <key>
                </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>
                        </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" />
                                <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>
                                <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" />
                                <property name="peopleService" ref="peopleService" />
                                <property name="resourcesService" ref="resourcesService" />
                                <property name="iconPathes" ref="peopleEntityIcons" />


@@ -72,9 +72,9 @@
                <entry>
                        <key>
                                <util:constant
                <entry>
                        <key>
                                <util:constant

-                                       static-field="org.argeo.connect.people.PeopleTypes.PEOPLE_MAILING_LIST" />
+                                       static-field="org.argeo.people.PeopleTypes.PEOPLE_MAILING_LIST" />

                        </key>
                        </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" />
                                <property name="resourcesService" ref="resourcesService" />
                                <property name="peopleService" ref="peopleService" />
                                <property name="iconPathes" ref="peopleEntityIcons" />


@@ -84,14 +84,14 @@
        </util:map>
 
        <!-- Various headers -->
        </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>
 
                <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" />
                <property name="resourcesService" ref="resourcesService" />
                <property name="peopleService" ref="peopleService" />
                <property name="tagsPart" ref="tagsPart" />


@@ -99,30 +99,30 @@
        </bean>
 
        <!-- Contacts -->
        </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>
                <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>
                <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>
 
        <!-- 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>
 
        <!-- 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>
                <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
                <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>
                </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 79f7df19be3dac525df424fcbd47f332eb5c7597..19f1bf8e5823bbf0c1d4cd5e122fbc1b9299ec6d 100644 (file)
--- 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" />\r
 \r
        <bean id="activitiesWorkbenchService"\r
                class="org.argeo.connect.resources.workbench.ResourcesWorkbenchService" />\r
 \r
        <bean id="activitiesWorkbenchService"\r

-               class="org.argeo.connect.activities.workbench.ActivitiesWorkbenchService" />\r
+               class="org.argeo.activities.workbench.ActivitiesWorkbenchService" />\r

 \r
        <bean id="peopleWorkbenchService"\r
 \r
        <bean id="peopleWorkbenchService"\r

-               class="org.argeo.connect.people.workbench.rap.PeopleWorkbenchServiceImpl" />\r
+               class="org.argeo.people.workbench.rap.PeopleWorkbenchServiceImpl" />\r

 \r
        <bean id="documentsWorkbenchService"\r
 \r
        <bean id="documentsWorkbenchService"\r

-               class="org.argeo.connect.documents.workbench.DocumentsWorkbenchService" />\r
+               class="org.argeo.documents.workbench.DocumentsWorkbenchService" />\r

 \r
        <!--order is important -->\r
        <util:list id="knownWbServices">\r
 \r
        <!--order is important -->\r
        <util:list id="knownWbServices">\r

diff --git a/org.argeo.suite.app/bnd.bnd b/org.argeo.suite.app/bnd.bnd
index b56de96162ffee4c84743b2e3bc5e52f1056bf9e..792e392b1f057c677c65bd2ee9e86e43e6ff80b5 100644 (file)
--- 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.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,\
 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 e1085f48d19ee3abed005e58810875ae6c1484f0..d3692fdc19437b5c966a87ab9849d792fda9a327 100644 (file)
--- 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.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.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;
 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 5a48487d84c7e5d2dc6daf62ccd1011aa7908e0a..9ead94a3a97f08edac3ef9e0112e61a58eebb100 100644 (file)
--- 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.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.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;
 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 acdb67aa5c415d1497d2006026f1249ad9558c5f..f3b222e4ead7678f78e1b75e78c65236430a6297 100644 (file)
--- 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)" />\r
        <reference id="resourcesService" interface="org.argeo.connect.resources.ResourcesService" />\r
        <reference id="activitiesService"\r
                filter="(cn=home)" />\r
        <reference id="resourcesService" interface="org.argeo.connect.resources.ResourcesService" />\r
        <reference id="activitiesService"\r

-               interface="org.argeo.connect.activities.ActivitiesService" />\r
-       <reference id="peopleService" interface="org.argeo.connect.people.PeopleService" />\r
-       <reference id="documentsService" interface="org.argeo.connect.documents.DocumentsService" />\r
-       <reference id="trackerService" interface="org.argeo.connect.tracker.TrackerService" />\r
+               interface="org.argeo.activities.ActivitiesService" />\r
+       <reference id="peopleService" interface="org.argeo.people.PeopleService" />\r
+       <reference id="documentsService" interface="org.argeo.documents.DocumentsService" />\r
+       <reference id="trackerService" interface="org.argeo.tracker.TrackerService" />\r

 \r
        <reference id="appWorkbenchService"\r
                interface="org.argeo.connect.ui.workbench.AppWorkbenchService" />\r
 \r
        <reference id="appWorkbenchService"\r
                interface="org.argeo.connect.ui.workbench.AppWorkbenchService" />\r

diff --git a/org.argeo.suite.workbench.rap/bnd.bnd b/org.argeo.suite.workbench.rap/bnd.bnd
index 794e0e3c5b98cf078e7a064165c2ef422c8439f1..86a9eb4f545ca7c121fb392d610141481f0e22a0 100644 (file)
--- 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.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,\
 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 9b50d3e5b82b1d8fb873d3175c8b06d6a4c930ca..91ca7d5421a290da58638403cab8f2dd71829691 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,8 +1,8 @@
 package org.argeo.suite.workbench;
 
 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;
 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 5e7d4be5abbcb61ebc5a2966f7c49a2746713778..67e6b9163d13eaa89a45c399889407595206939b 100644 (file)
--- 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 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.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.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.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;
 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 4582f776c1a7f75c8232d80fcc376495e92fef9d..6010314b241514eed35a44d04876d7e61181db1e 100644 (file)
--- 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.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.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;
 import org.argeo.suite.workbench.AsUiPlugin;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;