projects
/
gpl
/
argeo-suite.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
1fedf24
)
Finalise package refactoring
author
bsinou <bsinou@argeo.org>
Tue, 28 Feb 2017 10:03:47 +0000
(11:03 +0100)
committer
bsinou <bsinou@argeo.org>
Tue, 28 Feb 2017 10:03:47 +0000
(11:03 +0100)
org.argeo.suite.app/META-INF/spring/osgi.xml
patch
|
blob
|
history
org.argeo.suite.app/bnd.bnd
patch
|
blob
|
history
org.argeo.suite.workbench.rap/META-INF/spring/osgi.xml
patch
|
blob
|
history
org.argeo.suite.workbench.rap/bnd.bnd
patch
|
blob
|
history
org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/SuiteWorkbenchService.java
patch
|
blob
|
history
org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/parts/AbstractSuiteDashboard.java
patch
|
blob
|
history
org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/parts/DefaultDashboardEditor.java
patch
|
blob
|
history
org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/rap/AsWindowAdvisor.java
patch
|
blob
|
history
diff --git
a/org.argeo.suite.app/META-INF/spring/osgi.xml
b/org.argeo.suite.app/META-INF/spring/osgi.xml
index c71e21462046779dec1946f9cc1f547cfe13e237..0ef2a6cddc5435137aed052045fc40a5c147013a 100644
(file)
--- a/
org.argeo.suite.app/META-INF/spring/osgi.xml
+++ b/
org.argeo.suite.app/META-INF/spring/osgi.xml
@@
-31,7
+31,7
@@
\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
- interface="org.argeo.connect.
ui.
workbench.AppWorkbenchService" />
\r
+ interface="org.argeo.connect.workbench.AppWorkbenchService" />
\r
\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
diff --git
a/org.argeo.suite.app/bnd.bnd
b/org.argeo.suite.app/bnd.bnd
index 792e392b1f057c677c65bd2ee9e86e43e6ff80b5..6d3c6c8fd0c55ef5e5b9b0332013ee63138dc8e1 100644
(file)
--- 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.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,\
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 f3b222e4ead7678f78e1b75e78c65236430a6297..b0d5f19ad2b386d18ee14bc90259b252baced35a 100644
(file)
--- 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" />
\r
\r
<reference id="appWorkbenchService"
\r
<reference id="trackerService" interface="org.argeo.tracker.TrackerService" />
\r
\r
<reference id="appWorkbenchService"
\r
- interface="org.argeo.connect.
ui.
workbench.AppWorkbenchService" />
\r
+ interface="org.argeo.connect.workbench.AppWorkbenchService" />
\r
\r
</beans:beans>
\r
\r
</beans:beans>
\r
diff --git
a/org.argeo.suite.workbench.rap/bnd.bnd
b/org.argeo.suite.workbench.rap/bnd.bnd
index 86a9eb4f545ca7c121fb392d610141481f0e22a0..ee9c08a1c867c078857a47e98dc2155db288ed83 100644
(file)
--- 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.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,\
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 a7a53425e34be9ca4a3c37ec51aa429810346b30..89dfc97ef3d50394328c055e20a9e5469dad4d24 100644
(file)
--- 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 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;
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 67e6b9163d13eaa89a45c399889407595206939b..0ec007526f7ccb74a23948b290cd6725ff6444da 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
@@
-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.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.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;
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 6010314b241514eed35a44d04876d7e61181db1e..b0e03b0909554bdca4a0d56d66abefbc59955693 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
@@
-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.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.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;
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 87c4fb6e2053a125ddd9f1857dee344cf3381cd0..0c9c67a87b2e0a81b0d0ddb1908e319605fb34a5 100644
(file)
--- 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.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;
import org.eclipse.ui.application.ActionBarAdvisor;
import org.eclipse.ui.application.IActionBarConfigurer;
import org.eclipse.ui.application.IWorkbenchWindowConfigurer;