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

[lgpl/argeo-commons.git] / org.argeo.cms.ui.workbench / META-INF / spring / osgi.xml

diff --git a/org.argeo.cms.ui.workbench/META-INF/spring/osgi.xml b/org.argeo.cms.ui.workbench/META-INF/spring/osgi.xml
index 02a63748f8d81c717b4b0462c54c9aabdee6593b..e884f7838d32010b13b11c6c23e2936f3a6bade9 100644 (file)
--- a/org.argeo.cms.ui.workbench/META-INF/spring/osgi.xml
+++ b/org.argeo.cms.ui.workbench/META-INF/spring/osgi.xml
@@ -8,10 +8,24 @@
        http://www.springframework.org/schema/beans/spring-beans-2.5.xsd"\r
        osgi:default-timeout="30000">\r
 \r
+<!--   <reference id="nodeRepository" interface="javax.jcr.Repository" -->\r
+<!--           filter="(argeo.jcr.repository.alias=node)" /> -->\r
+\r
        <reference id="nodeRepository" interface="javax.jcr.Repository"\r
-               filter="(argeo.jcr.repository.alias=node)" />\r
+               filter="(argeo.jcr.repository.alias=home)" />\r
+\r
                \r
        <!-- New user admin -->\r
        <reference id="userAdmin" interface="org.osgi.service.useradmin.UserAdmin" />\r
        <reference id="userTransaction" interface="javax.transaction.UserTransaction" />\r
+       \r
+       <reference id="secureLogger" interface="org.argeo.node.ArgeoLogger"\r
+               cardinality="0..1" />\r
+\r
+\r
+       <reference id="defaultCallbackHandler" interface="javax.security.auth.callback.CallbackHandler" />\r
+\r
+       <!-- SERVICES -->\r
+       <service interface="org.argeo.util.security.CryptoKeyring"\r
+               ref="keyring" />\r
 </beans:beans>
\ No newline at end of file