Merge security.ui bundle in the cms.ui.workbench bundle

[lgpl/argeo-commons.git] / org.argeo.cms.ui.workbench / bnd.bnd

diff --git a/org.argeo.cms.ui.workbench/bnd.bnd b/org.argeo.cms.ui.workbench/bnd.bnd
index 4ace8db0e2115f7ab5e16591c3abf5dcb5a5d378..2a5b6bf675e00b5e31232186e67ac0ca75d190e8 100644 (file)
--- a/org.argeo.cms.ui.workbench/bnd.bnd
+++ b/org.argeo.cms.ui.workbench/bnd.bnd
@@ -1,12 +1,12 @@
 Bundle-SymbolicName: org.argeo.cms.ui.workbench;singleton:=true
-Bundle-Activator: org.argeo.security.ui.admin.SecurityAdminPlugin
+Bundle-Activator: org.argeo.security.ui.SecurityUiPlugin
 Bundle-ActivationPolicy: lazy
 
 Require-Bundle:        org.eclipse.core.runtime
 
-Import-Package:        org.eclipse.core.runtime.jobs,\
-org.argeo.cms.auth,\
+Import-Package:        org.argeo.cms.auth,\
 org.argeo.eclipse.spring,\
+org.eclipse.core.runtime.jobs,\
 org.eclipse.jface.window,\
 org.eclipse.swt,\
 org.eclipse.swt.widgets,\
@@ -14,3 +14,6 @@ org.eclipse.ui.services,\
 org.osgi.framework,\
 org.springframework.core,\
 *                              
+
+
+# org.argeo.eclipse.ui.workbench;resolution:=optional,\