Fix issue with Oracle JVM

[lgpl/argeo-commons.git] / server / plugins / org.argeo.jcr.ui.explorer / META-INF / spring / jcr.xml

diff --git a/server/plugins/org.argeo.jcr.ui.explorer/META-INF/spring/jcr.xml b/server/plugins/org.argeo.jcr.ui.explorer/META-INF/spring/jcr.xml
index 7869429d4e16fa612a718b1357613aab1284139c..9eb9fc9ad4efe7b3f99e74900b9103b9362f7346 100644 (file)
--- a/server/plugins/org.argeo.jcr.ui.explorer/META-INF/spring/jcr.xml
+++ b/server/plugins/org.argeo.jcr.ui.explorer/META-INF/spring/jcr.xml
@@ -5,16 +5,24 @@
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
         http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.5.xsd">
 
-       <bean id="repositoryRegister" class="org.argeo.jcr.DefaultRepositoryRegister">
+       <bean
+               class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+               <property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE" />
+               <property name="locations">
+                       <value>osgibundle:jcrexplorer.properties</value>
+               </property>
        </bean>
 
        <bean id="nodeSession" class="org.argeo.jcr.spring.ThreadBoundSession">
                <property name="repository" ref="nodeRepository" />
        </bean>
 
-       <bean id="jcrKeyring" class="org.argeo.jcr.security.JcrKeyring">
+       <bean id="keyring" class="org.argeo.security.jcr.JcrKeyring">
                <property name="session" ref="nodeSession" />
                <property name="defaultCallbackHandler" ref="defaultCallbackHandler" />
+               <property name="secreteKeyLength" value="${argeo.keyring.secreteKeyLength}" />
        </bean>
 
+       <bean id="repositoryRegister" class="org.argeo.jcr.DefaultRepositoryRegister" />
+
 </beans>