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 2ca0f4722c294e7e579545891e7c93221a1c4fc8..ade2f3aa94f72ac1f1d2eee2616dffb48a30a4ef 100644 (file)
--- a/org.argeo.cms/bnd.bnd
+++ b/org.argeo.cms/bnd.bnd
@@ -1,20 +1,19 @@
 Bundle-Activator: org.argeo.cms.internal.osgi.CmsActivator
 
 Import-Package: \
-org.argeo.osgi.transaction, \
-org.apache.commons.httpclient.cookie;resolution:=optional,\
-!com.sun.security.jgss,\
 org.osgi.*;version=0.0.0,\
-org.apache.xerces.jaxp;resolution:=optional,\
 *
 
 Service-Component:\
+OSGI-INF/cmsOsgiLogger.xml,\
+OSGI-INF/uuidFactory.xml,\
+OSGI-INF/cmsEventBus.xml,\
 OSGI-INF/cmsState.xml,\
-OSGI-INF/simpleTransactionManager.xml,\
-OSGI-INF/nodeUserAdmin.xml,\
+OSGI-INF/transactionManager.xml,\
+OSGI-INF/cmsUserAdmin.xml,\
 OSGI-INF/cmsUserManager.xml,\
-OSGI-INF/deployConfig.xml,\
-OSGI-INF/acrContentRepository.xml,\
+OSGI-INF/cmsContentRepository.xml,\
+OSGI-INF/cmsAcrHttpHandler.xml,\
 OSGI-INF/cmsDeployment.xml,\
 OSGI-INF/cmsContext.xml,\