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 50041e682fed7623cf51d0f99dfefba646b6fec3..ade2f3aa94f72ac1f1d2eee2616dffb48a30a4ef 100644 (file)
--- a/org.argeo.cms/bnd.bnd
+++ b/org.argeo.cms/bnd.bnd
@@ -1,12 +1,19 @@
-Bundle-SymbolicName: org.argeo.cms;singleton:=true
-Bundle-Activator: org.argeo.cms.internal.kernel.Activator
-Import-Package: javax.jcr.security,\
-org.h2;resolution:=optional,\
-org.postgresql;resolution:=optional,\
-org.apache.jackrabbit.webdav.server,\
-org.apache.jackrabbit.webdav.jcr,\
-org.apache.commons.httpclient.cookie;resolution:=optional,\
-!com.sun.security.jgss,\
+Bundle-Activator: org.argeo.cms.internal.osgi.CmsActivator
+
+Import-Package: \
 org.osgi.*;version=0.0.0,\
 *
-Provide-Capability: cms.datamodel;name=cms;cnd=/org/argeo/cms/cms.cnd;abstract=true
\ No newline at end of file
+
+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/cmsContentRepository.xml,\
+OSGI-INF/cmsAcrHttpHandler.xml,\
+OSGI-INF/cmsDeployment.xml,\
+OSGI-INF/cmsContext.xml,\
+