Merge remote-tracking branch 'origin/unstable' into testing

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

diff --git a/org.argeo.cms/bnd.bnd b/org.argeo.cms/bnd.bnd
index e5046d308cc5ebb3aca552a672dd6cf17d35ee6a..ade2f3aa94f72ac1f1d2eee2616dffb48a30a4ef 100644 (file)
--- a/org.argeo.cms/bnd.bnd
+++ b/org.argeo.cms/bnd.bnd
@@ -1,14 +1,19 @@
-Bundle-Activator: org.argeo.cms.internal.kernel.Activator
+Bundle-Activator: org.argeo.cms.internal.osgi.CmsActivator
 
-Import-Package: org.apache.commons.httpclient.cookie;resolution:=optional,\
-!com.sun.security.jgss,\
+Import-Package: \
 org.osgi.*;version=0.0.0,\
-org.osgi.service.http.whiteboard;version=0.0.0,\
-org.osgi.framework.namespace;version=0.0.0,\
 *
 
 Service-Component:\
+OSGI-INF/cmsOsgiLogger.xml,\
+OSGI-INF/uuidFactory.xml,\
+OSGI-INF/cmsEventBus.xml,\
+OSGI-INF/cmsState.xml,\
+OSGI-INF/transactionManager.xml,\
+OSGI-INF/cmsUserAdmin.xml,\
 OSGI-INF/cmsUserManager.xml,\
-OSGI-INF/pkgServletContext.xml,\
-OSGI-INF/pkgServlet.xml
+OSGI-INF/cmsContentRepository.xml,\
+OSGI-INF/cmsAcrHttpHandler.xml,\
+OSGI-INF/cmsDeployment.xml,\
+OSGI-INF/cmsContext.xml,\